From ba10fdd8b4c570762acd9367ce37b7c0dd713dba Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Mon, 4 Jan 2016 13:58:06 -0500
Subject: [PATCH] update settings pages

---
 dashboard-ui/mypreferenceslanguages.html      | 30 -------------------
 dashboard-ui/scripts/appsettings.js           | 10 ++-----
 .../scripts/mypreferenceslanguages.js         |  3 +-
 3 files changed, 3 insertions(+), 40 deletions(-)

diff --git a/dashboard-ui/mypreferenceslanguages.html b/dashboard-ui/mypreferenceslanguages.html
index 44d7bb3d50..9c4087a5ac 100644
--- a/dashboard-ui/mypreferenceslanguages.html
+++ b/dashboard-ui/mypreferenceslanguages.html
@@ -75,39 +75,9 @@
                         <div>
                             <label for="selectMaxChromecastBitrate">${LabelMaxChromecastBitrate}</label>
                             <select id="selectMaxChromecastBitrate" data-mini="true">
-                                <option value="30000000">30Mbps</option>
-                                <option value="25000000">25Mbps</option>
-                                <option value="20000000">20Mbps</option>
-                                <option value="15000000">15Mbps</option>
-                                <option value="12000000">12Mbps</option>
-                                <option value="11000000">11Mbps</option>
-                                <option value="10000000">10Mbps</option>
-                                <option value="9000000">9Mbps</option>
-                                <option value="8000000">8Mbps</option>
-                                <option value="7000000">7Mbps</option>
-                                <option value="6000000">6Mbps</option>
-                                <option value="5000000">5Mbps</option>
-                                <option value="4000000">4Mbps</option>
-                                <option value="3000000">3Mbps</option>
-                                <option value="2500000">2.5Mbps</option>
-                                <option value="2000000">2Mbps</option>
-                                <option value="1500000">1.5Mbps</option>
-                                <option value="1000000">1Mbps</option>
-                                <option value="720000">720kbps</option>
-                                <option value="420000">420kbps</option>
-                                <option value="400000">400kbps</option>
-                                <option value="320000">320kbps</option>
-                                <option value="192000">192kbps</option>
                             </select>
                         </div>
 
-                        <div>
-                            <br />
-                            <div>
-                                <paper-checkbox class="chkEnableChromecastAc3">${LabelEnableChromecastAc3Passthrough}</paper-checkbox>
-                            </div>
-                        </div>
-
                         <div class="fldExternalPlayer" style="display: none;">
                             <br />
                             <paper-checkbox class="chkExternalVideoPlayer">${OptionEnableExternalVideoPlayers}</paper-checkbox>
diff --git a/dashboard-ui/scripts/appsettings.js b/dashboard-ui/scripts/appsettings.js
index 14490f742e..24b5e03cad 100644
--- a/dashboard-ui/scripts/appsettings.js
+++ b/dashboard-ui/scripts/appsettings.js
@@ -38,15 +38,9 @@
                 update('chromecastBitrate', val);
             }
 
-            return parseInt(appStorage.getItem('chromecastBitrate') || '') || 3000000;
-        },
-        enableChromecastAc3: function (val) {
+            val = appStorage.getItem('chromecastBitrate');
 
-            if (val != null) {
-                update('enablechromecastac3', val.toString());
-            }
-
-            return appStorage.getItem('enablechromecastac3') == 'true';
+            return val ? parseInt(val) : null;
         },
         enableExternalPlayers: function (val) {
 
diff --git a/dashboard-ui/scripts/mypreferenceslanguages.js b/dashboard-ui/scripts/mypreferenceslanguages.js
index dc957259aa..f8a4c7aa6f 100644
--- a/dashboard-ui/scripts/mypreferenceslanguages.js
+++ b/dashboard-ui/scripts/mypreferenceslanguages.js
@@ -31,7 +31,6 @@
 
         page.querySelector('.chkPlayDefaultAudioTrack').checked = user.Configuration.PlayDefaultAudioTrack || false;
         page.querySelector('.chkEnableCinemaMode').checked = AppSettings.enableCinemaMode();
-        page.querySelector('.chkEnableChromecastAc3').checked = AppSettings.enableChromecastAc3();
         page.querySelector('.chkExternalVideoPlayer').checked = AppSettings.enableExternalPlayers();
 
         require(['qualityoptions'], function (qualityoptions) {
@@ -45,6 +44,7 @@
             bitrateOptions = '<option value="">' + Globalize.translate('OptionAutomatic') + '</option>' + bitrateOptions;
 
             $('#selectMaxBitrate', page).html(bitrateOptions);
+            $('#selectMaxChromecastBitrate', page).html(bitrateOptions);
 
             if (AppSettings.enableAutomaticBitrateDetection()) {
                 $('#selectMaxBitrate', page).val('');
@@ -110,7 +110,6 @@
         }
 
         AppSettings.maxChromecastBitrate($('#selectMaxChromecastBitrate', page).val());
-        AppSettings.enableChromecastAc3(page.querySelector('.chkEnableChromecastAc3').checked);
 
         var userId = getParameterByName('userId') || Dashboard.getCurrentUserId();