Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix TypeError: Cannot read property enableMicrophone of undefined error (fixes #394) #395

Closed
wants to merge 5 commits into from
Closed

fix TypeError: Cannot read property enableMicrophone of undefined error (fixes #394) #395

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d85513d
fix `TypeError: Cannot read property enableMicrophone of undefined` e…
cvan May 17, 2018
509a2b7
handle `toggleFreeze` error, etc.
cvan May 21, 2018
5abf8b7
remove unneeded checks for `NAF.connection`
cvan May 21, 2018
ce61f26
remove `NAF.connection.*` checks in `block-button` component
cvan May 21, 2018
0eb4be4
address review feedback (thanks, @brianpeiris!)
cvan May 21, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions src/components/freeze-controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,13 @@ AFRAME.registerComponent("freeze-controller", {

onToggle: function() {
window.APP.store.update({ activity: { hasFoundFreeze: true } });
NAF.connection.adapter.toggleFreeze();
if (NAF.connection.adapter.frozen) {
this.el.addState("frozen");
} else {
this.el.removeState("frozen");
if (NAF.connection.adapter) {
NAF.connection.adapter.toggleFreeze();
if (NAF.connection.adapter.frozen) {
this.el.addState("frozen");
} else {
this.el.removeState("frozen");
}
}
}
});
16 changes: 12 additions & 4 deletions src/components/mute-mic.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,24 +46,32 @@ AFRAME.registerComponent("mute-mic", {

onToggle: function() {
if (this.el.is("muted")) {
NAF.connection.adapter.enableMicrophone(true);
if (NAF.connection.adapter) {
NAF.connection.adapter.enableMicrophone(true);
}
this.el.removeState("muted");
} else {
NAF.connection.adapter.enableMicrophone(false);
if (NAF.connection.adapter) {
NAF.connection.adapter.enableMicrophone(false);
}
this.el.addState("muted");
}
},

onMute: function() {
if (!this.el.is("muted")) {
NAF.connection.adapter.enableMicrophone(false);
if (NAF.connection.adapter) {
NAF.connection.adapter.enableMicrophone(false);
}
this.el.addState("muted");
}
},

onUnmute: function() {
if (this.el.is("muted")) {
NAF.connection.adapter.enableMicrophone(true);
if (NAF.connection.adapter) {
NAF.connection.adapter.enableMicrophone(true);
}
this.el.removeState("muted");
}
}
Expand Down
28 changes: 19 additions & 9 deletions src/hub.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,9 @@ const onReady = async () => {
mediaStream.removeTrack(track);
}
}
NAF.connection.adapter.setLocalMediaStream(mediaStream);
if (NAF.connection.adapter && NAF.connection.adapter.setLocalMediaStream) {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can this be simplified to check only NAF.connection.adapter?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we wanted to check for setLocalMediaStream specifically, in case we were ever using anything other than naf-janus-adapter. setLocalMediaStream is special to our adapter.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

okay, yeah, that's along what I thought

NAF.connection.adapter.setLocalMediaStream(mediaStream);
}
screenEntity.setAttribute("visible", sharingScreen);
});

Expand All @@ -292,19 +294,25 @@ const onReady = async () => {
store.update({ activity: { lastEnteredAt: moment().toJSON() } });
});
}
remountUI({ occupantCount: NAF.connection.adapter.publisher.initialOccupants.length + 1 });
if (NAF.connection.adapter) {
remountUI({ occupantCount: NAF.connection.adapter.publisher.initialOccupants.length + 1 });
}
});

document.body.addEventListener("clientConnected", () => {
remountUI({
occupantCount: Object.keys(NAF.connection.adapter.occupants).length + 1
});
if (NAF.connection.adapter) {
remountUI({
occupantCount: Object.keys(NAF.connection.adapter.occupants).length + 1
});
}
});

document.body.addEventListener("clientDisconnected", () => {
remountUI({
occupantCount: Object.keys(NAF.connection.adapter.occupants).length + 1
});
if (NAF.connection.adapter) {
remountUI({
occupantCount: Object.keys(NAF.connection.adapter.occupants).length + 1
});
}
});

scene.components["networked-scene"].connect().catch(connectError => {
Expand Down Expand Up @@ -332,7 +340,9 @@ const onReady = async () => {
}

if (mediaStream) {
NAF.connection.adapter.setLocalMediaStream(mediaStream);
if (NAF.connection.adapter && NAF.connection.adapter.setLocalMediaStream) {
NAF.connection.adapter.setLocalMediaStream(mediaStream);
}

if (screenEntity) {
screenEntity.setAttribute("visible", sharingScreen);
Expand Down