From 321081da5c8c0cdad27d44cb17ac17dea1b991f7 Mon Sep 17 00:00:00 2001
From: Brian Peiris <brianpeiris@gmail.com>
Date: Mon, 12 Mar 2018 12:54:09 -0700
Subject: [PATCH] Fix networked video component
---
src/components/networked-video-player.js | 12 ++++--------
src/room.js | 2 +-
webpack.config.js | 4 +++-
3 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/src/components/networked-video-player.js b/src/components/networked-video-player.js
index 6e0218a9f..1f8b1da3e 100644
--- a/src/components/networked-video-player.js
+++ b/src/components/networked-video-player.js
@@ -2,9 +2,7 @@ import styles from "./networked-video-player.css";
const nafConnected = function() {
return new Promise(resolve => {
- NAF.clientId
- ? resolve()
- : document.body.addEventListener("connected", resolve);
+ NAF.clientId ? resolve() : document.body.addEventListener("connected", resolve);
});
};
@@ -21,15 +19,13 @@ AFRAME.registerComponent("networked-video-player", {
await nafConnected();
- const networkedEl = NAF.utils.getNetworkedEntity(this.el);
+ const networkedEl = await NAF.utils.getNetworkedEntity(this.el);
if (!networkedEl) {
- throw new Error(
- "Video player must be added on a node, or a child of a node, with the `networked` component."
- );
+ throw new Error("Video player must be added on a node, or a child of a node, with the `networked` component.");
}
const ownerId = networkedEl.components.networked.data.owner;
- const stream = await NAF.connection.adapter.getMediaStream(ownerId);
+ const stream = await NAF.connection.adapter.getMediaStream(ownerId, "video");
if (!stream) {
return;
}
diff --git a/src/room.js b/src/room.js
index c3ed3d28e..b1ad1fb34 100644
--- a/src/room.js
+++ b/src/room.js
@@ -75,7 +75,7 @@ async function shareMedia(audio, video) {
entity = document.createElement("a-entity");
entity.id = id;
entity.setAttribute("offset-relative-to", {
- target: "#head",
+ target: "#player-camera",
offset: "0 0 -2",
on: "action_share_screen"
});
diff --git a/webpack.config.js b/webpack.config.js
index 8448e44fd..d45a9ceb6 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -52,7 +52,7 @@ function createHTTPSConfig() {
fs.writeFileSync(path.join(__dirname, "certs", "key.pem"), pems.private);
return {
- key: pems.public,
+ key: pems.private,
cert: pems.cert
};
}
@@ -89,6 +89,8 @@ module.exports = {
devServer: {
open: true,
https: createHTTPSConfig(),
+ host: "0.0.0.0",
+ useLocalIp: true,
port: 8080,
before: function(app) {
// networked-aframe makes HEAD requests to the server for time syncing. Respond with an empty body.
--
GitLab