From e1d7fdc1cba00d7f31f249a1e2c912313bbfecd8 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Mon, 1 Feb 2016 15:41:56 -0500 Subject: [PATCH 1/5] fix quality options --- dashboard-ui/scripts/mediaplayer-video.js | 1 + dashboard-ui/scripts/mediaplayer.js | 13 ++++++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/dashboard-ui/scripts/mediaplayer-video.js b/dashboard-ui/scripts/mediaplayer-video.js index 8d6e2c59ff..690ebfbeab 100644 --- a/dashboard-ui/scripts/mediaplayer-video.js +++ b/dashboard-ui/scripts/mediaplayer-video.js @@ -613,6 +613,7 @@ self.onQualityOptionSelected = function (bitrate) { AppSettings.maxStreamingBitrate(bitrate); + AppSettings.enableAutomaticBitrateDetection(false); self.changeStream(self.getCurrentTicks(), { Bitrate: bitrate diff --git a/dashboard-ui/scripts/mediaplayer.js b/dashboard-ui/scripts/mediaplayer.js index 581ed61bb5..e4f09d9ef7 100644 --- a/dashboard-ui/scripts/mediaplayer.js +++ b/dashboard-ui/scripts/mediaplayer.js @@ -187,7 +187,15 @@ return new Promise(function (resolve, reject) { - require(['browserdeviceprofile'], function (profile) { + require(['browserdeviceprofile', 'qualityoptions'], function (profile, qualityoptions) { + + var bitrateSetting = AppSettings.maxStreamingBitrate(); + + if (!maxHeight) { + maxHeight = qualityoptions.getVideoQualityOptions(bitrateSetting).filter(function (q) { + return q.selected; + })[0].maxHeight; + } if (AppInfo.isNativeApp && browserInfo.android) { updateDeviceProfileForAndroid(profile); @@ -195,6 +203,9 @@ else if (AppInfo.isNativeApp && browserInfo.safari) { updateDeviceProfileForIOS(profile); } + + profile.MaxStreamingBitrate = bitrateSetting; + resolve(profile); }); }); From 4569cb5b6db6e726e795f49a7ab061a2e8769eb2 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Tue, 2 Feb 2016 13:41:18 -0500 Subject: [PATCH 2/5] update subtitle focus --- .../components/subtitleeditor/subtitleeditor.template.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dashboard-ui/components/subtitleeditor/subtitleeditor.template.html b/dashboard-ui/components/subtitleeditor/subtitleeditor.template.html index 453c2e78ff..eee194ab80 100644 --- a/dashboard-ui/components/subtitleeditor/subtitleeditor.template.html +++ b/dashboard-ui/components/subtitleeditor/subtitleeditor.template.html @@ -8,7 +8,7 @@
- +