kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-03-13 20:50:41 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #986 in FS/freeswitch from ~WALDYR/freeswitch:FS-9591-Adjust-settings-and-fix-preview-bugs-to-improve-user-experience to master

Browse Source 
* commit '0ccf74e24187b6884830e92b2651ef2c0e742dcf':
  FS-9591 [verto_communicator] Adjust settings and fix preview bugs to improve user experience
This commit is contained in:
Italo Rossi 2016-09-29 10:29:19 -05:00
commit 90b77c56b5
2 changed files with 40 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
html5/verto/verto_communicator/src/partials/settings.html
View File

@ -2,14 +2,7 @@
<div class="content">
<div class="col-md-4">
<div class="form-group" ng-show="mydata.useVideo">
<label for="settings-camera">{{ 'CAMERA_SETTINGS' | translate }}</label>
<select name="camera" id="settings-camera" class="form-control"
ng-model="mydata.selectedVideo" ng-options="item.id as item.label for item in verto.data.videoDevices">
</select>
</div>
<div class="form-group" ng-show="mydata.useVideo">
<div class="form-group">
<label for="settings-share-device">{{ 'SHARE_DEVICE' | translate }}</label>
<select name="share-device" id="settings-share-device" class="form-control"
ng-model="mydata.selectedShare" ng-options="item.id as item.label for item in verto.data.shareDevices">
@ -35,15 +28,9 @@
</select>
</div>
<div class="form-group">
<label for="settings-framerate">{{ 'BEST_FRAME_RATE' | translate }}</label>
<select name="settings-framerate" id="settings-framerate" class="form-control"
ng-model="mydata.bestFrameRate"
ng-options="item.id as item.label for item in verto.framerate"></select>
</div>
<a class="btn btn-primary" href="" ng-click="showPreview()">{{ 'PREVIEW_SETTINGS' | translate }}</a>
<a class="btn btn-primary" href="" ng-click="refreshDeviceList()">{{ 'REFRESH_DEVICE_LIST' | translate }}</a>
<a class="btn btn-primary" href="" ng-click="resetSettings()">{{ 'FACTORY_RESET_SETTINGS' | translate }}</a>
</div>
<div class="col-md-4">
<div class="form-group">
@ -128,6 +115,20 @@
<p>{{ 'REMOTE_ENCODER' | translate }}</b>
</div>
<div class="form-group" ng-show="mydata.useVideo">
<label for="settings-camera">{{ 'CAMERA_SETTINGS' | translate }}</label>
<select name="camera" id="settings-camera" class="form-control"
ng-model="mydata.selectedVideo" ng-options="item.id as item.label for item in verto.data.videoDevices">
</select>
</div>
<div class="form-group">
<label for="settings-framerate">{{ 'BEST_FRAME_RATE' | translate }}</label>
<select name="settings-framerate" id="settings-framerate" class="form-control"
ng-model="mydata.bestFrameRate"
ng-options="item.id as item.label for item in verto.framerate"></select>
</div>
<div class="checkbox">
<label>
<input type="checkbox" ng-model="mydata.autoBand" ng-change="checkAutoBand(mydata.autoBand)">
@ -135,14 +136,22 @@
</label>
</div>
<div class="checkbox" ng-show="mydata.autoBand">
<label>
<input type="checkbox" ng-model="mydata.testSpeedJoin">
<span ng-bind="'RECHECK_BANDWIDTH' | translate"></span>
</label>
</div>
<div ng-show="mydata.autoBand">
<div class="checkbox">
<label>
<input type="checkbox" ng-model="mydata.testSpeedJoin">
<span ng-bind="'RECHECK_BANDWIDTH' | translate"></span>
</label>
</div>
<a ng-show="mydata.autoBand" class="btn btn-primary" href="" ng-click="testSpeed()">{{ 'CHECK_NETWORK_SPEED' | translate }}</a> <span ng-bind="speedMsg"></span>
<a class="btn btn-primary" href="" ng-click="testSpeed()">
{{ 'CHECK_NETWORK_SPEED' | translate }}
</a>
<div>
<span ng-bind="speedMsg"></span>
</div>
</div>
<div ng-show="!mydata.autoBand">
<label for="video-quality">{{ 'VIDEO_QUALITY' | translate }}</label>
@ -168,7 +177,6 @@
ng-options="item.id as item.label for item in verto.bandwidth"></select>
</div>
</div>
<button class="btn btn-danger pull-left btn-pull-left" ng-click="resetSettings()">{{ 'FACTORY_RESET_SETTINGS' | translate }}</button>
</div>
</div>
</div>

11
html5/verto/verto_communicator/src/vertoControllers/controllers/PreviewController.js
View File

@ -24,9 +24,16 @@
}
};
if (storage.data.selectedVideo !== 'none') {
var newDevice = verto.data.videoDevices.find(function(device) {
return device.id == storage.data.selectedVideo;
});
storage.data.selectedVideo = newDevice.id;
storage.data.selectedVideoName = newDevice.label;
if (newDevice.id !== 'none') {
constraints.video = {
optional: [{ sourceId: storage.data.selectedVideo }]
optional: [{ sourceId: newDevice.id }]
};
}