kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #409 in FS/freeswitch from ~JMESQUITA/freeswitch:bugfix/FS-8003-communicator-does-not-list-microphones to master 

* commit 'c0a5c54bc10c7ebdb65f5aafc8d60dbad6477944':
  FS-8003 #resolve Use audioInDevices instead of audioDevices to match verto plugin.
This commit is contained in:
Anthony Minessale II 2015-08-20 18:37:58 -05:00
parent aa0bbe84af c0a5c54bc1
commit 8f9f1ee87d
1 changed files with 57 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

121
html5/verto/verto_communicator/js/verto-service.js
View File

@ -234,85 +234,78 @@ vertoService.service('verto', ['$rootScope', '$cookieStore', '$location',
refreshDevices: function(callback) { refreshDevices: function(callback) {
console.debug('Attempting to refresh the devices.'); console.debug('Attempting to refresh the devices.');
function refreshDevicesCallback() {
data.videoDevices = [{
id: 'none',
label: 'No camera'
}];
data.shareDevices = [{
id: 'screen',
label: 'Screen'
}];
data.audioDevices = [];
data.selectedVideo = 'none';
data.selectedShare = 'screen';
data.selectedAudio = null;
data.videoDevices = [{ for (var i in jQuery.verto.videoDevices) {
id: 'none', var device = jQuery.verto.videoDevices[i];
label: 'No camera' if (!device.label) {
}]; data.videoDevices.push({
data.shareDevices = [{ id: 'Camera ' + i,
id: 'screen', label: 'Camera ' + i
label: 'Screen' });
}]; } else {
data.audioDevices = []; data.videoDevices.push({
id: device.id,
label: device.label || device.id
});
}
data.selectedVideo = 'none'; // Selecting the first source.
data.selectedShare = 'screen'; if (i == 0) {
data.selectedAudio = null; data.selectedVideo = device.id;
}
for (var i in jQuery.verto.videoDevices) { if (!device.label) {
var device = jQuery.verto.videoDevices[i]; data.shareDevices.push({
if (!device.label) { id: 'Share Device ' + i,
data.videoDevices.push({ label: 'Share Device ' + i
id: 'Camera ' + i, });
label: 'Camera ' + i continue;
}); }
} else {
data.videoDevices.push({ data.shareDevices.push({
id: device.id, id: device.id,
label: device.label || device.id label: device.label || device.id
}); });
} }
// Selecting the first source. for (var i in jQuery.verto.audioInDevices) {
if (i == 0) { var device = jQuery.verto.audioInDevices[i];
data.selectedVideo = device.id; // Selecting the first source.
} if (i == 0) {
data.selectedAudio = device.id;
}
if (!device.label) { if (!device.label) {
data.shareDevices.push({ data.audioDevices.push({
id: 'Share Device ' + i, id: 'Microphone ' + i,
label: 'Share Device ' + i label: 'Microphone ' + i
}); });
continue; continue;
} }
data.shareDevices.push({
id: device.id,
label: device.label || device.id
});
}
for (var i in jQuery.verto.audioDevices) {
var device = jQuery.verto.audioDevices[i];
// Selecting the first source.
if (i == 0) {
data.selectedAudio = device.id;
}
if (!device.label) {
data.audioDevices.push({ data.audioDevices.push({
id: 'Microphone ' + i, id: device.id,
label: 'Microphone ' + i label: device.label || device.id
}); });
continue;
} }
data.audioDevices.push({ console.debug('Devices were refreshed.');
id: device.id, };
label: device.label || device.id
});
}
console.debug('Devices were refreshed.'); jQuery.verto.refreshDevices(refreshDevicesCallback);
if (angular.isFunction(callback)) {
var devices = {
audio: data.audioDevices,
video: data.videoDevices,
share: data.shareDevices
};
callback(data.instance, devices);
}
}, },
/** /**