haskal
/
jiti-meet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #830 from jitsi/detect_local_media_not_working 

Shows dialog when lib-jitsi-meet report microphone issues
This commit is contained in:
Дамян Минков 2016-09-01 14:16:50 -05:00 committed by GitHub
parent d33324c198 4c9b6ce193
commit aced860ba4
3 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
conference.js
View File

@ -857,6 +857,8 @@ export default {
return promise.then(function () { return promise.then(function () {
if (stream) { if (stream) {
stream.on(TrackEvents.TRACK_AUDIO_NOT_WORKING,
APP.UI.showAudioNotWorkingDialog);
return room.addTrack(stream); return room.addTrack(stream);
} }
}).then(() => { }).then(() => {
@ -1162,7 +1164,8 @@ export default {
}); });
room.on(ConferenceEvents.LOCK_STATE_CHANGED, (state, error) => { room.on(ConferenceEvents.LOCK_STATE_CHANGED, (state, error) => {
console.log("Received channel password lock change: ", state, error); console.log("Received channel password lock change: ", state,
error);
APP.UI.markRoomLocked(state); APP.UI.markRoomLocked(state);
}); });

1
lang/main.json
View File

@ -263,6 +263,7 @@
"micPermissionDeniedError": "You have not granted permission to use your microphone. You can still join the conference but others won't hear you. Use the camera button in the address bar to fix this.", "micPermissionDeniedError": "You have not granted permission to use your microphone. You can still join the conference but others won't hear you. Use the camera button in the address bar to fix this.",
"micNotFoundError": "Microphone was not found.", "micNotFoundError": "Microphone was not found.",
"micConstraintFailedError": "Yor microphone does not satisfy some of required constraints.", "micConstraintFailedError": "Yor microphone does not satisfy some of required constraints.",
"micNotSendingData": "Your microphone is not sending data. Please select another device from the settings menu or try to restart your browser / device.",
"goToStore": "Go to the webstore", "goToStore": "Go to the webstore",
"externalInstallationTitle": "Extension required", "externalInstallationTitle": "Extension required",
"externalInstallationMsg": "You need to install our desktop sharing extension." "externalInstallationMsg": "You need to install our desktop sharing extension."

12
modules/UI/UI.js
View File

@ -1392,6 +1392,18 @@ UI.showDeviceErrorDialog = function (micError, cameraError) {
} }
}; };
/**
* Shows error dialog that informs the user that no data is received from the
* microphone.
*/
UI.showAudioNotWorkingDialog = function () {
messageHandler.openMessageDialog(
"dialog.error",
"dialog.micNotSendingData",
null,
null);
};
UI.updateDevicesAvailability = function (id, devices) { UI.updateDevicesAvailability = function (id, devices) {
VideoLayout.setDeviceAvailabilityIcons(id, devices); VideoLayout.setDeviceAvailabilityIcons(id, devices);
}; };