kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-04-16 16:58:35 +00:00
Code Issues Projects Releases Wiki Activity

FS-8003 #resolve Use audioInDevices instead of audioDevices to match verto plugin.

Browse Source 
FS-8003 Also make modifications so that refreshing device actually calls APIs on the verto library instead of just reparsing it's output.
This commit is contained in:
Joao Mesquita 2015-08-20 18:33:39 -03:00
parent aa0bbe84af
commit c0a5c54bc1
1 changed files with 57 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -234,8 +234,7 @@ 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 = [{ data.videoDevices = [{
id: 'none', id: 'none',
label: 'No camera' label: 'No camera'
@ -283,8 +282,8 @@ vertoService.service('verto', ['$rootScope', '$cookieStore', '$location',
}); });
} }
for (var i in jQuery.verto.audioDevices) { for (var i in jQuery.verto.audioInDevices) {
var device = jQuery.verto.audioDevices[i]; var device = jQuery.verto.audioInDevices[i];
// Selecting the first source. // Selecting the first source.
if (i == 0) { if (i == 0) {
data.selectedAudio = device.id; data.selectedAudio = device.id;
@ -302,17 +301,11 @@ vertoService.service('verto', ['$rootScope', '$cookieStore', '$location',
label: device.label || device.id label: device.label || device.id
}); });
} }
console.debug('Devices were refreshed.'); console.debug('Devices were refreshed.');
if (angular.isFunction(callback)) {
var devices = {
audio: data.audioDevices,
video: data.videoDevices,
share: data.shareDevices
}; };
callback(data.instance, devices);
} jQuery.verto.refreshDevices(refreshDevicesCallback);
}, },
/** /**