From ec163807cff204629ccad4aa66ad90c9a4aa745d Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Fri, 18 Apr 2014 13:16:25 -0400
Subject: [PATCH] support more dlna resource properties

---
 dashboard-ui/css/site.css                |  6 +++---
 dashboard-ui/encodingsettings.html       |  5 +++++
 dashboard-ui/scripts/dashboardpage.js    | 10 +++++-----
 dashboard-ui/scripts/encodingsettings.js |  3 +++
 4 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/dashboard-ui/css/site.css b/dashboard-ui/css/site.css
index 7b77f84180..59574947e2 100644
--- a/dashboard-ui/css/site.css
+++ b/dashboard-ui/css/site.css
@@ -934,16 +934,16 @@ progress {
     z-index: 1000;
 }
 
-.notPlayingSession .sessionNowPlayingContent {
+.activeSession:not(.playingSession) .sessionNowPlayingContent {
     display: none;
 }
 
-.notPlayingSession .sessionNowPlayingInnerContent {
+.activeSession:not(.playingSession) .sessionNowPlayingInnerContent {
     background-color: #f0f0f0;
     color: #000;
 }
 
-.notPlayingSession .sessionUserInfo, .notPlayingSession .sessionNowPlayingInfo {
+.activeSession:not(.playingSession) .sessionUserInfo, .activeSession:not(.playingSession) .sessionNowPlayingInfo {
     bottom: 0;
 }
 
diff --git a/dashboard-ui/encodingsettings.html b/dashboard-ui/encodingsettings.html
index 0697c15ace..6527f4f0f7 100644
--- a/dashboard-ui/encodingsettings.html
+++ b/dashboard-ui/encodingsettings.html
@@ -40,6 +40,11 @@
 
                     <br />
                     <ul data-role="listview" class="ulForm">
+                        <li>
+                            <label for="txtDownMixAudioBoost">${LabelDownMixAudioScale}</label>
+                            <input type="number" id="txtDownMixAudioBoost" pattern="[0-9]*" required="required" min=".5" max="3" step=".1" data-mini="true" />
+                            <div class="fieldDescription">${LabelDownMixAudioScaleHelp}</div>
+                        </li>
                         <li>
                             <input type="checkbox" id="chkAllowUpscaling" name="chkAllowUpscaling" data-mini="true" />
                             <label for="chkAllowUpscaling">${OptionUpscaling}</label>
diff --git a/dashboard-ui/scripts/dashboardpage.js b/dashboard-ui/scripts/dashboardpage.js
index 6dad826191..9b1a1559dc 100644
--- a/dashboard-ui/scripts/dashboardpage.js
+++ b/dashboard-ui/scripts/dashboardpage.js
@@ -209,7 +209,7 @@
 
             var nowPlayingItem = connection.NowPlayingItem;
 
-            var className = nowPlayingItem ? 'activeSession' : 'notPlayingSession activeSession';
+            var className = nowPlayingItem ? 'playingSession activeSession' : 'activeSession';
 
             html += '<div class="' + className + '" id="' + rowId + '">';
 
@@ -400,9 +400,9 @@
         var nowPlayingItem = session.NowPlayingItem;
 
         if (nowPlayingItem) {
-            row.removeClass('notPlayingSession');
+            row.addClass('playingSession');
         } else {
-            row.addClass('notPlayingSession');
+            row.removeClass('playingSession');
         }
 
         $('.sessionUserName', row).html(DashboardPage.getUsersHtml(session));
@@ -877,8 +877,8 @@ $(document).on('pageshow', "#dashboardPage", DashboardPage.onPageShow).on('pageh
             return this;
         }
 
-        return this.off('.sessionItemMenu').on('mouseenter.sessionItemMenu', '.activeSession', onHoverIn)
-            .on('mouseleave.sessionItemMenu', '.activeSession', onHoverOut);
+        return this.off('.sessionItemMenu').on('mouseenter.sessionItemMenu', '.playingSession', onHoverIn)
+            .on('mouseleave.sessionItemMenu', '.playingSession', onHoverOut);
     };
 
 })(jQuery, document, window);
\ No newline at end of file
diff --git a/dashboard-ui/scripts/encodingsettings.js b/dashboard-ui/scripts/encodingsettings.js
index a5989b8116..9550606c71 100644
--- a/dashboard-ui/scripts/encodingsettings.js
+++ b/dashboard-ui/scripts/encodingsettings.js
@@ -12,6 +12,8 @@
         
         $('#chkAllowUpscaling', page).checked(config.AllowVideoUpscaling).checkboxradio("refresh");
 
+        $('#txtDownMixAudioBoost', page).val(config.DownMixAudioBoost);
+
         Dashboard.hideLoadingMsg();
     }
 
@@ -41,6 +43,7 @@
                 config.AllowVideoUpscaling = $('#chkAllowUpscaling', form).checked();
                 config.EnableDebugEncodingLogging = $('#chkEnableDebugEncodingLogging', form).checked();
                 config.MediaEncodingQuality = $('.radioEncodingQuality:checked', form).val();
+                config.DownMixAudioBoost = $('#txtDownMixAudioBoost', form).val();
 
                 ApiClient.updateServerConfiguration(config).done(Dashboard.processServerConfigurationUpdateResult);
             });