From 1fc390dc50cff486aa65b9475e8657de92cc2e40 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Thu, 26 Mar 2015 12:58:02 -0400
Subject: [PATCH 01/33] use server to build initial stream url's

---
 dashboard-ui/scripts/mediaplayer-video.js     | 254 +++--------
 dashboard-ui/scripts/mediaplayer.js           | 408 +++++++++++++-----
 .../thirdparty/apiclient/apiclient.js         |   8 +-
 3 files changed, 375 insertions(+), 295 deletions(-)

diff --git a/dashboard-ui/scripts/mediaplayer-video.js b/dashboard-ui/scripts/mediaplayer-video.js
index 0f07dce33..6ccf001f3 100644
--- a/dashboard-ui/scripts/mediaplayer-video.js
+++ b/dashboard-ui/scripts/mediaplayer-video.js
@@ -428,14 +428,12 @@
 
                 if (!$(this).hasClass('selectedMediaPopupOption')) {
 
-                    var maxWidth = parseInt(this.getAttribute('data-maxwidth'));
                     var bitrate = parseInt(this.getAttribute('data-bitrate'));
 
                     AppSettings.maxStreamingBitrate(bitrate);
 
                     self.changeStream(self.getCurrentTicks(), {
 
-                        MaxWidth: maxWidth,
                         Bitrate: bitrate
                     });
                 }
@@ -796,7 +794,12 @@
             var currentSrc = self.getCurrentSrc(self.currentMediaElement).toLowerCase();
             var isStatic = currentSrc.indexOf('static=true') != -1;
 
-            var options = getVideoQualityOptions(self.currentMediaSource.MediaStreams);
+            var videoStream = self.currentMediaSource.MediaStreams.filter(function (stream) {
+                return stream.Type == "Video";
+            })[0];
+            var videoWidth = videoStream ? videoStream.Width : null;
+
+            var options = self.getVideoQualityOptions(videoWidth);
 
             if (isStatic) {
                 options[0].name = "Direct";
@@ -819,7 +822,7 @@
                     cssClass += ' selectedMediaPopupOption';
                 }
 
-                var optionHtml = '<li><a data-maxwidth="' + option.maxWidth + '" data-bitrate="' + option.bitrate + '" class="' + cssClass + '" href="#">';
+                var optionHtml = '<li><a data-bitrate="' + option.bitrate + '" class="' + cssClass + '" href="#">';
 
                 optionHtml += '<p style="margin:0;">';
 
@@ -845,85 +848,6 @@
             return html;
         }
 
-        function getVideoQualityOptions(mediaStreams) {
-
-            var videoStream = mediaStreams.filter(function (stream) {
-                return stream.Type == "Video";
-            })[0];
-
-            var bitrateSetting = AppSettings.maxStreamingBitrate();
-
-            var maxAllowedWidth = self.getMaxPlayableWidth();
-
-            var options = [];
-
-            // We have media info
-            if (videoStream && videoStream.Width) {
-
-                maxAllowedWidth = videoStream.Width;
-            }
-
-            // Some 1080- videos are reported as 1912?
-            if (maxAllowedWidth >= 1900) {
-                options.push({ name: '1080p - 30Mbps', maxWidth: 1920, bitrate: 30000000 });
-                options.push({ name: '1080p - 25Mbps', maxWidth: 1920, bitrate: 25000000 });
-                options.push({ name: '1080p - 20Mbps', maxWidth: 1920, bitrate: 20000000 });
-                options.push({ name: '1080p - 15Mbps', maxWidth: 1920, bitrate: 15000000 });
-                options.push({ name: '1080p - 10Mbps', maxWidth: 1920, bitrate: 10000000 });
-                options.push({ name: '1080p - 8Mbps', maxWidth: 1920, bitrate: 8000000 });
-                options.push({ name: '1080p - 6Mbps', maxWidth: 1920, bitrate: 6000000 });
-                options.push({ name: '1080p - 5Mbps', maxWidth: 1920, bitrate: 5000000 });
-            }
-            else if (maxAllowedWidth >= 1260) {
-                options.push({ name: '720p - 10Mbps', maxWidth: 1280, bitrate: 10000000 });
-                options.push({ name: '720p - 8Mbps', maxWidth: 1280, bitrate: 8000000 });
-                options.push({ name: '720p - 6Mbps', maxWidth: 1280, bitrate: 6000000 });
-                options.push({ name: '720p - 5Mbps', maxWidth: 1280, bitrate: 5000000 });
-            }
-            else if (maxAllowedWidth >= 460) {
-                options.push({ name: '480p - 4Mbps', maxWidth: 720, bitrate: 4000000 });
-                options.push({ name: '480p - 3Mbps', maxWidth: 720, bitrate: 3000000 });
-                options.push({ name: '480p - 2.5Mbps', maxWidth: 720, bitrate: 2500000 });
-                options.push({ name: '480p - 2Mbps', maxWidth: 720, bitrate: 2000000 });
-                options.push({ name: '480p - 1.5Mbps', maxWidth: 720, bitrate: 1500000 });
-            }
-
-            if (maxAllowedWidth >= 1260) {
-                options.push({ name: '720p - 4Mbps', maxWidth: 1280, bitrate: 4000000 });
-                options.push({ name: '720p - 3Mbps', maxWidth: 1280, bitrate: 3000000 });
-                options.push({ name: '720p - 2Mbps', maxWidth: 1280, bitrate: 2000000 });
-
-                // The extra 1 is because they're keyed off the bitrate value
-                options.push({ name: '720p - 1Mbps', maxWidth: 1280, bitrate: 1000001 });
-            }
-
-            options.push({ name: '480p - 1.0Mbps', maxWidth: 720, bitrate: 1000000 });
-            options.push({ name: '480p - 720kbps', maxWidth: 720, bitrate: 720000 });
-            options.push({ name: '480p - 420kbps', maxWidth: 720, bitrate: 420000 });
-            options.push({ name: '360p', maxWidth: 640, bitrate: 400000 });
-            options.push({ name: '240p', maxWidth: 426, bitrate: 320000 });
-
-            var i, length, option;
-            var selectedIndex = -1;
-            for (i = 0, length = options.length; i < length; i++) {
-
-                option = options[i];
-
-                if (selectedIndex == -1 && option.bitrate <= bitrateSetting) {
-                    selectedIndex = i;
-                }
-            }
-
-            if (selectedIndex == -1) {
-
-                selectedIndex = options.length - 1;
-            }
-
-            options[selectedIndex].selected = true;
-
-            return options;
-        }
-
         function bindEventsForPlayback() {
 
             var hideElementsOnIdle = !$.browser.mobile;
@@ -1007,101 +931,71 @@
             }
         };
 
-        self.playVideo = function (playbackInfo, item, mediaSource, startPosition) {
+        self.playVideo = function (deviceProfile, playbackInfo, item, mediaSource, startPosition) {
+
+            var videoUrl;
+            var contentType;
 
             var mediaStreams = mediaSource.MediaStreams || [];
-
             var subtitleStreams = mediaStreams.filter(function (s) {
                 return s.Type == 'Subtitle';
             });
 
-            var selectedSubtitleStream = subtitleStreams.filter(function (s) {
-                return s.Index == mediaSource.DefaultSubtitleStreamIndex;
-
-            })[0];
-
-            var baseParams = {
-                audioChannels: 2,
-                StartTimeTicks: startPosition,
-                AudioStreamIndex: mediaSource.DefaultAudioStreamIndex,
-                deviceId: ApiClient.deviceId(),
-                Static: false,
-                mediaSourceId: mediaSource.Id,
-                api_key: ApiClient.accessToken(),
-                StreamId: playbackInfo.StreamId
-            };
-
-            if (selectedSubtitleStream && (!self.supportsSubtitleStreamExternally(selectedSubtitleStream) || !self.supportsTextTracks())) {
-                baseParams.SubtitleStreamIndex = mediaSource.DefaultSubtitleStreamIndex;
-            }
-
-            var mp4Quality = getVideoQualityOptions(mediaStreams).filter(function (opt) {
-                return opt.selected;
-            })[0];
-            mp4Quality = $.extend(mp4Quality, self.getFinalVideoParams(mediaSource, mp4Quality.maxWidth, mp4Quality.bitrate, baseParams.AudioStreamIndex, baseParams.SubtitleStreamIndex, '.mp4'));
-
-            var webmQuality = getVideoQualityOptions(mediaStreams).filter(function (opt) {
-                return opt.selected;
-            })[0];
-            webmQuality = $.extend(webmQuality, self.getFinalVideoParams(mediaSource, webmQuality.maxWidth, webmQuality.bitrate, baseParams.AudioStreamIndex, baseParams.SubtitleStreamIndex, '.webm'));
-
-            var m3U8Quality = getVideoQualityOptions(mediaStreams).filter(function (opt) {
-                return opt.selected;
-            })[0];
-            m3U8Quality = $.extend(m3U8Quality, self.getFinalVideoParams(mediaSource, mp4Quality.maxWidth, mp4Quality.bitrate, baseParams.AudioStreamIndex, baseParams.SubtitleStreamIndex, '.mp4'));
-
-            var isStatic = mp4Quality.isStatic;
-
-            self.startTimeTicksOffset = isStatic ? 0 : startPosition || 0;
-
-            var startPositionInSeekParam = startPosition ? (startPosition / 10000000) : 0;
-            var seekParam = startPositionInSeekParam ? '#t=' + startPositionInSeekParam : '';
-
-            var mp4VideoUrl = ApiClient.getUrl('Videos/' + item.Id + '/stream.mp4', $.extend({}, baseParams, {
-                Static: isStatic,
-                maxWidth: mp4Quality.maxWidth,
-                videoBitrate: mp4Quality.videoBitrate,
-                audioBitrate: mp4Quality.audioBitrate,
-                VideoCodec: mp4Quality.videoCodec,
-                AudioCodec: mp4Quality.audioCodec,
-                profile: 'high',
-                //EnableAutoStreamCopy: false,
-                level: '41'
-            }));
-
-            if (isStatic && mediaSource.Protocol == 'Http' && !mediaSource.RequiredHttpHeaders.length) {
-                mp4VideoUrl = mediaSource.Path;
-            }
-
-            if (isStatic) {
-                mp4VideoUrl += seekParam;
+            if (mediaSource.enableDirectPlay) {
+                videoUrl = mediaSource.Path;
+                self.startTimeTicksOffset = 0;
+                contentType = 'video/' + mediaSource.Container;
             } else {
-                mp4VideoUrl += "&StreamId=" + new Date().getTime();
+
+                var selectedSubtitleStream = subtitleStreams.filter(function (s) {
+                    return s.Index == mediaSource.DefaultSubtitleStreamIndex;
+
+                })[0];
+
+                var transcodingParams = {
+                    audioChannels: 2,
+                    StartTimeTicks: startPosition,
+                    AudioStreamIndex: mediaSource.DefaultAudioStreamIndex,
+                    deviceId: ApiClient.deviceId(),
+                    mediaSourceId: mediaSource.Id,
+                    api_key: ApiClient.accessToken(),
+                    StreamId: playbackInfo.StreamId,
+                    ClientTime: new Date().getTime()
+                };
+
+                if (selectedSubtitleStream && (!self.supportsSubtitleStreamExternally(selectedSubtitleStream) || !self.supportsTextTracks())) {
+                    transcodingParams.SubtitleStreamIndex = mediaSource.DefaultSubtitleStreamIndex;
+                }
+
+                self.startTimeTicksOffset = mediaSource.SupportsDirectStream ? 0 : startPosition || 0;
+                var startPositionInSeekParam = startPosition ? (startPosition / 10000000) : 0;
+                var seekParam = startPositionInSeekParam ? '#t=' + startPositionInSeekParam : '';
+
+                if (mediaSource.SupportsDirectStream) {
+
+                    videoUrl = ApiClient.getUrl('Videos/' + item.Id + '/stream.' + mediaSource.Container, {
+                        Static: true,
+                        mediaSourceId: mediaSource.Id,
+                        api_key: ApiClient.accessToken()
+                    });
+                    videoUrl += seekParam;
+                    contentType = 'video/' + mediaSource.Container;
+
+                } else {
+                    videoUrl = ApiClient.getUrl(mediaSource.TranscodingUrl);
+
+                    if (mediaSource.TranscodingSubProtocol == 'hls') {
+
+                        videoUrl += seekParam;
+                        contentType = 'application/x-mpegURL';
+                    }
+                    else {
+
+                        contentType = 'video/' + mediaSource.TranscodingContainer;
+                    }
+                }
             }
 
-            var webmVideoUrl = ApiClient.getUrl('Videos/' + item.Id + '/stream.webm', $.extend({}, baseParams, {
-                VideoCodec: 'vpx',
-                AudioCodec: 'Vorbis',
-                maxWidth: webmQuality.maxWidth,
-                videoBitrate: webmQuality.videoBitrate,
-                audioBitrate: webmQuality.audioBitrate,
-                EnableAutoStreamCopy: false,
-                StreamId: new Date().getTime()
-            }));
-
-            var hlsVideoUrl = ApiClient.getUrl('Videos/' + item.Id + '/master.m3u8', $.extend({}, baseParams, {
-                maxWidth: m3U8Quality.maxWidth,
-                videoBitrate: m3U8Quality.videoBitrate,
-                audioBitrate: m3U8Quality.audioBitrate,
-                VideoCodec: m3U8Quality.videoCodec,
-                AudioCodec: m3U8Quality.audioCodec,
-                profile: 'high',
-                level: '41',
-                StartTimeTicks: 0,
-                StreamId: new Date().getTime()
-
-            })) + seekParam;
-
             //======================================================================================>
 
             // Create video player
@@ -1118,27 +1012,7 @@
                 html += '<video class="itemVideo" id="itemVideo" preload="metadata" autoplay>';
             }
 
-            if (!isStatic) {
-                // HLS must be at the top for safari
-                html += '<source type="application/x-mpegURL" src="' + hlsVideoUrl + '" />';
-            }
-
-            var mp4BeforeWebm = self.getVideoTranscodingExtension() != '.webm';
-
-            if (mp4BeforeWebm) {
-                html += '<source type="video/mp4" src="' + mp4VideoUrl + '" />';
-            }
-
-            // Have to put webm ahead of mp4 because it will play in fast forward in chrome
-            // And firefox doesn't like fragmented mp4
-            if (!isStatic) {
-
-                html += '<source type="video/webm" src="' + webmVideoUrl + '" />';
-            }
-
-            if (!mp4BeforeWebm) {
-                html += '<source type="video/mp4" src="' + mp4VideoUrl + '" />';
-            }
+            html += '<source type="' + contentType + '" src="' + videoUrl + '" />';
 
             if (self.supportsTextTracks()) {
                 var textStreams = subtitleStreams.filter(function (s) {
diff --git a/dashboard-ui/scripts/mediaplayer.js b/dashboard-ui/scripts/mediaplayer.js
index f562afbc3..d0231ea94 100644
--- a/dashboard-ui/scripts/mediaplayer.js
+++ b/dashboard-ui/scripts/mediaplayer.js
@@ -37,6 +37,245 @@
             return targets;
         };
 
+        var supportsAac = document.createElement('audio').canPlayType('audio/aac').replace(/no/, '');
+
+        self.getVideoQualityOptions = function (videoWidth) {
+
+            var bitrateSetting = AppSettings.maxStreamingBitrate();
+
+            var maxAllowedWidth = videoWidth || 4096;
+
+            var options = [];
+
+            // Some 1080- videos are reported as 1912?
+            if (maxAllowedWidth >= 1900) {
+                options.push({ name: '1080p - 30Mbps', maxWidth: 1920, bitrate: 30000000 });
+                options.push({ name: '1080p - 25Mbps', maxWidth: 1920, bitrate: 25000000 });
+                options.push({ name: '1080p - 20Mbps', maxWidth: 1920, bitrate: 20000000 });
+                options.push({ name: '1080p - 15Mbps', maxWidth: 1920, bitrate: 15000000 });
+                options.push({ name: '1080p - 10Mbps', maxWidth: 1920, bitrate: 10000000 });
+                options.push({ name: '1080p - 8Mbps', maxWidth: 1920, bitrate: 8000000 });
+                options.push({ name: '1080p - 6Mbps', maxWidth: 1920, bitrate: 6000000 });
+                options.push({ name: '1080p - 5Mbps', maxWidth: 1920, bitrate: 5000000 });
+            } else if (maxAllowedWidth >= 1260) {
+                options.push({ name: '720p - 10Mbps', maxWidth: 1280, bitrate: 10000000 });
+                options.push({ name: '720p - 8Mbps', maxWidth: 1280, bitrate: 8000000 });
+                options.push({ name: '720p - 6Mbps', maxWidth: 1280, bitrate: 6000000 });
+                options.push({ name: '720p - 5Mbps', maxWidth: 1280, bitrate: 5000000 });
+            } else if (maxAllowedWidth >= 460) {
+                options.push({ name: '480p - 4Mbps', maxWidth: 720, bitrate: 4000000 });
+                options.push({ name: '480p - 3Mbps', maxWidth: 720, bitrate: 3000000 });
+                options.push({ name: '480p - 2.5Mbps', maxWidth: 720, bitrate: 2500000 });
+                options.push({ name: '480p - 2Mbps', maxWidth: 720, bitrate: 2000000 });
+                options.push({ name: '480p - 1.5Mbps', maxWidth: 720, bitrate: 1500000 });
+            }
+
+            if (maxAllowedWidth >= 1260) {
+                options.push({ name: '720p - 4Mbps', maxWidth: 1280, bitrate: 4000000 });
+                options.push({ name: '720p - 3Mbps', maxWidth: 1280, bitrate: 3000000 });
+                options.push({ name: '720p - 2Mbps', maxWidth: 1280, bitrate: 2000000 });
+
+                // The extra 1 is because they're keyed off the bitrate value
+                options.push({ name: '720p - 1Mbps', maxWidth: 1280, bitrate: 1000001 });
+            }
+
+            options.push({ name: '480p - 1.0Mbps', maxWidth: 720, bitrate: 1000000 });
+            options.push({ name: '480p - 720kbps', maxWidth: 720, bitrate: 720000 });
+            options.push({ name: '480p - 420kbps', maxWidth: 720, bitrate: 420000 });
+            options.push({ name: '360p', maxWidth: 640, bitrate: 400000 });
+            options.push({ name: '240p', maxWidth: 426, bitrate: 320000 });
+
+            var i, length, option;
+            var selectedIndex = -1;
+            for (i = 0, length = options.length; i < length; i++) {
+
+                option = options[i];
+
+                if (selectedIndex == -1 && option.bitrate <= bitrateSetting) {
+                    selectedIndex = i;
+                }
+            }
+
+            if (selectedIndex == -1) {
+
+                selectedIndex = options.length - 1;
+            }
+
+            options[selectedIndex].selected = true;
+
+            return options;
+        };
+
+        self.getDeviceProfile = function () {
+
+            var qualityOption = self.getVideoQualityOptions().filter(function (q) {
+                return q.selected;
+            })[0];
+
+            var bitrateSetting = AppSettings.maxStreamingBitrate();
+
+            var profile = {};
+
+            profile.MaxStreamingBitrate = bitrateSetting;
+            profile.MaxStaticBitrate = 40000000;
+            profile.MusicStreamingTranscodingBitrate = 128000;
+
+            profile.DirectPlayProfiles = [];
+            profile.DirectPlayProfiles.push({
+                Container: 'mp4',
+                Type: 'Video',
+                VideoCodec: 'h264',
+                AudioCodec: 'aac,mp3'
+            });
+
+            if ($.browser.chrome) {
+                profile.DirectPlayProfiles.push({
+                    Container: 'mkv,m4v',
+                    Type: 'Video',
+                    VideoCodec: 'h264',
+                    AudioCodec: 'aac,mp3'
+                });
+                profile.DirectPlayProfiles.push({
+                    Container: 'flv',
+                    Type: 'Video'
+                });
+            }
+
+            profile.DirectPlayProfiles.push({
+                Container: 'mp3',
+                Type: 'Audio'
+            });
+
+            if (supportsAac) {
+                profile.DirectPlayProfiles.push({
+                    Container: 'aac',
+                    Type: 'Audio'
+                });
+            }
+
+            profile.TranscodingProfiles = [];
+            profile.TranscodingProfiles.push({
+                Container: 'mp3',
+                Type: 'Audio',
+                AudioCodec: 'mp3',
+                Context: 'Streaming',
+                Protocol: 'http'
+            });
+
+            if (self.canPlayHls()) {
+                profile.TranscodingProfiles.push({
+                    Container: 'ts',
+                    Type: 'Video',
+                    AudioCodec: 'aac',
+                    VideoCodec: 'h264',
+                    Context: 'Streaming',
+                    Protocol: 'hls'
+                });
+            }
+
+            if (self.canPlayWebm()) {
+
+                profile.TranscodingProfiles.push({
+                    Container: 'webm',
+                    Type: 'Video',
+                    AudioCodec: 'vorbis',
+                    VideoCodec: 'vpx',
+                    Context: 'Streaming',
+                    Protocol: 'http'
+                });
+            }
+
+            profile.TranscodingProfiles.push({
+                Container: 'mp4',
+                Type: 'Video',
+                AudioCodec: 'aac',
+                VideoCodec: 'h264',
+                Context: 'Streaming',
+                Protocol: 'http'
+            });
+
+            profile.ContainerProfiles = [];
+
+            var audioConditions = [];
+            if ($.browser.msie) {
+                audioConditions.push({
+                    Condition: 'LessThanEqual',
+                    Property: 'AudioChannels',
+                    Value: '2'
+                });
+            }
+
+            profile.CodecProfiles = [];
+            profile.CodecProfiles.push({
+                Type: 'Audio',
+                Conditions: audioConditions
+            });
+
+            profile.CodecProfiles.push({
+                Type: 'VideoAudio',
+                Conditions: audioConditions
+            });
+
+            profile.CodecProfiles.push({
+                Type: 'Video',
+                Codec: 'h264',
+                Conditions: [
+                {
+                    Condition: 'Equals',
+                    Property: 'IsCabac',
+                    Value: 'true'
+                },
+                {
+                    Condition: 'NotEquals',
+                    Property: 'IsAnamorphic',
+                    Value: 'true'
+                },
+                {
+                    Condition: 'EqualsAny',
+                    Property: 'VideoProfile',
+                    Value: 'high|main|baseline|constrained baseline'
+                },
+                {
+                    Condition: 'LessThanEqual',
+                    Property: 'VideoLevel',
+                    Value: '41'
+                },
+                {
+                    Condition: 'LessThanEqual',
+                    Property: 'Width',
+                    Value: qualityOption.maxWidth
+                }]
+            });
+
+            profile.CodecProfiles.push({
+                Type: 'Video',
+                Codec: 'vpx',
+                Conditions: [
+                {
+                    Condition: 'NotEquals',
+                    Property: 'IsAnamorphic',
+                    Value: 'true'
+                },
+                {
+                    Condition: 'LessThanEqual',
+                    Property: 'Width',
+                    Value: qualityOption.maxWidth
+                }]
+            });
+
+            // Subtitle profiles
+            // External vtt or burn in
+            profile.SubtitleProfiles = [];
+            if (self.supportsTextTracks()) {
+                profile.SubtitleProfiles.push({
+                    Format: 'vtt',
+                    Method: 'External'
+                });
+            }
+
+            return profile;
+        };
+
         self.updateCanClientSeek = function (elem) {
 
             var duration = elem.duration;
@@ -89,17 +328,27 @@
             return currentSrc.substring(currentSrc.lastIndexOf('.'));
         };
 
-        self.getVideoTranscodingExtension = function (currentSrc) {
-
-            if (currentSrc) {
-                return self.getCurrentMediaExtension(currentSrc);
-            }
+        self.canPlayHls = function () {
 
             var media = testableVideoElement;
 
             // safari
             if (media.canPlayType('application/x-mpegURL').replace(/no/, '') ||
                 media.canPlayType('application/vnd.apple.mpegURL').replace(/no/, '')) {
+                return true;
+            }
+
+            return false;
+        };
+
+        self.getVideoTranscodingExtension = function (currentSrc) {
+
+            if (currentSrc) {
+                return self.getCurrentMediaExtension(currentSrc);
+            }
+
+            // safari
+            if (self.canPlayHls()) {
                 return '.m3u8';
             }
 
@@ -151,7 +400,6 @@
                         currentSrc = replaceQueryString(currentSrc, 'SubtitleStreamIndex', (params.SubtitleStreamIndex == -1 ? '' : params.SubtitleStreamIndex));
                     }
 
-                    var maxWidth = params.MaxWidth || getParameterByName('MaxWidth', currentSrc);
                     var audioStreamIndex = params.AudioStreamIndex == null ? getParameterByName('AudioStreamIndex', currentSrc) : params.AudioStreamIndex;
                     if (typeof (audioStreamIndex) == 'string') {
                         audioStreamIndex = parseInt(audioStreamIndex);
@@ -161,9 +409,8 @@
                     var audioBitrate = parseInt(getParameterByName('AudioBitrate', currentSrc) || '0');
                     var bitrate = params.Bitrate || (videoBitrate + audioBitrate);
 
-                    var finalParams = self.getFinalVideoParams(self.currentMediaSource, maxWidth, bitrate, audioStreamIndex, subtitleStreamIndex, transcodingExtension);
+                    var finalParams = self.getFinalVideoParams(self.currentMediaSource, bitrate, audioStreamIndex, subtitleStreamIndex, transcodingExtension);
 
-                    currentSrc = replaceQueryString(currentSrc, 'MaxWidth', finalParams.maxWidth);
                     currentSrc = replaceQueryString(currentSrc, 'VideoBitrate', finalParams.videoBitrate);
 
                     currentSrc = replaceQueryString(currentSrc, 'VideoCodec', finalParams.videoCodec);
@@ -274,7 +521,7 @@
             return supportsTextTracks;
         };
 
-        self.getVideoDirectPlayMethod = function (mediaSource, videoStream, audioStream, subtitleStream, maxWidth, bitrate) {
+        self.getVideoDirectPlayMethod = function (mediaSource, videoStream, audioStream, subtitleStream, bitrate) {
 
             if (!mediaSource) {
                 throw new Error('Null mediaSource');
@@ -322,11 +569,6 @@
                 return null;
             }
 
-            if (videoStream.Width > maxWidth) {
-                console.log('Transcoding because resolution is too high');
-                return null;
-            }
-
             if (videoStream && videoStream.IsAnamorphic) {
                 console.log('Transcoding because video is anamorphic');
                 return null;
@@ -372,7 +614,7 @@
             return null;
         };
 
-        self.getFinalVideoParams = function (mediaSource, maxWidth, bitrate, audioStreamIndex, subtitleStreamIndex, transcodingExtension) {
+        self.getFinalVideoParams = function (mediaSource, bitrate, audioStreamIndex, subtitleStreamIndex, transcodingExtension) {
 
             var mediaStreams = mediaSource.MediaStreams;
 
@@ -388,7 +630,7 @@
                 return stream.Index === subtitleStreamIndex && stream.Type == 'Subtitle';
             })[0];
 
-            var directPlayMethod = self.getVideoDirectPlayMethod(mediaSource, videoStream, audioStream, subtitleStream, maxWidth, bitrate);
+            var directPlayMethod = self.getVideoDirectPlayMethod(mediaSource, videoStream, audioStream, subtitleStream, bitrate);
 
             var audioBitrate = bitrate >= 700000 ? 192000 : 64000;
 
@@ -396,7 +638,6 @@
 
             var params = {
                 isStatic: directPlayMethod != null,
-                maxWidth: maxWidth,
                 audioCodec: transcodingExtension == '.webm' ? 'vorbis' : 'aac',
                 videoCodec: transcodingExtension == '.webm' ? 'vpx' : 'h264',
                 audioBitrate: audioBitrate,
@@ -504,11 +745,6 @@
 
         };
 
-        self.getMaxPlayableWidth = function () {
-
-            return Math.max(screen.height, screen.width);
-        };
-
         self.playWithIntros = function (items, options, user) {
 
             var firstItem = items[0];
@@ -534,38 +770,18 @@
 
         function getOptimalMediaSource(mediaType, versions) {
 
-            var optimalVersion;
-            var bitrateSetting = AppSettings.maxStreamingBitrate();
+            var optimalVersion = versions.filter(function (v) {
 
-            if (mediaType == 'Video') {
+                v.enableDirectPlay = v.SupportsDirectPlay && v.Protocol == 'Http' && !v.RequiredHttpHeaders.length;
 
-                var maxAllowedWidth = self.getMaxPlayableWidth();
+                return v.enableDirectPlay;
 
+            })[0];
+
+            if (!optimalVersion) {
                 optimalVersion = versions.filter(function (v) {
 
-                    var videoStream = v.MediaStreams.filter(function (s) {
-                        return s.Type == 'Video';
-                    })[0];
-
-                    var audioStream = v.MediaStreams.filter(function (s) {
-                        return s.Type == 'Audio';
-                    })[0];
-
-                    var directPlayMethod = self.getVideoDirectPlayMethod(v, videoStream, audioStream, null, maxAllowedWidth, bitrateSetting);
-
-                    if (directPlayMethod == 'DirectPlay') {
-                        return true;
-                    }
-
-                    return v.SupportsDirectStream && directPlayMethod == 'DirectStream';
-
-                })[0];
-
-            } else {
-
-                optimalVersion = versions.filter(function (v) {
-
-                    return v.SupportsDirectStream && canPlayAudioMediaSourceDirect(v);
+                    return v.SupportsDirectStream;
 
                 })[0];
             }
@@ -595,11 +811,22 @@
             }
 
             var mediaSource;
+            var deviceProfile = self.getDeviceProfile();
 
-            ApiClient.getJSON(ApiClient.getUrl('Items/' + item.Id + '/PlaybackInfo', {
-                userId: Dashboard.getCurrentUserId()
+            ApiClient.ajax({
 
-            })).done(function (result) {
+                url: ApiClient.getUrl('Items/' + item.Id + '/PlaybackInfo', {
+                    userId: Dashboard.getCurrentUserId()
+
+                }),
+                type: 'POST',
+                data: JSON.stringify({
+                    DeviceProfile: deviceProfile
+                }),
+                contentType: "application/json",
+                dataType: "json"
+
+            }).done(function (result) {
 
                 if (validatePlaybackInfoResult(result)) {
 
@@ -612,7 +839,7 @@
 
                         if (item.MediaType === "Video") {
 
-                            self.currentMediaElement = self.playVideo(result, item, self.currentMediaSource, startPosition);
+                            self.currentMediaElement = self.playVideo(deviceProfile, result, item, self.currentMediaSource, startPosition);
                             self.currentDurationTicks = self.currentMediaSource.RunTimeTicks;
 
                             self.updateNowPlayingInfo(item);
@@ -1380,63 +1607,36 @@
             return $('.mediaPlayerAudio');
         }
 
-        function canPlayAudioMediaSourceDirect(mediaSource) {
-
-            var sourceContainer = (mediaSource.Container || '').toLowerCase();
-
-            if (sourceContainer == 'mp3' ||
-                (sourceContainer == 'aac' && supportsAac)) {
-
-                for (var i = 0, length = mediaSource.MediaStreams.length; i < length; i++) {
-
-                    var stream = mediaSource.MediaStreams[i];
-
-                    if (stream.Type == "Audio") {
-
-                        // Stream statically when possible
-                        if (stream.BitRate <= 320000) {
-                            return true;
-                        }
-                        break;
-                    }
-                }
-            }
-
-            return false;
-        }
-
-        var supportsAac = document.createElement('audio').canPlayType('audio/aac').replace(/no/, '');
-
         function playAudio(playbackInfo, item, mediaSource, startPositionTicks) {
 
-            startPositionTicks = startPositionTicks || 0;
+            var audioUrl;
+            if (mediaSource.enableDirectPlay) {
 
-            var baseParams = {
-                audioChannels: 2,
-                audioBitrate: 128000,
-                StartTimeTicks: startPositionTicks,
-                mediaSourceId: mediaSource.Id,
-                deviceId: ApiClient.deviceId(),
-                api_key: ApiClient.accessToken(),
-                StreamId: playbackInfo.StreamId
-            };
+                audioUrl = mediaSource.Path;
+                self.startTimeTicksOffset = 0;
 
-            var sourceContainer = (mediaSource.Container || '').toLowerCase();
-            var isStatic = canPlayAudioMediaSourceDirect(mediaSource);
-
-            var outputContainer = isStatic ? sourceContainer : 'mp3';
-            var audioUrl = ApiClient.getUrl('Audio/' + item.Id + '/stream.' + outputContainer, $.extend({}, baseParams, {
-                audioCodec: outputContainer
-            }));
-
-            if (isStatic) {
-                var seekParam = startPositionTicks ? '#t=' + (startPositionTicks / 10000000) : '';
-                audioUrl += "&static=true" + seekParam;
             } else {
-                audioUrl += "&ClientTime=" + new Date().getTime();
-            }
 
-            self.startTimeTicksOffset = isStatic ? 0 : startPositionTicks;
+                var isDirectStream = mediaSource.SupportsDirectStream;
+                startPositionTicks = startPositionTicks || 0;
+
+                if (isDirectStream) {
+
+                    var outputContainer = (mediaSource.Container || '').toLowerCase();
+
+                    var seekParam = startPositionTicks ? '#t=' + (startPositionTicks / 10000000) : '';
+                    audioUrl = ApiClient.getUrl('Audio/' + item.Id + '/stream.' + outputContainer, {
+                        mediaSourceId: mediaSource.Id,
+                        deviceId: ApiClient.deviceId(),
+                        api_key: ApiClient.accessToken()
+                    });
+                    audioUrl += "&static=true" + seekParam;
+                } else {
+                    audioUrl = ApiClient.getUrl(mediaSource.TranscodingUrl);
+                }
+
+                self.startTimeTicksOffset = isDirectStream ? 0 : startPositionTicks;
+            }
 
             var initialVolume = self.getSavedVolume();
 
diff --git a/dashboard-ui/thirdparty/apiclient/apiclient.js b/dashboard-ui/thirdparty/apiclient/apiclient.js
index 8ce9a7788..b2c72ed0a 100644
--- a/dashboard-ui/thirdparty/apiclient/apiclient.js
+++ b/dashboard-ui/thirdparty/apiclient/apiclient.js
@@ -306,7 +306,13 @@
                 throw new Error("Url name cannot be empty");
             }
 
-            var url = serverAddress + "/" + name;
+            var url = serverAddress;
+
+            if (name.charAt(0) != '/') {
+                url += '/';
+            }
+
+            url += name;
 
             if (params) {
                 url += "?" + AjaxApi.param(params);

From 640b6df8673b184db8a2007677f502e1dfcf4b79 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Thu, 26 Mar 2015 14:23:46 -0400
Subject: [PATCH 02/33] fixes #1003 - [Transcoding] VP8 + OGG to VP8 + OGG

---
 dashboard-ui/scripts/mediaplayer-video.js |  63 +----
 dashboard-ui/scripts/mediaplayer.js       | 309 +++++++++++++---------
 2 files changed, 192 insertions(+), 180 deletions(-)

diff --git a/dashboard-ui/scripts/mediaplayer-video.js b/dashboard-ui/scripts/mediaplayer-video.js
index 6ccf001f3..34af6660a 100644
--- a/dashboard-ui/scripts/mediaplayer-video.js
+++ b/dashboard-ui/scripts/mediaplayer-video.js
@@ -933,69 +933,18 @@
 
         self.playVideo = function (deviceProfile, playbackInfo, item, mediaSource, startPosition) {
 
-            var videoUrl;
-            var contentType;
+            var streamInfo = self.createStreamInfo('video', item, mediaSource, startPosition);
+
+            var videoUrl = streamInfo.url;
+            var contentType = streamInfo.contentType;
+            var startPositionInSeekParam = streamInfo.startPositionInSeekParam;
+            self.startTimeTicksOffset = streamInfo.startTimeTicksOffset;
 
             var mediaStreams = mediaSource.MediaStreams || [];
             var subtitleStreams = mediaStreams.filter(function (s) {
                 return s.Type == 'Subtitle';
             });
 
-            if (mediaSource.enableDirectPlay) {
-                videoUrl = mediaSource.Path;
-                self.startTimeTicksOffset = 0;
-                contentType = 'video/' + mediaSource.Container;
-            } else {
-
-                var selectedSubtitleStream = subtitleStreams.filter(function (s) {
-                    return s.Index == mediaSource.DefaultSubtitleStreamIndex;
-
-                })[0];
-
-                var transcodingParams = {
-                    audioChannels: 2,
-                    StartTimeTicks: startPosition,
-                    AudioStreamIndex: mediaSource.DefaultAudioStreamIndex,
-                    deviceId: ApiClient.deviceId(),
-                    mediaSourceId: mediaSource.Id,
-                    api_key: ApiClient.accessToken(),
-                    StreamId: playbackInfo.StreamId,
-                    ClientTime: new Date().getTime()
-                };
-
-                if (selectedSubtitleStream && (!self.supportsSubtitleStreamExternally(selectedSubtitleStream) || !self.supportsTextTracks())) {
-                    transcodingParams.SubtitleStreamIndex = mediaSource.DefaultSubtitleStreamIndex;
-                }
-
-                self.startTimeTicksOffset = mediaSource.SupportsDirectStream ? 0 : startPosition || 0;
-                var startPositionInSeekParam = startPosition ? (startPosition / 10000000) : 0;
-                var seekParam = startPositionInSeekParam ? '#t=' + startPositionInSeekParam : '';
-
-                if (mediaSource.SupportsDirectStream) {
-
-                    videoUrl = ApiClient.getUrl('Videos/' + item.Id + '/stream.' + mediaSource.Container, {
-                        Static: true,
-                        mediaSourceId: mediaSource.Id,
-                        api_key: ApiClient.accessToken()
-                    });
-                    videoUrl += seekParam;
-                    contentType = 'video/' + mediaSource.Container;
-
-                } else {
-                    videoUrl = ApiClient.getUrl(mediaSource.TranscodingUrl);
-
-                    if (mediaSource.TranscodingSubProtocol == 'hls') {
-
-                        videoUrl += seekParam;
-                        contentType = 'application/x-mpegURL';
-                    }
-                    else {
-
-                        contentType = 'video/' + mediaSource.TranscodingContainer;
-                    }
-                }
-            }
-
             //======================================================================================>
 
             // Create video player
diff --git a/dashboard-ui/scripts/mediaplayer.js b/dashboard-ui/scripts/mediaplayer.js
index d0231ea94..127a5a101 100644
--- a/dashboard-ui/scripts/mediaplayer.js
+++ b/dashboard-ui/scripts/mediaplayer.js
@@ -378,101 +378,102 @@
             if (canClientSeek && params == null) {
 
                 element.currentTime = ticks / (1000 * 10000);
+                return;
+            }
+
+            params = params || {};
+
+            var currentSrc = element.currentSrc;
+
+            var currentStreamId = getParameterByName('StreamId', currentSrc);
+
+            //if (self.currentItem.MediaType == "Video") {
+
+            //    transcodingExtension = self.getVideoTranscodingExtension(currentSrc);
+
+            //    if (params.AudioStreamIndex != null) {
+            //        currentSrc = replaceQueryString(currentSrc, 'AudioStreamIndex', params.AudioStreamIndex);
+            //    }
+            //    if (params.SubtitleStreamIndex != null) {
+            //        currentSrc = replaceQueryString(currentSrc, 'SubtitleStreamIndex', (params.SubtitleStreamIndex == -1 ? '' : params.SubtitleStreamIndex));
+            //    }
+
+            //    var audioStreamIndex = params.AudioStreamIndex == null ? getParameterByName('AudioStreamIndex', currentSrc) : params.AudioStreamIndex;
+            //    if (typeof (audioStreamIndex) == 'string') {
+            //        audioStreamIndex = parseInt(audioStreamIndex);
+            //    }
+            //    var subtitleStreamIndex = self.currentSubtitleStreamIndex;
+            //    var videoBitrate = parseInt(getParameterByName('VideoBitrate', currentSrc) || '0');
+            //    var audioBitrate = parseInt(getParameterByName('AudioBitrate', currentSrc) || '0');
+            //    var bitrate = params.Bitrate || (videoBitrate + audioBitrate);
+
+            //    var finalParams = self.getFinalVideoParams(self.currentMediaSource, bitrate, audioStreamIndex, subtitleStreamIndex, transcodingExtension);
+
+            //    currentSrc = replaceQueryString(currentSrc, 'VideoBitrate', finalParams.videoBitrate);
+
+            //    currentSrc = replaceQueryString(currentSrc, 'VideoCodec', finalParams.videoCodec);
+
+            //    currentSrc = replaceQueryString(currentSrc, 'profile', finalParams.profile || '');
+            //    currentSrc = replaceQueryString(currentSrc, 'level', finalParams.level || '');
+
+            //    if (finalParams.isStatic) {
+            //        currentSrc = currentSrc.replace('.webm', '.mp4').replace('.m3u8', '.mp4');
+            //        currentSrc = replaceQueryString(currentSrc, 'ClientTime', '');
+            //    } else {
+            //        currentSrc = currentSrc.replace('.mp4', transcodingExtension).replace('.m4v', transcodingExtension).replace('.mkv', transcodingExtension).replace('.webm', transcodingExtension);
+            //        currentSrc = replaceQueryString(currentSrc, 'ClientTime', new Date().getTime());
+            //    }
+
+            //    currentSrc = replaceQueryString(currentSrc, 'AudioBitrate', finalParams.audioBitrate);
+            //    currentSrc = replaceQueryString(currentSrc, 'Static', finalParams.isStatic);
+            //    currentSrc = replaceQueryString(currentSrc, 'AudioCodec', finalParams.audioCodec);
+            //    isStatic = finalParams.isStatic;
+            //}
+
+            if (params.AudioStreamIndex == null && params.SubtitleStreamIndex == null && params.Bitrate == null) {
+
+                var transcodingProfile = self.getDeviceProfile().TranscodingProfiles.filter(function (t) {
+
+                    return t.Type == self.currentItem.MediaType;
+                })[0];
 
             } else {
 
-                params = params || {};
+                currentSrc = replaceQueryString(currentSrc, 'starttimeticks', ticks || 0);
+                changeStreamToUrl(currentStreamId, currentSrc, ticks);
+            }
+        };
 
-                var currentSrc = element.currentSrc;
+        function changeStreamToUrl(currentStreamId, url, newPositionTicks) {
 
-                var transcodingExtension;
-                var isStatic;
-                var currentStreamId = getParameterByName('StreamId', currentSrc);
+            clearProgressInterval();
 
-                if (self.currentItem.MediaType == "Video") {
+            $(element).off('ended.playbackstopped').off('ended.playnext').one("play", function () {
 
-                    transcodingExtension = self.getVideoTranscodingExtension(currentSrc);
+                self.updateCanClientSeek(this);
 
-                    if (params.AudioStreamIndex != null) {
-                        currentSrc = replaceQueryString(currentSrc, 'AudioStreamIndex', params.AudioStreamIndex);
-                    }
-                    if (params.SubtitleStreamIndex != null) {
-                        currentSrc = replaceQueryString(currentSrc, 'SubtitleStreamIndex', (params.SubtitleStreamIndex == -1 ? '' : params.SubtitleStreamIndex));
-                    }
+                $(this).on('ended.playbackstopped', self.onPlaybackStopped).one('ended.playnext', self.playNextAfterEnded);
 
-                    var audioStreamIndex = params.AudioStreamIndex == null ? getParameterByName('AudioStreamIndex', currentSrc) : params.AudioStreamIndex;
-                    if (typeof (audioStreamIndex) == 'string') {
-                        audioStreamIndex = parseInt(audioStreamIndex);
-                    }
-                    var subtitleStreamIndex = self.currentSubtitleStreamIndex;
-                    var videoBitrate = parseInt(getParameterByName('VideoBitrate', currentSrc) || '0');
-                    var audioBitrate = parseInt(getParameterByName('AudioBitrate', currentSrc) || '0');
-                    var bitrate = params.Bitrate || (videoBitrate + audioBitrate);
+                self.startProgressInterval();
+                sendProgressUpdate();
 
-                    var finalParams = self.getFinalVideoParams(self.currentMediaSource, bitrate, audioStreamIndex, subtitleStreamIndex, transcodingExtension);
+            });
 
-                    currentSrc = replaceQueryString(currentSrc, 'VideoBitrate', finalParams.videoBitrate);
+            if (self.currentItem.MediaType == "Video") {
+                ApiClient.stopActiveEncodings(currentStreamId).done(function () {
 
-                    currentSrc = replaceQueryString(currentSrc, 'VideoCodec', finalParams.videoCodec);
-
-                    currentSrc = replaceQueryString(currentSrc, 'profile', finalParams.profile || '');
-                    currentSrc = replaceQueryString(currentSrc, 'level', finalParams.level || '');
-
-                    if (finalParams.isStatic) {
-                        currentSrc = currentSrc.replace('.webm', '.mp4').replace('.m3u8', '.mp4');
-                        currentSrc = replaceQueryString(currentSrc, 'ClientTime', '');
-                    } else {
-                        currentSrc = currentSrc.replace('.mp4', transcodingExtension).replace('.m4v', transcodingExtension).replace('.mkv', transcodingExtension).replace('.webm', transcodingExtension);
-                        currentSrc = replaceQueryString(currentSrc, 'ClientTime', new Date().getTime());
-                    }
-
-                    currentSrc = replaceQueryString(currentSrc, 'AudioBitrate', finalParams.audioBitrate);
-                    currentSrc = replaceQueryString(currentSrc, 'Static', finalParams.isStatic);
-                    currentSrc = replaceQueryString(currentSrc, 'AudioCodec', finalParams.audioCodec);
-                    isStatic = finalParams.isStatic;
-                } else {
-                    transcodingExtension = '.mp3';
-                }
-
-                var isSeekableMedia = self.currentMediaSource.RunTimeTicks;
-                var isClientSeekable = isStatic || (isSeekableMedia && transcodingExtension == '.m3u8');
-
-                if (isClientSeekable || !ticks || !isSeekableMedia) {
-                    currentSrc = replaceQueryString(currentSrc, 'starttimeticks', '');
-                }
-                else {
-                    currentSrc = replaceQueryString(currentSrc, 'starttimeticks', ticks);
-                }
-
-                clearProgressInterval();
-
-                $(element).off('ended.playbackstopped').off('ended.playnext').one("play", function () {
-
-                    self.updateCanClientSeek(this);
-
-                    $(this).on('ended.playbackstopped', self.onPlaybackStopped).one('ended.playnext', self.playNextAfterEnded);
-
-                    self.startProgressInterval();
-                    sendProgressUpdate();
+                    self.startTimeTicksOffset = newPositionTicks;
+                    element.src = url;
 
                 });
 
-                if (self.currentItem.MediaType == "Video") {
-                    ApiClient.stopActiveEncodings(currentStreamId).done(function () {
-
-                        self.startTimeTicksOffset = ticks;
-                        element.src = currentSrc;
-
-                    });
-
-                    self.updateTextStreamUrls(ticks || 0);
-                } else {
-                    self.startTimeTicksOffset = ticks;
-                    element.src = currentSrc;
-                    element.play();
-                }
+                self.updateTextStreamUrls(newPositionTicks || 0);
+            } else {
+                self.startTimeTicksOffset = newPositionTicks;
+                element.src = url;
+                element.play();
             }
-        };
+        }
 
         self.setCurrentTime = function (ticks, positionSlider, currentTimeElement) {
 
@@ -791,6 +792,106 @@
             })[0];
         }
 
+        function getPlaybackInfo(itemId, deviceProfile, startPosition) {
+
+            return ApiClient.ajax({
+                url: ApiClient.getUrl('Items/' + itemId + '/PlaybackInfo', {
+                    UserId: Dashboard.getCurrentUserId(),
+                    StartPositionTicks: startPosition || 0
+                }),
+                type: 'POST',
+                data: JSON.stringify({
+                    DeviceProfile: deviceProfile
+                }),
+                contentType: "application/json",
+                dataType: "json"
+
+            });
+        }
+
+        self.createStreamInfo = function (type, item, mediaSource, startPosition) {
+
+            var mediaUrl;
+            var contentType;
+            var startTimeTicksOffset = 0;
+
+            var startPositionInSeekParam = startPosition ? (startPosition / 10000000) : 0;
+            var seekParam = startPositionInSeekParam ? '#t=' + startPositionInSeekParam : '';
+
+            if (type == 'video') {
+
+                contentType = 'video/' + mediaSource.Container;
+
+                if (mediaSource.enableDirectPlay) {
+                    mediaUrl = mediaSource.Path;
+                } else {
+
+                    if (mediaSource.SupportsDirectStream) {
+
+                        mediaUrl = ApiClient.getUrl('Videos/' + item.Id + '/stream.' + mediaSource.Container, {
+                            Static: true,
+                            mediaSourceId: mediaSource.Id,
+                            api_key: ApiClient.accessToken()
+                        });
+                        mediaUrl += seekParam;
+
+                    } else {
+
+                        startTimeTicksOffset = startPosition || 0;
+                        mediaUrl = ApiClient.getUrl(mediaSource.TranscodingUrl);
+
+                        if (mediaSource.TranscodingSubProtocol == 'hls') {
+
+                            mediaUrl += seekParam;
+                            contentType = 'application/x-mpegURL';
+                        } else {
+
+                            contentType = 'video/' + mediaSource.TranscodingContainer;
+                        }
+                    }
+                }
+
+            } else {
+
+                contentType = 'audio/' + mediaSource.Container;
+
+                if (mediaSource.enableDirectPlay) {
+
+                    mediaUrl = mediaSource.Path;
+
+                } else {
+
+                    var isDirectStream = mediaSource.SupportsDirectStream;
+
+                    if (isDirectStream) {
+
+                        var outputContainer = (mediaSource.Container || '').toLowerCase();
+
+                        mediaUrl = ApiClient.getUrl('Audio/' + item.Id + '/stream.' + outputContainer, {
+                            mediaSourceId: mediaSource.Id,
+                            deviceId: ApiClient.deviceId(),
+                            api_key: ApiClient.accessToken()
+                        });
+                        mediaUrl += "&static=true" + seekParam;
+                    } else {
+
+                        contentType = 'audio/' + mediaSource.TranscodingContainer;
+
+                        mediaUrl = ApiClient.getUrl(mediaSource.TranscodingUrl);
+                    }
+
+                    startTimeTicksOffset = startPosition || 0;
+                }
+            }
+
+            return {
+                url: mediaUrl,
+                contentType: contentType,
+                startTimeTicksOffset: startTimeTicksOffset,
+                startPositionInSeekParam: startPositionInSeekParam
+            };
+        };
+
         self.playInternal = function (item, startPosition, callback) {
 
             if (item == null) {
@@ -813,20 +914,7 @@
             var mediaSource;
             var deviceProfile = self.getDeviceProfile();
 
-            ApiClient.ajax({
-
-                url: ApiClient.getUrl('Items/' + item.Id + '/PlaybackInfo', {
-                    userId: Dashboard.getCurrentUserId()
-
-                }),
-                type: 'POST',
-                data: JSON.stringify({
-                    DeviceProfile: deviceProfile
-                }),
-                contentType: "application/json",
-                dataType: "json"
-
-            }).done(function (result) {
+            getPlaybackInfo(item.Id, deviceProfile, startPosition).done(function (result) {
 
                 if (validatePlaybackInfoResult(result)) {
 
@@ -846,7 +934,7 @@
 
                         } else if (item.MediaType === "Audio") {
 
-                            self.currentMediaElement = playAudio(result, item, self.currentMediaSource, startPosition);
+                            self.currentMediaElement = playAudio(item, self.currentMediaSource, startPosition);
                             self.currentDurationTicks = self.currentMediaSource.RunTimeTicks;
                         }
 
@@ -1607,36 +1695,11 @@
             return $('.mediaPlayerAudio');
         }
 
-        function playAudio(playbackInfo, item, mediaSource, startPositionTicks) {
+        function playAudio(item, mediaSource, startPositionTicks) {
 
-            var audioUrl;
-            if (mediaSource.enableDirectPlay) {
-
-                audioUrl = mediaSource.Path;
-                self.startTimeTicksOffset = 0;
-
-            } else {
-
-                var isDirectStream = mediaSource.SupportsDirectStream;
-                startPositionTicks = startPositionTicks || 0;
-
-                if (isDirectStream) {
-
-                    var outputContainer = (mediaSource.Container || '').toLowerCase();
-
-                    var seekParam = startPositionTicks ? '#t=' + (startPositionTicks / 10000000) : '';
-                    audioUrl = ApiClient.getUrl('Audio/' + item.Id + '/stream.' + outputContainer, {
-                        mediaSourceId: mediaSource.Id,
-                        deviceId: ApiClient.deviceId(),
-                        api_key: ApiClient.accessToken()
-                    });
-                    audioUrl += "&static=true" + seekParam;
-                } else {
-                    audioUrl = ApiClient.getUrl(mediaSource.TranscodingUrl);
-                }
-
-                self.startTimeTicksOffset = isDirectStream ? 0 : startPositionTicks;
-            }
+            var streamInfo = self.createStreamInfo('audio', item, mediaSource, startPositionTicks);
+            var audioUrl = streamInfo.url;
+            self.startTimeTicksOffset = streamInfo.startTimeTicksOffset;
 
             var initialVolume = self.getSavedVolume();
 

From 450da9c1a1d2cfae449bed10c61e32c752b0c5a6 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Thu, 26 Mar 2015 15:18:21 -0400
Subject: [PATCH 03/33] use server to build stream url's

---
 dashboard-ui/scripts/mediaplayer.js | 129 ++++++++++++++--------------
 1 file changed, 64 insertions(+), 65 deletions(-)

diff --git a/dashboard-ui/scripts/mediaplayer.js b/dashboard-ui/scripts/mediaplayer.js
index 127a5a101..e4f594e7e 100644
--- a/dashboard-ui/scripts/mediaplayer.js
+++ b/dashboard-ui/scripts/mediaplayer.js
@@ -114,6 +114,8 @@
 
             var bitrateSetting = AppSettings.maxStreamingBitrate();
 
+            var canPlayWebm = self.canPlayWebm();
+
             var profile = {};
 
             profile.MaxStreamingBitrate = bitrateSetting;
@@ -135,10 +137,6 @@
                     VideoCodec: 'h264',
                     AudioCodec: 'aac,mp3'
                 });
-                profile.DirectPlayProfiles.push({
-                    Container: 'flv',
-                    Type: 'Video'
-                });
             }
 
             profile.DirectPlayProfiles.push({
@@ -153,6 +151,17 @@
                 });
             }
 
+            if (canPlayWebm) {
+                profile.DirectPlayProfiles.push({
+                    Container: 'webm',
+                    Type: 'Video'
+                });
+                profile.DirectPlayProfiles.push({
+                    Container: 'webm,webma',
+                    Type: 'Audio'
+                });
+            }
+
             profile.TranscodingProfiles = [];
             profile.TranscodingProfiles.push({
                 Container: 'mp3',
@@ -173,7 +182,7 @@
                 });
             }
 
-            if (self.canPlayWebm()) {
+            if (canPlayWebm) {
 
                 profile.TranscodingProfiles.push({
                     Container: 'webm',
@@ -387,64 +396,39 @@
 
             var currentStreamId = getParameterByName('StreamId', currentSrc);
 
-            //if (self.currentItem.MediaType == "Video") {
-
-            //    transcodingExtension = self.getVideoTranscodingExtension(currentSrc);
-
-            //    if (params.AudioStreamIndex != null) {
-            //        currentSrc = replaceQueryString(currentSrc, 'AudioStreamIndex', params.AudioStreamIndex);
-            //    }
-            //    if (params.SubtitleStreamIndex != null) {
-            //        currentSrc = replaceQueryString(currentSrc, 'SubtitleStreamIndex', (params.SubtitleStreamIndex == -1 ? '' : params.SubtitleStreamIndex));
-            //    }
-
-            //    var audioStreamIndex = params.AudioStreamIndex == null ? getParameterByName('AudioStreamIndex', currentSrc) : params.AudioStreamIndex;
-            //    if (typeof (audioStreamIndex) == 'string') {
-            //        audioStreamIndex = parseInt(audioStreamIndex);
-            //    }
-            //    var subtitleStreamIndex = self.currentSubtitleStreamIndex;
-            //    var videoBitrate = parseInt(getParameterByName('VideoBitrate', currentSrc) || '0');
-            //    var audioBitrate = parseInt(getParameterByName('AudioBitrate', currentSrc) || '0');
-            //    var bitrate = params.Bitrate || (videoBitrate + audioBitrate);
-
-            //    var finalParams = self.getFinalVideoParams(self.currentMediaSource, bitrate, audioStreamIndex, subtitleStreamIndex, transcodingExtension);
-
-            //    currentSrc = replaceQueryString(currentSrc, 'VideoBitrate', finalParams.videoBitrate);
-
-            //    currentSrc = replaceQueryString(currentSrc, 'VideoCodec', finalParams.videoCodec);
-
-            //    currentSrc = replaceQueryString(currentSrc, 'profile', finalParams.profile || '');
-            //    currentSrc = replaceQueryString(currentSrc, 'level', finalParams.level || '');
-
-            //    if (finalParams.isStatic) {
-            //        currentSrc = currentSrc.replace('.webm', '.mp4').replace('.m3u8', '.mp4');
-            //        currentSrc = replaceQueryString(currentSrc, 'ClientTime', '');
-            //    } else {
-            //        currentSrc = currentSrc.replace('.mp4', transcodingExtension).replace('.m4v', transcodingExtension).replace('.mkv', transcodingExtension).replace('.webm', transcodingExtension);
-            //        currentSrc = replaceQueryString(currentSrc, 'ClientTime', new Date().getTime());
-            //    }
-
-            //    currentSrc = replaceQueryString(currentSrc, 'AudioBitrate', finalParams.audioBitrate);
-            //    currentSrc = replaceQueryString(currentSrc, 'Static', finalParams.isStatic);
-            //    currentSrc = replaceQueryString(currentSrc, 'AudioCodec', finalParams.audioCodec);
-            //    isStatic = finalParams.isStatic;
-            //}
-
             if (params.AudioStreamIndex == null && params.SubtitleStreamIndex == null && params.Bitrate == null) {
 
-                var transcodingProfile = self.getDeviceProfile().TranscodingProfiles.filter(function (t) {
-
-                    return t.Type == self.currentItem.MediaType;
-                })[0];
-
-            } else {
-
                 currentSrc = replaceQueryString(currentSrc, 'starttimeticks', ticks || 0);
-                changeStreamToUrl(currentStreamId, currentSrc, ticks);
+                changeStreamToUrl(element, currentStreamId, currentSrc, ticks);
+                return;
             }
+
+            var deviceProfile = self.getDeviceProfile();
+
+            var audioStreamIndex = params.AudioStreamIndex == null ? getParameterByName('AudioStreamIndex', currentSrc) : params.AudioStreamIndex;
+            if (typeof (audioStreamIndex) == 'string') {
+                audioStreamIndex = parseInt(audioStreamIndex);
+            }
+
+            var subtitleStreamIndex = params.SubtitleStreamIndex == null ? getParameterByName('SubtitleStreamIndex', currentSrc) : params.SubtitleStreamIndex;
+            if (typeof (subtitleStreamIndex) == 'string') {
+                subtitleStreamIndex = parseInt(subtitleStreamIndex);
+            }
+
+            getPlaybackInfo(self.currentItem.Id, deviceProfile, ticks, self.currentMediaSource, audioStreamIndex, subtitleStreamIndex).done(function (result) {
+
+                if (validatePlaybackInfoResult(result)) {
+
+                    self.currentMediaSource = result.MediaSources[0];
+                    self.currentSubtitleStreamIndex = subtitleStreamIndex;
+
+                    currentSrc = ApiClient.getUrl(self.currentMediaSource.TranscodingUrl);
+                    changeStreamToUrl(element, currentStreamId, currentSrc, ticks);
+                }
+            });
         };
 
-        function changeStreamToUrl(currentStreamId, url, newPositionTicks) {
+        function changeStreamToUrl(element, currentStreamId, url, newPositionTicks) {
 
             clearProgressInterval();
 
@@ -792,17 +776,32 @@
             })[0];
         }
 
-        function getPlaybackInfo(itemId, deviceProfile, startPosition) {
+        function getPlaybackInfo(itemId, deviceProfile, startPosition, mediaSource, audioStreamIndex, subtitleStreamIndex) {
+
+            var postData = {
+                DeviceProfile: deviceProfile
+            };
+
+            if (mediaSource) {
+                postData.MediaSource = mediaSource;
+            }
+
+            var query = {
+                UserId: Dashboard.getCurrentUserId(),
+                StartTimeTicks: startPosition || 0
+            };
+
+            if (audioStreamIndex != null) {
+                query.AudioStreamIndex = audioStreamIndex;
+            }
+            if (subtitleStreamIndex != null) {
+                query.SubtitleStreamIndex = subtitleStreamIndex;
+            }
 
             return ApiClient.ajax({
-                url: ApiClient.getUrl('Items/' + itemId + '/PlaybackInfo', {
-                    UserId: Dashboard.getCurrentUserId(),
-                    StartPositionTicks: startPosition || 0
-                }),
+                url: ApiClient.getUrl('Items/' + itemId + '/PlaybackInfo', query),
                 type: 'POST',
-                data: JSON.stringify({
-                    DeviceProfile: deviceProfile
-                }),
+                data: JSON.stringify(postData),
                 contentType: "application/json",
                 dataType: "json"
 

From 33e19287057eea2d03377e961578db0726c8eebe Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Thu, 26 Mar 2015 15:21:40 -0400
Subject: [PATCH 04/33] removed dead code

---
 dashboard-ui/scripts/mediaplayer.js | 156 ----------------------------
 1 file changed, 156 deletions(-)

diff --git a/dashboard-ui/scripts/mediaplayer.js b/dashboard-ui/scripts/mediaplayer.js
index e4f594e7e..21495ca55 100644
--- a/dashboard-ui/scripts/mediaplayer.js
+++ b/dashboard-ui/scripts/mediaplayer.js
@@ -506,137 +506,6 @@
             return supportsTextTracks;
         };
 
-        self.getVideoDirectPlayMethod = function (mediaSource, videoStream, audioStream, subtitleStream, bitrate) {
-
-            if (!mediaSource) {
-                throw new Error('Null mediaSource');
-            }
-
-            if (!videoStream) {
-                console.log('Cannot direct play without videoStream info');
-                return null;
-            }
-
-            if (mediaSource.Protocol.toLowerCase() == "rtmp" || mediaSource.Protocol.toLowerCase() == "rtsp") {
-                //console.log('Transcoding because the content is not a video file');
-                return null;
-            }
-
-            if (mediaSource.VideoType && mediaSource.VideoType != "VideoFile") {
-                //console.log('Transcoding because the content is not a video file');
-                return null;
-            }
-
-            var isH264 = (videoStream.Codec || '').toLowerCase().indexOf('h264') != -1;
-
-            if (!isH264) {
-                console.log('Transcoding because the content is not h264');
-                return null;
-            }
-
-            if (audioStream && !canPlayAudioStreamDirect(audioStream)) {
-                console.log('Transcoding because the audio cannot be played directly.');
-                return null;
-            }
-
-            if (subtitleStream && (!subtitleStream.SupportsExternalStream || !subtitleStream.IsTextSubtitleStream || !self.supportsTextTracks())) {
-                console.log('Transcoding because subtitles are required');
-                return null;
-            }
-
-            if (videoStream.IsCabac != null && !videoStream.IsCabac) {
-                console.log('Video not CABAC');
-                //return false;
-            }
-
-            if (!videoStream.Width) {
-                console.log('Transcoding because resolution is unknown');
-                return null;
-            }
-
-            if (videoStream && videoStream.IsAnamorphic) {
-                console.log('Transcoding because video is anamorphic');
-                return null;
-            }
-
-            if (!mediaSource.Bitrate) {
-                console.log('Transcoding because bitrate is unknown');
-                return null;
-            }
-
-            if (mediaSource.Bitrate > bitrate) {
-                console.log('Transcoding because bitrate is too high');
-                return null;
-            }
-
-            var extension = (mediaSource.Container || '').toLowerCase();
-
-            var profile = (videoStream ? (videoStream.Profile || '') : '').toLowerCase();
-
-            // only support high, baseline variants and main variants
-            if (isH264 && profile != 'high' && profile.indexOf('baseline') == -1 && profile.indexOf('main') == -1) {
-                console.log('Transcoding because of unsupported h264 profile');
-                return null;
-            }
-
-            if (mediaSource.Protocol == 'Http') {
-                if (Dashboard.isConnectMode()) {
-                    return null;
-                }
-                return 'DirectPlay';
-            }
-
-            if (extension == 'mp4') {
-                return 'DirectStream';
-            }
-
-            if (extension == 'm4v' || extension == 'mkv') {
-                if ($.browser.chrome) {
-                    return 'DirectStream';
-                }
-            }
-
-            return null;
-        };
-
-        self.getFinalVideoParams = function (mediaSource, bitrate, audioStreamIndex, subtitleStreamIndex, transcodingExtension) {
-
-            var mediaStreams = mediaSource.MediaStreams;
-
-            var videoStream = mediaStreams.filter(function (stream) {
-                return stream.Type === "Video";
-            })[0];
-
-            var audioStream = mediaStreams.filter(function (stream) {
-                return stream.Index === audioStreamIndex && stream.Type == 'Audio';
-            })[0];
-
-            var subtitleStream = mediaStreams.filter(function (stream) {
-                return stream.Index === subtitleStreamIndex && stream.Type == 'Subtitle';
-            })[0];
-
-            var directPlayMethod = self.getVideoDirectPlayMethod(mediaSource, videoStream, audioStream, subtitleStream, bitrate);
-
-            var audioBitrate = bitrate >= 700000 ? 192000 : 64000;
-
-            var videoBitrate = bitrate - audioBitrate;
-
-            var params = {
-                isStatic: directPlayMethod != null,
-                audioCodec: transcodingExtension == '.webm' ? 'vorbis' : 'aac',
-                videoCodec: transcodingExtension == '.webm' ? 'vpx' : 'h264',
-                audioBitrate: audioBitrate,
-                videoBitrate: videoBitrate
-            };
-
-            if (params.videoCodec == 'h264') {
-                params.profile = 'baseline';
-                params.level = '3';
-            }
-
-            return params;
-        };
-
         self.canQueueMediaType = function (mediaType) {
 
             return self.currentItem && self.currentItem.MediaType == mediaType;
@@ -1750,31 +1619,6 @@
             })[0];
         };
 
-        function canPlayAudioStreamDirect(audioStream) {
-
-            var audioCodec = (audioStream.Codec || '').toLowerCase().replace('-', '');
-
-            if (audioCodec.indexOf('aac') == -1 &&
-                audioCodec.indexOf('mp3') == -1 &&
-                audioCodec.indexOf('mpeg') == -1) {
-
-                console.log('Cannot direct play. Unsupported audio codec');
-
-                return false;
-            }
-
-            if (audioStream.Channels == null) {
-                return false;
-            }
-
-            // IE won't play at all if more than two channels
-            if (audioStream.Channels > 2 && $.browser.msie) {
-                return false;
-            }
-
-            return true;
-        }
-
         var getItemFields = "MediaSources,Chapters";
 
         self.getCurrentTargetInfo = function () {

From 7d1a33d242988587877d3f8474b32e87bbf3ac7c Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Thu, 26 Mar 2015 16:31:57 -0400
Subject: [PATCH 05/33] update stream sorting

---
 dashboard-ui/scripts/mediaplayer.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dashboard-ui/scripts/mediaplayer.js b/dashboard-ui/scripts/mediaplayer.js
index 21495ca55..c5d38d256 100644
--- a/dashboard-ui/scripts/mediaplayer.js
+++ b/dashboard-ui/scripts/mediaplayer.js
@@ -405,12 +405,12 @@
 
             var deviceProfile = self.getDeviceProfile();
 
-            var audioStreamIndex = params.AudioStreamIndex == null ? getParameterByName('AudioStreamIndex', currentSrc) : params.AudioStreamIndex;
+            var audioStreamIndex = params.AudioStreamIndex == null ? (getParameterByName('AudioStreamIndex', currentSrc) || null) : params.AudioStreamIndex;
             if (typeof (audioStreamIndex) == 'string') {
                 audioStreamIndex = parseInt(audioStreamIndex);
             }
 
-            var subtitleStreamIndex = params.SubtitleStreamIndex == null ? getParameterByName('SubtitleStreamIndex', currentSrc) : params.SubtitleStreamIndex;
+            var subtitleStreamIndex = params.SubtitleStreamIndex == null ? (getParameterByName('SubtitleStreamIndex', currentSrc) || null) : params.SubtitleStreamIndex;
             if (typeof (subtitleStreamIndex) == 'string') {
                 subtitleStreamIndex = parseInt(subtitleStreamIndex);
             }

From dfce8df586cafa7deff29b483123b5a773b19b2c Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Thu, 26 Mar 2015 16:48:24 -0400
Subject: [PATCH 06/33] rest player after stopping

---
 dashboard-ui/scripts/mediaplayer-video.js | 1 -
 dashboard-ui/scripts/mediaplayer.js       | 8 +++-----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/dashboard-ui/scripts/mediaplayer-video.js b/dashboard-ui/scripts/mediaplayer-video.js
index 34af6660a..201a3cb35 100644
--- a/dashboard-ui/scripts/mediaplayer-video.js
+++ b/dashboard-ui/scripts/mediaplayer-video.js
@@ -1125,7 +1125,6 @@
                     message: errorMsg
                 });
 
-
             }).on("click.mediaplayerevent", function (e) {
 
                 if (this.paused) {
diff --git a/dashboard-ui/scripts/mediaplayer.js b/dashboard-ui/scripts/mediaplayer.js
index c5d38d256..830344180 100644
--- a/dashboard-ui/scripts/mediaplayer.js
+++ b/dashboard-ui/scripts/mediaplayer.js
@@ -1286,12 +1286,10 @@
                 self.currentMediaSource = null;
             }
 
-            if (self.currentItem && self.currentItem.MediaType == "Video") {
-                if (self.isFullScreen()) {
-                    self.exitFullScreen();
-                }
-                self.resetEnhancements();
+            if (self.isFullScreen()) {
+                self.exitFullScreen();
             }
+            self.resetEnhancements();
         };
 
         self.isPlaying = function () {

From fa08c6245bacf90b88b8afc762664deb8b022f42 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Thu, 26 Mar 2015 19:10:34 -0400
Subject: [PATCH 07/33] sync fixes

---
 dashboard-ui/css/librarybrowser.css |  4 ++++
 dashboard-ui/scripts/mediaplayer.js | 25 ++++++++++++++++++++-----
 dashboard-ui/supporterkey.html      | 22 ++++++++++++----------
 3 files changed, 36 insertions(+), 15 deletions(-)

diff --git a/dashboard-ui/css/librarybrowser.css b/dashboard-ui/css/librarybrowser.css
index ba3e08ec2..7c2ef39c9 100644
--- a/dashboard-ui/css/librarybrowser.css
+++ b/dashboard-ui/css/librarybrowser.css
@@ -1446,3 +1446,7 @@ span.itemCommunityRating:not(:empty) + .userDataIcons {
         padding-left: 1em;
     }
 }
+
+.homeTopViews .cardText{
+    font-size: 14px;
+}
\ No newline at end of file
diff --git a/dashboard-ui/scripts/mediaplayer.js b/dashboard-ui/scripts/mediaplayer.js
index 830344180..1b8f39d3b 100644
--- a/dashboard-ui/scripts/mediaplayer.js
+++ b/dashboard-ui/scripts/mediaplayer.js
@@ -120,7 +120,7 @@
 
             profile.MaxStreamingBitrate = bitrateSetting;
             profile.MaxStaticBitrate = 40000000;
-            profile.MusicStreamingTranscodingBitrate = 128000;
+            profile.MusicStreamingTranscodingBitrate = Math.min(bitrateSetting, 192000);
 
             profile.DirectPlayProfiles = [];
             profile.DirectPlayProfiles.push({
@@ -232,12 +232,14 @@
                 {
                     Condition: 'Equals',
                     Property: 'IsCabac',
-                    Value: 'true'
+                    Value: 'true',
+                    IsRequired: false
                 },
                 {
                     Condition: 'NotEquals',
                     Property: 'IsAnamorphic',
-                    Value: 'true'
+                    Value: 'true',
+                    IsRequired: false
                 },
                 {
                     Condition: 'EqualsAny',
@@ -263,7 +265,8 @@
                 {
                     Condition: 'NotEquals',
                     Property: 'IsAnamorphic',
-                    Value: 'true'
+                    Value: 'true',
+                    IsRequired: false
                 },
                 {
                     Condition: 'LessThanEqual',
@@ -622,11 +625,23 @@
             });
         };
 
+        function supportsDirectPlay(mediaSource) {
+
+            if (mediaSource.SupportsDirectPlay && mediaSource.Protocol == 'Http' && !mediaSource.RequiredHttpHeaders.length) {
+
+                // TODO: Need to verify the host is going to be reachable
+                return true;
+            }
+
+            return false;
+        }
+
         function getOptimalMediaSource(mediaType, versions) {
 
+            alert(JSON.stringify(versions));
             var optimalVersion = versions.filter(function (v) {
 
-                v.enableDirectPlay = v.SupportsDirectPlay && v.Protocol == 'Http' && !v.RequiredHttpHeaders.length;
+                v.enableDirectPlay = supportsDirectPlay(v);
 
                 return v.enableDirectPlay;
 
diff --git a/dashboard-ui/supporterkey.html b/dashboard-ui/supporterkey.html
index 4b4572082..66683a1a4 100644
--- a/dashboard-ui/supporterkey.html
+++ b/dashboard-ui/supporterkey.html
@@ -87,18 +87,20 @@
                         </div>
                     </div>
 
-                    <br />
-                    <h1>${HeaderSupporterBenefits}</h1>
-                    <p class="linkSupporterKeyMessage"></p>
-                    <a href="https://play.google.com/store/apps/details?id=tv.mediabrowser.mediabrowsertv" target="_blank" title="Android TV">
-                        <img src="css/images/clients/androidtv-tile.png" style="height:60px;" />
-                    </a>
-                    <br />
-                    <br />
-                    <div class="supporters">
+                    <div style="display:none;">
+                        <br />
+                        <h1>${HeaderSupporterBenefits}</h1>
+                        <p class="linkSupporterKeyMessage"></p>
+                        <a href="https://play.google.com/store/apps/details?id=tv.mediabrowser.mediabrowsertv" target="_blank" title="Android TV">
+                            <img src="css/images/clients/androidtv-tile.png" style="height:60px;" />
+                        </a>
+                        <br />
+                        <br />
+                        <div class="supporters">
 
+                        </div>
+                        <button type="button" id="btnAddConnectUser" data-icon="plus">${ButtonAddUser}</button>
                     </div>
-                    <button type="button" id="btnAddConnectUser" data-icon="plus">${ButtonAddUser}</button>
                 </div>
             </div>
         </div>

From 4f967db0b7a3c191a018914243cb44d9d2a1963d Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Fri, 27 Mar 2015 00:17:04 -0400
Subject: [PATCH 08/33] fix subtitle syncing

---
 dashboard-ui/css/librarybrowser.css | 1 -
 dashboard-ui/scripts/mediaplayer.js | 1 -
 2 files changed, 2 deletions(-)

diff --git a/dashboard-ui/css/librarybrowser.css b/dashboard-ui/css/librarybrowser.css
index 7c2ef39c9..62de223e2 100644
--- a/dashboard-ui/css/librarybrowser.css
+++ b/dashboard-ui/css/librarybrowser.css
@@ -1448,5 +1448,4 @@ span.itemCommunityRating:not(:empty) + .userDataIcons {
 }
 
 .homeTopViews .cardText{
-    font-size: 14px;
 }
\ No newline at end of file
diff --git a/dashboard-ui/scripts/mediaplayer.js b/dashboard-ui/scripts/mediaplayer.js
index 1b8f39d3b..f4ac300c3 100644
--- a/dashboard-ui/scripts/mediaplayer.js
+++ b/dashboard-ui/scripts/mediaplayer.js
@@ -638,7 +638,6 @@
 
         function getOptimalMediaSource(mediaType, versions) {
 
-            alert(JSON.stringify(versions));
             var optimalVersion = versions.filter(function (v) {
 
                 v.enableDirectPlay = supportsDirectPlay(v);

From bc94a9ab4bbd60a37e4f87c60b7e2e00c619011b Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Fri, 27 Mar 2015 00:42:41 -0400
Subject: [PATCH 09/33] sync updates

---
 dashboard-ui/scripts/mediaplayer-video.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/dashboard-ui/scripts/mediaplayer-video.js b/dashboard-ui/scripts/mediaplayer-video.js
index 201a3cb35..cf6c13fed 100644
--- a/dashboard-ui/scripts/mediaplayer-video.js
+++ b/dashboard-ui/scripts/mediaplayer-video.js
@@ -971,7 +971,9 @@
                 for (var i = 0, length = textStreams.length; i < length; i++) {
 
                     var textStream = textStreams[i];
-                    var textStreamUrl = ApiClient.getUrl('Videos/' + item.Id + '/' + mediaSource.Id + '/Subtitles/' + textStream.Index + '/Stream.vtt', {
+                    var textStreamUrl = mediaSource.Protocol == 'Http' ?
+                        textStream.Path :
+                        ApiClient.getUrl('Videos/' + item.Id + '/' + mediaSource.Id + '/Subtitles/' + textStream.Index + '/Stream.vtt', {
                         startPositionTicks: (startPosition || 0),
                         api_key: ApiClient.accessToken()
                     });

From e266c8c4c880193b1727e5f1e85a972d6042519d Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Fri, 27 Mar 2015 22:19:20 -0400
Subject: [PATCH 10/33] sync updates

---
 dashboard-ui/scripts/gamegenrepage.js     | 2 +-
 dashboard-ui/scripts/gamestudiospage.js   | 2 +-
 dashboard-ui/scripts/moviegenres.js       | 2 +-
 dashboard-ui/scripts/moviepeople.js       | 2 +-
 dashboard-ui/scripts/moviestudios.js      | 2 +-
 dashboard-ui/scripts/musicalbumartists.js | 2 +-
 dashboard-ui/scripts/musicartists.js      | 2 +-
 dashboard-ui/scripts/musicgenres.js       | 2 +-
 dashboard-ui/scripts/tvgenres.js          | 2 +-
 dashboard-ui/scripts/tvpeople.js          | 2 +-
 dashboard-ui/scripts/tvstudios.js         | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/dashboard-ui/scripts/gamegenrepage.js b/dashboard-ui/scripts/gamegenrepage.js
index 909d16735..4167efe54 100644
--- a/dashboard-ui/scripts/gamegenrepage.js
+++ b/dashboard-ui/scripts/gamegenrepage.js
@@ -6,7 +6,7 @@
         SortBy: "SortName",
         SortOrder: "Ascending",
         Recursive: true,
-        Fields: "DateCreated",
+        Fields: "DateCreated,ItemCounts",
         StartIndex: 0
     };
 
diff --git a/dashboard-ui/scripts/gamestudiospage.js b/dashboard-ui/scripts/gamestudiospage.js
index 31f39a2ba..e7bc72318 100644
--- a/dashboard-ui/scripts/gamestudiospage.js
+++ b/dashboard-ui/scripts/gamestudiospage.js
@@ -7,7 +7,7 @@
         SortOrder: "Ascending",
         MediaTypes: "Game",
         Recursive: true,
-        Fields: "UserData",
+        Fields: "ItemCounts",
         StartIndex: 0
     };
 
diff --git a/dashboard-ui/scripts/moviegenres.js b/dashboard-ui/scripts/moviegenres.js
index 2129a2366..902f5cd25 100644
--- a/dashboard-ui/scripts/moviegenres.js
+++ b/dashboard-ui/scripts/moviegenres.js
@@ -9,7 +9,7 @@
         SortOrder: "Ascending",
         IncludeItemTypes: "Movie",
         Recursive: true,
-        Fields: "DateCreated,SyncInfo",
+        Fields: "DateCreated,SyncInfo,ItemCounts",
         StartIndex: 0
     };
 
diff --git a/dashboard-ui/scripts/moviepeople.js b/dashboard-ui/scripts/moviepeople.js
index a9fe5f7e5..5246757bc 100644
--- a/dashboard-ui/scripts/moviepeople.js
+++ b/dashboard-ui/scripts/moviepeople.js
@@ -9,7 +9,7 @@
         SortOrder: "Ascending",
         IncludeItemTypes: "Movie,Trailer",
         Recursive: true,
-        Fields: "DateCreated",
+        Fields: "DateCreated,ItemCounts",
         PersonTypes: "",
         StartIndex: 0,
         Limit: 100
diff --git a/dashboard-ui/scripts/moviestudios.js b/dashboard-ui/scripts/moviestudios.js
index 8f0fb8108..34f3a0b45 100644
--- a/dashboard-ui/scripts/moviestudios.js
+++ b/dashboard-ui/scripts/moviestudios.js
@@ -7,7 +7,7 @@
         SortOrder: "Ascending",
         IncludeItemTypes: "Movie",
         Recursive: true,
-        Fields: "DateCreated",
+        Fields: "DateCreated,ItemCounts",
         StartIndex: 0
     };
 
diff --git a/dashboard-ui/scripts/musicalbumartists.js b/dashboard-ui/scripts/musicalbumartists.js
index 020dba415..a19246fd4 100644
--- a/dashboard-ui/scripts/musicalbumartists.js
+++ b/dashboard-ui/scripts/musicalbumartists.js
@@ -10,7 +10,7 @@
         SortBy: "SortName",
         SortOrder: "Ascending",
         Recursive: true,
-        Fields: "PrimaryImageAspectRatio,SortName,DateCreated,SyncInfo",
+        Fields: "PrimaryImageAspectRatio,SortName,DateCreated,SyncInfo,ItemCounts",
         StartIndex: 0,
         ImageTypeLimit: 1,
         EnableImageTypes: "Primary,Backdrop,Banner,Thumb"
diff --git a/dashboard-ui/scripts/musicartists.js b/dashboard-ui/scripts/musicartists.js
index a1128a36a..8c9171e84 100644
--- a/dashboard-ui/scripts/musicartists.js
+++ b/dashboard-ui/scripts/musicartists.js
@@ -10,7 +10,7 @@
         SortBy: "SortName",
         SortOrder: "Ascending",
         Recursive: true,
-        Fields: "PrimaryImageAspectRatio,SortName,DateCreated,SyncInfo",
+        Fields: "PrimaryImageAspectRatio,SortName,DateCreated,SyncInfo,ItemCounts",
         StartIndex: 0,
         ImageTypeLimit: 1,
         EnableImageTypes: "Primary,Backdrop,Banner,Thumb"
diff --git a/dashboard-ui/scripts/musicgenres.js b/dashboard-ui/scripts/musicgenres.js
index 9cecd6e1d..70d0f1837 100644
--- a/dashboard-ui/scripts/musicgenres.js
+++ b/dashboard-ui/scripts/musicgenres.js
@@ -7,7 +7,7 @@
         SortOrder: "Ascending",
         IncludeItemTypes: "Audio,MusicVideo",
         Recursive: true,
-        Fields: "DateCreated,SyncInfo",
+        Fields: "DateCreated,SyncInfo,ItemCounts",
         StartIndex: 0
     };
 
diff --git a/dashboard-ui/scripts/tvgenres.js b/dashboard-ui/scripts/tvgenres.js
index 9f926d06b..024314393 100644
--- a/dashboard-ui/scripts/tvgenres.js
+++ b/dashboard-ui/scripts/tvgenres.js
@@ -9,7 +9,7 @@
         SortOrder: "Ascending",
         IncludeItemTypes: "Series",
         Recursive: true,
-        Fields: "DateCreated,SyncInfo",
+        Fields: "DateCreated,SyncInfo,ItemCounts",
         StartIndex: 0
     };
 
diff --git a/dashboard-ui/scripts/tvpeople.js b/dashboard-ui/scripts/tvpeople.js
index f314af0a2..44cfbee2c 100644
--- a/dashboard-ui/scripts/tvpeople.js
+++ b/dashboard-ui/scripts/tvpeople.js
@@ -9,7 +9,7 @@
         SortOrder: "Ascending",
         IncludeItemTypes: "Series,Episode",
         Recursive: true,
-        Fields: "DateCreated",
+        Fields: "DateCreated,ItemCounts",
         PersonTypes: "",
         StartIndex: 0,
         Limit: 100
diff --git a/dashboard-ui/scripts/tvstudios.js b/dashboard-ui/scripts/tvstudios.js
index 8906aa011..2e457a31c 100644
--- a/dashboard-ui/scripts/tvstudios.js
+++ b/dashboard-ui/scripts/tvstudios.js
@@ -7,7 +7,7 @@
         SortOrder: "Ascending",
         IncludeItemTypes: "Series",
         Recursive: true,
-        Fields: "DateCreated",
+        Fields: "DateCreated,ItemCounts",
         StartIndex: 0
     };
 

From c2800786fa9969bddaf6e5cec89cb7d663d881ba Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sat, 28 Mar 2015 16:22:27 -0400
Subject: [PATCH 11/33] implement modular media sources

---
 dashboard-ui/scripts/mediaplayer.js | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/dashboard-ui/scripts/mediaplayer.js b/dashboard-ui/scripts/mediaplayer.js
index f4ac300c3..be73b4b89 100644
--- a/dashboard-ui/scripts/mediaplayer.js
+++ b/dashboard-ui/scripts/mediaplayer.js
@@ -665,10 +665,6 @@
                 DeviceProfile: deviceProfile
             };
 
-            if (mediaSource) {
-                postData.MediaSource = mediaSource;
-            }
-
             var query = {
                 UserId: Dashboard.getCurrentUserId(),
                 StartTimeTicks: startPosition || 0
@@ -680,6 +676,9 @@
             if (subtitleStreamIndex != null) {
                 query.SubtitleStreamIndex = subtitleStreamIndex;
             }
+            if (mediaSource) {
+                query.MediaSourceId = mediaSource.Id;
+            }
 
             return ApiClient.ajax({
                 url: ApiClient.getUrl('Items/' + itemId + '/PlaybackInfo', query),

From bf21a282da0af1927771695aa80e18b3009e2e50 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sun, 29 Mar 2015 00:56:39 -0400
Subject: [PATCH 12/33] update stream generation

---
 dashboard-ui/scripts/mediaplayer-video.js |  2 +-
 dashboard-ui/scripts/mediaplayer.js       | 51 ++++++++++++++++-------
 2 files changed, 37 insertions(+), 16 deletions(-)

diff --git a/dashboard-ui/scripts/mediaplayer-video.js b/dashboard-ui/scripts/mediaplayer-video.js
index cf6c13fed..7eb57641a 100644
--- a/dashboard-ui/scripts/mediaplayer-video.js
+++ b/dashboard-ui/scripts/mediaplayer-video.js
@@ -931,7 +931,7 @@
             }
         };
 
-        self.playVideo = function (deviceProfile, playbackInfo, item, mediaSource, startPosition) {
+        self.playVideo = function (item, mediaSource, startPosition) {
 
             var streamInfo = self.createStreamInfo('video', item, mediaSource, startPosition);
 
diff --git a/dashboard-ui/scripts/mediaplayer.js b/dashboard-ui/scripts/mediaplayer.js
index be73b4b89..0ba7b2726 100644
--- a/dashboard-ui/scripts/mediaplayer.js
+++ b/dashboard-ui/scripts/mediaplayer.js
@@ -803,26 +803,24 @@
 
                     if (mediaSource) {
 
-                        self.currentMediaSource = mediaSource;
-                        self.currentItem = item;
+                        if (mediaSource.RequiresOpening1) {
 
-                        if (item.MediaType === "Video") {
+                            ApiClient.ajax({
+                                url: ApiClient.getUrl('MediaSources/Open', {
+                                    OpenToken: mediaSource.OpenToken
+                                }),
+                                type: 'POST',
+                                dataType: "json"
 
-                            self.currentMediaElement = self.playVideo(deviceProfile, result, item, self.currentMediaSource, startPosition);
-                            self.currentDurationTicks = self.currentMediaSource.RunTimeTicks;
+                            }).done(function (openLiveStreamResult) {
 
-                            self.updateNowPlayingInfo(item);
+                                mediaSource = openLiveStreamResult;
+                                playInternalPostMediaSourceSelection(item, mediaSource, startPosition, callback);
+                            });
 
-                        } else if (item.MediaType === "Audio") {
-
-                            self.currentMediaElement = playAudio(item, self.currentMediaSource, startPosition);
-                            self.currentDurationTicks = self.currentMediaSource.RunTimeTicks;
+                        } else {
+                            playInternalPostMediaSourceSelection(item, mediaSource, startPosition, callback);
                         }
-
-                        if (callback) {
-                            callback();
-                        }
-
                     } else {
                         showPlaybackInfoErrorMessage('NoCompatibleStream');
                     }
@@ -831,6 +829,29 @@
             });
         };
 
+        function playInternalPostMediaSourceSelection(item, mediaSource, startPosition, callback) {
+
+            self.currentMediaSource = mediaSource;
+            self.currentItem = item;
+
+            if (item.MediaType === "Video") {
+
+                self.currentMediaElement = self.playVideo(item, self.currentMediaSource, startPosition);
+                self.currentDurationTicks = self.currentMediaSource.RunTimeTicks;
+
+                self.updateNowPlayingInfo(item);
+
+            } else if (item.MediaType === "Audio") {
+
+                self.currentMediaElement = playAudio(item, self.currentMediaSource, startPosition);
+                self.currentDurationTicks = self.currentMediaSource.RunTimeTicks;
+            }
+
+            if (callback) {
+                callback();
+            }
+        }
+
         function validatePlaybackInfoResult(result) {
 
             if (result.ErrorCode) {

From 2afee2ab2bc2174966eb8fd63b6465c4c85e228c Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sun, 29 Mar 2015 12:45:16 -0400
Subject: [PATCH 13/33] update live stream generation

---
 dashboard-ui/scripts/mediaplayer.js | 44 +++++++++++++++++++++--------
 1 file changed, 33 insertions(+), 11 deletions(-)

diff --git a/dashboard-ui/scripts/mediaplayer.js b/dashboard-ui/scripts/mediaplayer.js
index 0ba7b2726..24239d55e 100644
--- a/dashboard-ui/scripts/mediaplayer.js
+++ b/dashboard-ui/scripts/mediaplayer.js
@@ -690,6 +690,36 @@
             });
         }
 
+        function getLiveStream(itemId, deviceProfile, startPosition, mediaSource, audioStreamIndex, subtitleStreamIndex) {
+
+            var postData = {
+                DeviceProfile: deviceProfile,
+                OpenToken: mediaSource.OpenToken
+            };
+
+            var query = {
+                UserId: Dashboard.getCurrentUserId(),
+                StartTimeTicks: startPosition || 0,
+                ItemId: itemId
+            };
+
+            if (audioStreamIndex != null) {
+                query.AudioStreamIndex = audioStreamIndex;
+            }
+            if (subtitleStreamIndex != null) {
+                query.SubtitleStreamIndex = subtitleStreamIndex;
+            }
+
+            return ApiClient.ajax({
+                url: ApiClient.getUrl('LiveStreams/Open', query),
+                type: 'POST',
+                data: JSON.stringify(postData),
+                contentType: "application/json",
+                dataType: "json"
+
+            });
+        }
+
         self.createStreamInfo = function (type, item, mediaSource, startPosition) {
 
             var mediaUrl;
@@ -803,19 +833,11 @@
 
                     if (mediaSource) {
 
-                        if (mediaSource.RequiresOpening1) {
+                        if (mediaSource.RequiresOpening) {
 
-                            ApiClient.ajax({
-                                url: ApiClient.getUrl('MediaSources/Open', {
-                                    OpenToken: mediaSource.OpenToken
-                                }),
-                                type: 'POST',
-                                dataType: "json"
+                            getLiveStream(item.Id, deviceProfile, startPosition, mediaSource, null, null).done(function (openLiveStreamResult) {
 
-                            }).done(function (openLiveStreamResult) {
-
-                                mediaSource = openLiveStreamResult;
-                                playInternalPostMediaSourceSelection(item, mediaSource, startPosition, callback);
+                                playInternalPostMediaSourceSelection(item, openLiveStreamResult.MediaSource, startPosition, callback);
                             });
 
                         } else {

From b13ff1ba9348f7bc7006e547e70b24ef42357fd3 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sun, 29 Mar 2015 14:31:28 -0400
Subject: [PATCH 14/33] update live stream handling

---
 dashboard-ui/scripts/mediaplayer.js            | 14 +++++++-------
 dashboard-ui/thirdparty/apiclient/apiclient.js |  6 +++---
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/dashboard-ui/scripts/mediaplayer.js b/dashboard-ui/scripts/mediaplayer.js
index 24239d55e..54f30bb69 100644
--- a/dashboard-ui/scripts/mediaplayer.js
+++ b/dashboard-ui/scripts/mediaplayer.js
@@ -397,12 +397,12 @@
 
             var currentSrc = element.currentSrc;
 
-            var currentStreamId = getParameterByName('StreamId', currentSrc);
+            var playSessionId = getParameterByName('PlaySessionId', currentSrc);
 
             if (params.AudioStreamIndex == null && params.SubtitleStreamIndex == null && params.Bitrate == null) {
 
                 currentSrc = replaceQueryString(currentSrc, 'starttimeticks', ticks || 0);
-                changeStreamToUrl(element, currentStreamId, currentSrc, ticks);
+                changeStreamToUrl(element, playSessionId, currentSrc, ticks);
                 return;
             }
 
@@ -426,12 +426,12 @@
                     self.currentSubtitleStreamIndex = subtitleStreamIndex;
 
                     currentSrc = ApiClient.getUrl(self.currentMediaSource.TranscodingUrl);
-                    changeStreamToUrl(element, currentStreamId, currentSrc, ticks);
+                    changeStreamToUrl(element, playSessionId, currentSrc, ticks);
                 }
             });
         };
 
-        function changeStreamToUrl(element, currentStreamId, url, newPositionTicks) {
+        function changeStreamToUrl(element, playSessionId, url, newPositionTicks) {
 
             clearProgressInterval();
 
@@ -447,7 +447,7 @@
             });
 
             if (self.currentItem.MediaType == "Video") {
-                ApiClient.stopActiveEncodings(currentStreamId).done(function () {
+                ApiClient.stopActiveEncodings(playSessionId).done(function () {
 
                     self.startTimeTicksOffset = newPositionTicks;
                     element.src = url;
@@ -1513,7 +1513,7 @@
 
             var playerElement = this;
 
-            var currentStreamId = getParameterByName('StreamId', playerElement.currentSrc);
+            var playSessionId = getParameterByName('PlaySessionId', playerElement.currentSrc);
 
             $(playerElement).off('.mediaplayerevent').off('ended.playbackstopped');
 
@@ -1526,7 +1526,7 @@
 
             if (item.MediaType == "Video") {
 
-                ApiClient.stopActiveEncodings(currentStreamId);
+                ApiClient.stopActiveEncodings(playSessionId);
                 if (self.isFullScreen()) {
                     self.exitFullScreen();
                 }
diff --git a/dashboard-ui/thirdparty/apiclient/apiclient.js b/dashboard-ui/thirdparty/apiclient/apiclient.js
index b2c72ed0a..61df8e7f1 100644
--- a/dashboard-ui/thirdparty/apiclient/apiclient.js
+++ b/dashboard-ui/thirdparty/apiclient/apiclient.js
@@ -1887,14 +1887,14 @@
             });
         };
 
-        self.stopActiveEncodings = function (streamId) {
+        self.stopActiveEncodings = function (playSessionId) {
 
             var options = {
                 deviceId: deviceId
             };
 
-            if (streamId) {
-                options.streamId = streamId;
+            if (playSessionId) {
+                options.PlaySessionId = playSessionId;
             }
 
             var url = self.getUrl("Videos/ActiveEncodings", options);

From b6fc58c49423e8351a780aeb107f4d97ebc78e08 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sun, 29 Mar 2015 14:35:18 -0400
Subject: [PATCH 15/33] report live stream id during progress

---
 dashboard-ui/scripts/mediaplayer.js | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/dashboard-ui/scripts/mediaplayer.js b/dashboard-ui/scripts/mediaplayer.js
index 54f30bb69..88c9e058c 100644
--- a/dashboard-ui/scripts/mediaplayer.js
+++ b/dashboard-ui/scripts/mediaplayer.js
@@ -1556,7 +1556,8 @@
 
         function sendProgressUpdate() {
 
-            var state = self.getPlayerStateInternal(self.currentMediaElement, self.currentItem, self.currentMediaSource);
+            var element = self.currentMediaElement;
+            var state = self.getPlayerStateInternal(element, self.currentItem, self.currentMediaSource);
 
             var info = {
                 QueueableMediaTypes: state.NowPlayingItem.MediaType,
@@ -1566,6 +1567,14 @@
 
             info = $.extend(info, state.PlayState);
 
+            if (element) {
+                var currentSrc = element.currentSrc;
+                var liveStreamId = getParameterByName('LiveStreamId', currentSrc);
+                if (liveStreamId) {
+                    info.LiveStreamId = liveStreamId;
+                }
+            }
+
             ApiClient.reportPlaybackProgress(info);
         }
 

From 8b505bb84d63645321ca1a61d13dbebf57f9f822 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sun, 29 Mar 2015 14:38:18 -0400
Subject: [PATCH 16/33] report live stream in playback stop

---
 dashboard-ui/scripts/mediacontroller.js | 10 +++++++---
 dashboard-ui/scripts/mediaplayer.js     | 10 ++--------
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/dashboard-ui/scripts/mediacontroller.js b/dashboard-ui/scripts/mediacontroller.js
index ab70725f5..c53fde76c 100644
--- a/dashboard-ui/scripts/mediacontroller.js
+++ b/dashboard-ui/scripts/mediacontroller.js
@@ -53,13 +53,17 @@
 
         }).on('playbackstop.mediacontroller', function (e, state) {
 
-            ApiClient.reportPlaybackStopped({
-
+            var stopInfo = {
                 itemId: state.NowPlayingItem.Id,
                 mediaSourceId: state.PlayState.MediaSourceId,
                 positionTicks: state.PlayState.PositionTicks
+            };
 
-            });
+            if (state.PlayState.LiveStreamId) {
+                stopInfo.LiveStreamId = state.PlayState.LiveStreamId;
+            }
+
+            ApiClient.reportPlaybackStopped(stopInfo);
 
         }).on('positionchange.mediacontroller', function (e, state) {
 
diff --git a/dashboard-ui/scripts/mediaplayer.js b/dashboard-ui/scripts/mediaplayer.js
index 88c9e058c..bd3979f19 100644
--- a/dashboard-ui/scripts/mediaplayer.js
+++ b/dashboard-ui/scripts/mediaplayer.js
@@ -1390,6 +1390,8 @@
                     state.PlayState.PlayMethod = getParameterByName('static', currentSrc) == 'true' ?
                         'DirectStream' :
                         'Transcode';
+
+                    state.PlayState.LiveStreamId = getParameterByName('LiveStreamId', currentSrc);
                 }
             }
 
@@ -1567,14 +1569,6 @@
 
             info = $.extend(info, state.PlayState);
 
-            if (element) {
-                var currentSrc = element.currentSrc;
-                var liveStreamId = getParameterByName('LiveStreamId', currentSrc);
-                if (liveStreamId) {
-                    info.LiveStreamId = liveStreamId;
-                }
-            }
-
             ApiClient.reportPlaybackProgress(info);
         }
 

From f2365aec0ea9115511da41722273830c13a9491a Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sun, 29 Mar 2015 18:38:32 -0400
Subject: [PATCH 17/33] sync updates

---
 dashboard-ui/scripts/mediaplayer.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dashboard-ui/scripts/mediaplayer.js b/dashboard-ui/scripts/mediaplayer.js
index bd3979f19..846a96eb2 100644
--- a/dashboard-ui/scripts/mediaplayer.js
+++ b/dashboard-ui/scripts/mediaplayer.js
@@ -837,6 +837,7 @@
 
                             getLiveStream(item.Id, deviceProfile, startPosition, mediaSource, null, null).done(function (openLiveStreamResult) {
 
+                                openLiveStreamResult.MediaSource.enableDirectPlay = supportsDirectPlay(openLiveStreamResult.MediaSource);
                                 playInternalPostMediaSourceSelection(item, openLiveStreamResult.MediaSource, startPosition, callback);
                             });
 

From 74d6e3aaad65e5d0ca4e1bfc4c15410436fb1a8a Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sun, 29 Mar 2015 23:04:55 -0400
Subject: [PATCH 18/33] sync updates

---
 dashboard-ui/autoorganizelog.html        | 2 +-
 dashboard-ui/mypreferenceswebclient.html | 1 +
 dashboard-ui/scripts/indexpage.js        | 1 -
 dashboard-ui/scripts/librarybrowser.js   | 4 ----
 dashboard-ui/scripts/librarylist.js      | 4 ----
 dashboard-ui/scripts/mediaplayer.js      | 1 +
 dashboard-ui/scripts/taskbutton.js       | 2 +-
 7 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/dashboard-ui/autoorganizelog.html b/dashboard-ui/autoorganizelog.html
index 98fb24592..7d9ad10a1 100644
--- a/dashboard-ui/autoorganizelog.html
+++ b/dashboard-ui/autoorganizelog.html
@@ -18,8 +18,8 @@
                     <div class="listTopPaging" style="float: left; position: relative; top: 15px;">
                     </div>
 
-                    <!--<button style="display: none;" class="btnClearLog" type="button" data-inline="true" data-icon="forbidden" data-mini="true">Clear</button>-->
                     <div style="float: right; position: relative; top: 15px;margin-top: -5px;display:none;" class="organizeTaskPanel">
+                        <button style="display: none;" class="btnClearLog" type="button" data-inline="true" data-icon="forbidden" data-mini="true">Clear</button>
                         <button type="button" class="btnOrganize" data-icon="action" data-mini="true" data-inline="true">${ButtonOrganize}</button>
                         <progress max="100" min="0" style="width:100px;display:none;" class="organizeProgress"></progress>
                     </div>
diff --git a/dashboard-ui/mypreferenceswebclient.html b/dashboard-ui/mypreferenceswebclient.html
index a66521b18..2373f7d92 100644
--- a/dashboard-ui/mypreferenceswebclient.html
+++ b/dashboard-ui/mypreferenceswebclient.html
@@ -121,6 +121,7 @@
                             <option value="420000">420kbps</option>
                             <option value="400000">400kbps</option>
                             <option value="320000">320kbps</option>
+                            <option value="192000">192kbps</option>
                         </select>
                     </div>
                     <br />
diff --git a/dashboard-ui/scripts/indexpage.js b/dashboard-ui/scripts/indexpage.js
index 0d2bccb64..5baa1e687 100644
--- a/dashboard-ui/scripts/indexpage.js
+++ b/dashboard-ui/scripts/indexpage.js
@@ -125,7 +125,6 @@
 
             Limit: 24,
             Fields: "PrimaryImageAspectRatio,SyncInfo",
-            IsPlayed: false,
             ImageTypeLimit: 1,
             EnableImageTypes: "Primary,Backdrop,Banner,Thumb"
         };
diff --git a/dashboard-ui/scripts/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js
index 417922fc7..3704ff8aa 100644
--- a/dashboard-ui/scripts/librarybrowser.js
+++ b/dashboard-ui/scripts/librarybrowser.js
@@ -1257,10 +1257,6 @@
 
                 if (options.showChildCountIndicator && item.ChildCount) {
                     cssClass += ' groupedCard';
-
-                    if (item.Type == 'Series') {
-                        cssClass += ' unplayedGroupings';
-                    }
                 }
 
                 if (options.showTitle && !options.overlayText) {
diff --git a/dashboard-ui/scripts/librarylist.js b/dashboard-ui/scripts/librarylist.js
index 28fe0ab5e..577ef9df9 100644
--- a/dashboard-ui/scripts/librarylist.js
+++ b/dashboard-ui/scripts/librarylist.js
@@ -512,10 +512,6 @@
             GroupItems: false
         };
 
-        if ($(card).hasClass('unplayedGroupings')) {
-            options.IsPlayed = false;
-        }
-
         var promise2 = ApiClient.getJSON(ApiClient.getUrl('Users/' + userId + '/Items/Latest', options));
 
         $.when(promise1, promise2).done(function (response1, response2) {
diff --git a/dashboard-ui/scripts/mediaplayer.js b/dashboard-ui/scripts/mediaplayer.js
index 846a96eb2..20ea889fb 100644
--- a/dashboard-ui/scripts/mediaplayer.js
+++ b/dashboard-ui/scripts/mediaplayer.js
@@ -84,6 +84,7 @@
             options.push({ name: '480p - 420kbps', maxWidth: 720, bitrate: 420000 });
             options.push({ name: '360p', maxWidth: 640, bitrate: 400000 });
             options.push({ name: '240p', maxWidth: 426, bitrate: 320000 });
+            options.push({ name: '144p', maxWidth: 256, bitrate: 192000 });
 
             var i, length, option;
             var selectedIndex = -1;
diff --git a/dashboard-ui/scripts/taskbutton.js b/dashboard-ui/scripts/taskbutton.js
index 42308a944..5aa6cff11 100644
--- a/dashboard-ui/scripts/taskbutton.js
+++ b/dashboard-ui/scripts/taskbutton.js
@@ -113,7 +113,7 @@ $.fn.taskButton = function (options) {
             ApiClient.sendWebSocketMessage("ScheduledTasksInfoStop");
         }
 
-    } else {
+    } else if (this.length) {
 
         this.on('click.taskbutton', function () {
 

From 4ffd893f3ef74536f76425c9cbc465baf074ae76 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Mon, 30 Mar 2015 12:16:34 -0400
Subject: [PATCH 19/33] add setting to control transcodng throttle

---
 dashboard-ui/addplugin.html              |   7 +-
 dashboard-ui/appservices.html            |  52 +++++++++++
 dashboard-ui/encodingsettings.html       |   5 ++
 dashboard-ui/livetvsettings.html         |   1 +
 dashboard-ui/livetvstatus.html           |   1 +
 dashboard-ui/scripts/addpluginpage.js    |  17 +++-
 dashboard-ui/scripts/appservices.js      | 110 +++++++++++++++++++++++
 dashboard-ui/scripts/encodingsettings.js |   4 +-
 dashboard-ui/scripts/site.js             |   7 +-
 dashboard-ui/scripts/syncservices.js     |  66 --------------
 dashboard-ui/syncactivity.html           |   2 +-
 dashboard-ui/syncjob.html                |   2 +-
 dashboard-ui/syncservices.html           |  43 ---------
 dashboard-ui/syncsettings.html           |   2 +-
 14 files changed, 202 insertions(+), 117 deletions(-)
 create mode 100644 dashboard-ui/appservices.html
 create mode 100644 dashboard-ui/scripts/appservices.js
 delete mode 100644 dashboard-ui/scripts/syncservices.js
 delete mode 100644 dashboard-ui/syncservices.html

diff --git a/dashboard-ui/addplugin.html b/dashboard-ui/addplugin.html
index 856152dab..aa443c78e 100644
--- a/dashboard-ui/addplugin.html
+++ b/dashboard-ui/addplugin.html
@@ -15,9 +15,14 @@
                 </div>
                 <div data-role="controlgroup" data-type="horizontal" class="localnav syncTabs" data-mini="true" style="display:none;">
                     <a href="syncactivity.html" data-role="button">${TabActivity}</a>
-                    <a href="syncservices.html" data-role="button" class="ui-btn-active">${TabServices}</a>
+                    <a href="appservices.html?context=sync" data-role="button" class="ui-btn-active">${TabServices}</a>
                     <a href="syncsettings.html" data-role="button">${TabSettings}</a>
                 </div>
+                <div data-role="controlgroup" data-type="horizontal" class="localnav livetvTabs" data-mini="true" style="display:none;">
+                    <a href="livetvstatus.html" data-role="button">${TabStatus}</a>
+                    <a href="#" data-role="button" class="ui-btn-active">${TabServices}</a>
+                    <a href="livetvsettings.html" data-role="button">${TabSettings}</a>
+                </div>
 
                 <div class="readOnlyContent">
 
diff --git a/dashboard-ui/appservices.html b/dashboard-ui/appservices.html
new file mode 100644
index 000000000..cbbe17611
--- /dev/null
+++ b/dashboard-ui/appservices.html
@@ -0,0 +1,52 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>Emby</title>
+</head>
+<body>
+    <div id="appServicesPage" data-role="page" class="page type-interior appServicesPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Sync">
+
+        <div data-role="content">
+            <div class="content-primary">
+
+                <div class="sectionTabs syncSectionTabs" style="display:none;">
+                    <div data-role="controlgroup" data-type="horizontal" class="localnav" data-mini="true">
+                        <a href="syncactivity.html" data-role="button">${TabActivity}</a>
+                        <a href="#" data-role="button" class="ui-btn-active">${TabServices}</a>
+                        <a href="syncsettings.html" data-role="button">${TabSettings}</a>
+                    </div>
+                </div>
+                <div class="sectionTabs livetvSectionTabs" style="display:none;">
+                    <div data-role="controlgroup" data-type="horizontal" class="localnav" data-mini="true">
+                        <a href="livetvstatus.html" data-role="button">${TabStatus}</a>
+                        <a href="#" data-role="button" class="ui-btn-active">${TabServices}</a>
+                        <a href="livetvsettings.html" data-role="button">${TabSettings}</a>
+                    </div>
+                </div>
+
+                <div class="detailSectionHeader">${HeaderInstalledServices}</div>
+                <div class="installedPlugins"></div>
+                <br />
+                <br />
+                <br />
+                <div class="detailSectionHeader">${HeaderAvailableServices}</div>
+                <div class="catalog"></div>
+
+                <div class="supporterPromotion syncPromotion" style="display:none;">
+                    <a class="btn btnActionAccent" href="supporter.html" style="font-size:14px;">
+                        <div>
+                            ${HeaderSyncRequiresSupporterMembership}
+                        </div>
+                        <div>
+                            ${HeaderEnjoyDayTrial}
+                        </div>
+                        <div style="font-weight:normal;font-size:90%;margin-top:5px;">
+                            ${ButtonLearnMore}
+                        </div>
+                    </a>
+                </div>
+            </div>
+        </div>
+    </div>
+</body>
+</html>
diff --git a/dashboard-ui/encodingsettings.html b/dashboard-ui/encodingsettings.html
index 9da0fc98e..aed1d773a 100644
--- a/dashboard-ui/encodingsettings.html
+++ b/dashboard-ui/encodingsettings.html
@@ -43,6 +43,11 @@
 
                     <br />
                     <ul data-role="listview" class="ulForm">
+                        <li>
+                            <input type="checkbox" id="chkEnableThrottle" data-mini="true" />
+                            <label for="chkEnableThrottle">${OptionEnableTranscodingThrottle}</label>
+                            <div class="fieldDescription">${OptionEnableTranscodingThrottleHelp}</div>
+                        </li>
                         <li>
                             <label for="txtTranscodingTempPath">${LabelTranscodingTempPath}</label>
                             <div style="display: inline-block; width: 92%;">
diff --git a/dashboard-ui/livetvsettings.html b/dashboard-ui/livetvsettings.html
index a3f7d070d..40a79c013 100644
--- a/dashboard-ui/livetvsettings.html
+++ b/dashboard-ui/livetvsettings.html
@@ -11,6 +11,7 @@
 
                 <div data-role="controlgroup" data-type="horizontal" class="localnav" data-mini="true">
                     <a href="livetvstatus.html" data-role="button">${TabStatus}</a>
+                    <a href="appservices.html?context=livetv" data-role="button">${TabServices}</a>
                     <a href="#" data-role="button" class="ui-btn-active">${TabSettings}</a>
                 </div>
 
diff --git a/dashboard-ui/livetvstatus.html b/dashboard-ui/livetvstatus.html
index 77e81a36a..d02f63f89 100644
--- a/dashboard-ui/livetvstatus.html
+++ b/dashboard-ui/livetvstatus.html
@@ -11,6 +11,7 @@
 
                 <div data-role="controlgroup" data-type="horizontal" class="localnav" data-mini="true">
                     <a href="#" data-role="button" class="ui-btn-active">${TabStatus}</a>
+                    <a href="appservices.html?context=livetv" data-role="button">${TabServices}</a>
                     <a href="livetvsettings.html" data-role="button">${TabSettings}</a>
                 </div>
 
diff --git a/dashboard-ui/scripts/addpluginpage.js b/dashboard-ui/scripts/addpluginpage.js
index fba9d4c6a..53dea364a 100644
--- a/dashboard-ui/scripts/addpluginpage.js
+++ b/dashboard-ui/scripts/addpluginpage.js
@@ -265,8 +265,11 @@
 
         });
 
+
     }).on('pagebeforeshow pageinit', "#addPluginPage", function () {
 
+        // This needs both events for the helpurl to get done at the right time
+
         var page = this;
 
         var context = getParameterByName('context');
@@ -274,12 +277,24 @@
         if (context == 'sync') {
             $('.syncTabs', page).show();
             $('.pluginTabs', page).hide();
+            $('.livetvTabs', page).hide();
 
             page.setAttribute('data-helpurl', 'https://github.com/MediaBrowser/Wiki/wiki/Sync');
             Dashboard.setPageTitle(Globalize.translate('TitleSync'));
-        } else {
+        }
+        else if (context == 'livetv') {
+
+            $('.syncTabs', page).hide();
+            $('.pluginTabs', page).hide();
+            $('.livetvTabs', page).show();
+
+            Dashboard.setPageTitle(Globalize.translate('TitleLiveTV'));
+            page.setAttribute('data-helpurl', 'https://github.com/MediaBrowser/Wiki/wiki/Live%20TV');
+        }
+        else {
             $('.syncTabs', page).hide();
             $('.pluginTabs', page).show();
+            $('.livetvTabs', page).hide();
 
             page.setAttribute('data-helpurl', 'https://github.com/MediaBrowser/Wiki/wiki/Plugins');
             Dashboard.setPageTitle(Globalize.translate('TitlePlugins'));
diff --git a/dashboard-ui/scripts/appservices.js b/dashboard-ui/scripts/appservices.js
new file mode 100644
index 000000000..64a202971
--- /dev/null
+++ b/dashboard-ui/scripts/appservices.js
@@ -0,0 +1,110 @@
+(function ($, document) {
+
+    function reloadList(page) {
+
+        Dashboard.showLoadingMsg();
+
+        var promise1 = ApiClient.getAvailablePlugins({
+            TargetSystems: 'Server'
+        });
+
+        var promise2 = ApiClient.getInstalledPlugins();
+
+        $.when(promise1, promise2).done(function (response1, response2) {
+            renderInstalled(page, response1[0], response2[0]);
+            renderCatalog(page, response1[0], response2[0]);
+        });
+    }
+
+    function getCategories() {
+
+        var context = getParameterByName('context');
+
+        var categories = [];
+
+        if (context == 'sync') {
+            categories.push('Sync');
+        }
+        else if (context == 'livetv') {
+            categories.push('Live TV');
+        }
+
+        return categories;
+    }
+
+    function renderInstalled(page, availablePlugins, installedPlugins) {
+
+        var category = getCategories()[0];
+
+        installedPlugins = installedPlugins.filter(function (i) {
+
+            var catalogEntry = availablePlugins.filter(function (a) {
+                return a.guid == i.Id;
+            })[0];
+
+            return catalogEntry && catalogEntry.category == category;
+
+        });
+
+        PluginsPage.renderPlugins(page, installedPlugins);
+    }
+
+    function renderCatalog(page, availablePlugins, installedPlugins) {
+
+        var categories = getCategories();
+
+        PluginCatalog.renderCatalog({
+
+            catalogElement: $('.catalog', page),
+            availablePlugins: availablePlugins,
+            installedPlugins: installedPlugins,
+            categories: categories,
+            showCategory: false,
+            context: getParameterByName('context'),
+            targetSystem: 'Server'
+        });
+
+    }
+
+    $(document).on('pagebeforeshow pageinit', "#appServicesPage", function () {
+
+        // This needs both events for the helpurl to get done at the right time
+
+        var page = this;
+
+        var context = getParameterByName('context');
+
+        $('.sectionTabs', page).hide();
+        $('.' + context + 'SectionTabs', page).show();
+
+        if (context == 'sync') {
+            Dashboard.setPageTitle(Globalize.translate('TitleSync'));
+            page.setAttribute('data-helpurl', 'https://github.com/MediaBrowser/Wiki/wiki/Sync');
+        }
+        else if (context == 'livetv') {
+            Dashboard.setPageTitle(Globalize.translate('TitleLiveTV'));
+            page.setAttribute('data-helpurl', 'https://github.com/MediaBrowser/Wiki/wiki/Live%20TV');
+        }
+
+    }).on('pageshow', "#appServicesPage", function () {
+
+        // This needs both events for the helpurl to get done at the right time
+
+        var page = this;
+
+        reloadList(page);
+
+        var context = getParameterByName('context');
+
+        Dashboard.getPluginSecurityInfo().done(function (pluginSecurityInfo) {
+
+            if (pluginSecurityInfo.IsMBSupporter || context != 'sync') {
+                $('.syncPromotion', page).hide();
+            } else {
+                $('.syncPromotion', page).show();
+            }
+        });
+
+    });
+
+})(jQuery, document);
\ No newline at end of file
diff --git a/dashboard-ui/scripts/encodingsettings.js b/dashboard-ui/scripts/encodingsettings.js
index 80b1063d5..fcd254884 100644
--- a/dashboard-ui/scripts/encodingsettings.js
+++ b/dashboard-ui/scripts/encodingsettings.js
@@ -3,7 +3,8 @@
     function loadPage(page, config) {
 
         $('#chkEnableDebugEncodingLogging', page).checked(config.EnableDebugLogging).checkboxradio('refresh');
-        
+        $('#chkEnableThrottle', page).checked(config.EnableThrottling).checkboxradio('refresh');
+
         $('.radioEncodingQuality', page).each(function() {
 
             this.checked = config.EncodingQuality == this.value;
@@ -67,6 +68,7 @@
                 config.EncodingQuality = $('.radioEncodingQuality:checked', form).val();
                 config.DownMixAudioBoost = $('#txtDownMixAudioBoost', form).val();
                 config.TranscodingTempPath = $('#txtTranscodingTempPath', form).val();
+                config.EnableThrottling = $('#chkEnableThrottle', form).checked();
 
                 ApiClient.updateNamedConfiguration("encoding", config).done(Dashboard.processServerConfigurationUpdateResult);
             });
diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js
index 739a699bd..705ddc620 100644
--- a/dashboard-ui/scripts/site.js
+++ b/dashboard-ui/scripts/site.js
@@ -756,6 +756,9 @@ var Dashboard = {
 
         var pageElem = page[0];
 
+        var isServicesPage = page.hasClass('appServicesPage');
+        var context = getParameterByName('context');
+
         return [{
             name: Globalize.translate('TabServer'),
             href: "dashboard.html",
@@ -793,7 +796,7 @@ var Dashboard = {
         }, {
             name: Globalize.translate('TabSync'),
             href: "syncactivity.html",
-            selected: page.hasClass('syncConfigurationPage'),
+            selected: page.hasClass('syncConfigurationPage') || (isServicesPage && context == 'sync'),
             icon: 'fa-cloud'
         }, {
             divider: true,
@@ -813,7 +816,7 @@ var Dashboard = {
         }, {
             name: Globalize.translate('TabLiveTV'),
             href: "livetvstatus.html",
-            selected: page.hasClass("liveTvSettingsPage"),
+            selected: page.hasClass("liveTvSettingsPage") || (isServicesPage && context == 'livetv'),
             icon: 'fa-video-camera',
             color: '#293AAE'
         }, {
diff --git a/dashboard-ui/scripts/syncservices.js b/dashboard-ui/scripts/syncservices.js
deleted file mode 100644
index 9d67478c1..000000000
--- a/dashboard-ui/scripts/syncservices.js
+++ /dev/null
@@ -1,66 +0,0 @@
-(function ($, document) {
-
-    function reloadList(page) {
-
-        Dashboard.showLoadingMsg();
-
-        var promise1 = ApiClient.getAvailablePlugins({
-            TargetSystems: 'Server'
-        });
-
-        var promise2 = ApiClient.getInstalledPlugins();
-
-        $.when(promise1, promise2).done(function (response1, response2) {
-            renderInstalled(page, response1[0], response2[0]);
-            renderCatalog(page, response1[0], response2[0]);
-        });
-    }
-
-    function renderInstalled(page, availablePlugins, installedPlugins) {
-
-        installedPlugins = installedPlugins.filter(function (i) {
-
-            var catalogEntry = availablePlugins.filter(function (a) {
-                return a.guid == i.Id;
-            })[0];
-
-            return catalogEntry && catalogEntry.category == 'Sync';
-
-        });
-
-        PluginsPage.renderPlugins(page, installedPlugins);
-    }
-
-    function renderCatalog(page, availablePlugins, installedPlugins) {
-
-        PluginCatalog.renderCatalog({
-
-            catalogElement: $('.catalog', page),
-            availablePlugins: availablePlugins,
-            installedPlugins: installedPlugins,
-            categories: ['Sync'],
-            showCategory: false,
-            context: 'sync',
-            targetSystem: 'Server'
-        });
-
-    }
-
-    $(document).on('pageshow', "#syncServicesPage", function () {
-
-        var page = this;
-
-        reloadList(page);
-
-        Dashboard.getPluginSecurityInfo().done(function (pluginSecurityInfo) {
-
-            if (pluginSecurityInfo.IsMBSupporter) {
-                $('.syncPromotion', page).hide();
-            } else {
-                $('.syncPromotion', page).show();
-            }
-        });
-
-    });
-
-})(jQuery, document);
\ No newline at end of file
diff --git a/dashboard-ui/syncactivity.html b/dashboard-ui/syncactivity.html
index 16726d34e..179fa9958 100644
--- a/dashboard-ui/syncactivity.html
+++ b/dashboard-ui/syncactivity.html
@@ -11,7 +11,7 @@
 
                 <div data-role="controlgroup" data-type="horizontal" class="localnav" data-mini="true">
                     <a href="#" data-role="button" class="ui-btn-active">${TabActivity}</a>
-                    <a href="syncservices.html" data-role="button">${TabServices}</a>
+                    <a href="appservices.html?context=sync" data-role="button">${TabServices}</a>
                     <a href="syncsettings.html" data-role="button">${TabSettings}</a>
                 </div>
 
diff --git a/dashboard-ui/syncjob.html b/dashboard-ui/syncjob.html
index b7efb9502..014ee76d6 100644
--- a/dashboard-ui/syncjob.html
+++ b/dashboard-ui/syncjob.html
@@ -11,7 +11,7 @@
 
                 <div data-role="controlgroup" data-type="horizontal" class="localnav" data-mini="true">
                     <a href="syncactivity.html" data-role="button" class="ui-btn-active">${TabActivity}</a>
-                    <a href="syncservices.html" data-role="button">${TabServices}</a>
+                    <a href="appservices.html?context=sync" data-role="button">${TabServices}</a>
                     <a href="syncsettings.html" data-role="button">${TabSettings}</a>
                 </div>
 
diff --git a/dashboard-ui/syncservices.html b/dashboard-ui/syncservices.html
deleted file mode 100644
index 4ed3d7268..000000000
--- a/dashboard-ui/syncservices.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <title>${TitleSync}</title>
-</head>
-<body>
-    <div id="syncServicesPage" data-role="page" class="page type-interior syncConfigurationPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Sync">
-
-        <div data-role="content">
-            <div class="content-primary">
-
-                <div data-role="controlgroup" data-type="horizontal" class="localnav" data-mini="true">
-                    <a href="syncactivity.html" data-role="button">${TabActivity}</a>
-                    <a href="#" data-role="button" class="ui-btn-active">${TabServices}</a>
-                    <a href="syncsettings.html" data-role="button">${TabSettings}</a>
-                </div>
-
-                <div class="detailSectionHeader">${HeaderInstalledServices}</div>
-                <div class="installedPlugins"></div>
-                <br />
-                <br />
-                <br />
-                <div class="detailSectionHeader">${HeaderAvailableServices}</div>
-                <div class="catalog"></div>
-
-                <div class="supporterPromotion syncPromotion" style="display:none;">
-                    <a class="btn btnActionAccent" href="supporter.html" style="font-size:14px;">
-                        <div>
-                            ${HeaderSyncRequiresSupporterMembership}
-                        </div>
-                        <div>
-                            ${HeaderEnjoyDayTrial}
-                        </div>
-                        <div style="font-weight:normal;font-size:90%;margin-top:5px;">
-                            ${ButtonLearnMore}
-                        </div>
-                    </a>
-                </div>
-            </div>
-        </div>
-    </div>
-</body>
-</html>
diff --git a/dashboard-ui/syncsettings.html b/dashboard-ui/syncsettings.html
index fe111383e..3ff152dab 100644
--- a/dashboard-ui/syncsettings.html
+++ b/dashboard-ui/syncsettings.html
@@ -11,7 +11,7 @@
 
                 <div data-role="controlgroup" data-type="horizontal" class="localnav" data-mini="true">
                     <a href="syncactivity.html" data-role="button">${TabActivity}</a>
-                    <a href="syncservices.html" data-role="button">${TabServices}</a>
+                    <a href="appservices.html?context=sync" data-role="button">${TabServices}</a>
                     <a href="#" data-role="button" class="ui-btn-active">${TabSettings}</a>
                 </div>
 

From e4e3ca4c5c872be6b9bc631f596223348abc422a Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Mon, 30 Mar 2015 15:57:37 -0400
Subject: [PATCH 20/33] sync updates

---
 dashboard-ui/scripts/addpluginpage.js     |  2 +-
 dashboard-ui/scripts/appservices.js       |  2 +-
 dashboard-ui/scripts/mediaplayer-video.js | 37 ++++++++---------------
 3 files changed, 15 insertions(+), 26 deletions(-)

diff --git a/dashboard-ui/scripts/addpluginpage.js b/dashboard-ui/scripts/addpluginpage.js
index 53dea364a..0ef2e7be7 100644
--- a/dashboard-ui/scripts/addpluginpage.js
+++ b/dashboard-ui/scripts/addpluginpage.js
@@ -266,7 +266,7 @@
         });
 
 
-    }).on('pagebeforeshow pageinit', "#addPluginPage", function () {
+    }).on('pagebeforeshow pageinit pageshow', "#addPluginPage", function () {
 
         // This needs both events for the helpurl to get done at the right time
 
diff --git a/dashboard-ui/scripts/appservices.js b/dashboard-ui/scripts/appservices.js
index 64a202971..636f41845 100644
--- a/dashboard-ui/scripts/appservices.js
+++ b/dashboard-ui/scripts/appservices.js
@@ -66,7 +66,7 @@
 
     }
 
-    $(document).on('pagebeforeshow pageinit', "#appServicesPage", function () {
+    $(document).on('pagebeforeshow pageinit pageshow', "#appServicesPage", function () {
 
         // This needs both events for the helpurl to get done at the right time
 
diff --git a/dashboard-ui/scripts/mediaplayer-video.js b/dashboard-ui/scripts/mediaplayer-video.js
index 7eb57641a..aaf9bce8f 100644
--- a/dashboard-ui/scripts/mediaplayer-video.js
+++ b/dashboard-ui/scripts/mediaplayer-video.js
@@ -143,10 +143,6 @@
             self.changeStream(self.getCurrentTicks(), { AudioStreamIndex: index });
         };
 
-        self.supportsSubtitleStreamExternally = function (stream) {
-            return stream.Type == 'Subtitle' && stream.IsTextSubtitleStream && stream.SupportsExternalStream;
-        }
-
         self.setSubtitleStreamIndex = function (index) {
 
             if (!self.supportsTextTracks()) {
@@ -166,7 +162,7 @@
 
             if (currentStream && !newStream) {
 
-                if (!self.supportsSubtitleStreamExternally(currentStream)) {
+                if (currentStream.DeliveryMethod != 'External') {
 
                     // Need to change the transcoded stream to remove subs
                     self.changeStream(self.getCurrentTicks(), { SubtitleStreamIndex: -1 });
@@ -174,7 +170,7 @@
             }
             else if (!currentStream && newStream) {
 
-                if (self.supportsSubtitleStreamExternally(newStream)) {
+                if (newStream.DeliveryMethod == 'External') {
                     selectedTrackElementIndex = index;
                 } else {
 
@@ -184,10 +180,10 @@
             }
             else if (currentStream && newStream) {
 
-                if (self.supportsSubtitleStreamExternally(newStream)) {
+                if (newStream.DeliveryMethod == 'External') {
                     selectedTrackElementIndex = index;
 
-                    if (!self.supportsSubtitleStreamExternally(currentStream)) {
+                    if (currentStream.DeliveryMethod != 'External') {
                         self.changeStream(self.getCurrentTicks(), { SubtitleStreamIndex: -1 });
                     }
                 } else {
@@ -207,7 +203,7 @@
             var modes = ['disabled', 'showing', 'hidden'];
 
             var textStreams = self.currentMediaSource.MediaStreams.filter(function (s) {
-                return self.supportsSubtitleStreamExternally(s);
+                return s.DeliveryMethod == 'External';
             });
 
             var newStream = textStreams.filter(function (s) {
@@ -963,25 +959,18 @@
 
             html += '<source type="' + contentType + '" src="' + videoUrl + '" />';
 
-            if (self.supportsTextTracks()) {
-                var textStreams = subtitleStreams.filter(function (s) {
-                    return self.supportsSubtitleStreamExternally(s);
-                });
+            var textStreams = subtitleStreams.filter(function (s) {
+                return s.DeliveryMethod == 'External';
+            });
 
-                for (var i = 0, length = textStreams.length; i < length; i++) {
+            for (var i = 0, length = textStreams.length; i < length; i++) {
 
-                    var textStream = textStreams[i];
-                    var textStreamUrl = mediaSource.Protocol == 'Http' ?
-                        textStream.Path :
-                        ApiClient.getUrl('Videos/' + item.Id + '/' + mediaSource.Id + '/Subtitles/' + textStream.Index + '/Stream.vtt', {
-                        startPositionTicks: (startPosition || 0),
-                        api_key: ApiClient.accessToken()
-                    });
+                var textStream = textStreams[i];
+                var textStreamUrl = textStream.DeliveryUrl;
 
-                    var defaultAttribute = textStream.Index == mediaSource.DefaultSubtitleStreamIndex ? ' default' : '';
+                var defaultAttribute = textStream.Index == mediaSource.DefaultSubtitleStreamIndex ? ' default' : '';
 
-                    html += '<track kind="subtitles" src="' + textStreamUrl + '" srclang="' + (textStream.Language || 'und') + '"' + defaultAttribute + '></track>';
-                }
+                html += '<track kind="subtitles" src="' + textStreamUrl + '" srclang="' + (textStream.Language || 'und') + '"' + defaultAttribute + '></track>';
             }
 
             html += '</video>';

From 69083dde3b7ff9c6556c71fee99ab1eb6e87e910 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Tue, 31 Mar 2015 12:24:16 -0400
Subject: [PATCH 21/33] sync updates

---
 dashboard-ui/mypreferencesdisplay.html       |  6 ++++++
 dashboard-ui/scripts/mediaplayer-video.js    |  5 ++---
 dashboard-ui/scripts/mediaplayer.js          | 14 +++++++++-----
 dashboard-ui/scripts/mypreferencesdisplay.js |  4 ++++
 4 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/dashboard-ui/mypreferencesdisplay.html b/dashboard-ui/mypreferencesdisplay.html
index 17c7f6eb1..95327ee86 100644
--- a/dashboard-ui/mypreferencesdisplay.html
+++ b/dashboard-ui/mypreferencesdisplay.html
@@ -76,6 +76,12 @@
                     <div class="latestItemsList">
 
                     </div>
+
+                    <br />
+                    <div data-role="controlgroup">
+                        <label for="chkHidePlayedFromLatest">${OptionHideWatchedContentFromLatestMedia}</label>
+                        <input id="chkHidePlayedFromLatest" type="checkbox" />
+                    </div>
                 </div>
 
             </div>
diff --git a/dashboard-ui/scripts/mediaplayer-video.js b/dashboard-ui/scripts/mediaplayer-video.js
index aaf9bce8f..0370061fc 100644
--- a/dashboard-ui/scripts/mediaplayer-video.js
+++ b/dashboard-ui/scripts/mediaplayer-video.js
@@ -950,11 +950,11 @@
 
             // Can't autoplay in these browsers so we need to use the full controls
             if (requiresNativeControls) {
-                html += '<video class="itemVideo" id="itemVideo" preload="none" autoplay="autoplay" controls="controls">';
+                html += '<video class="itemVideo" id="itemVideo" preload="none" autoplay="autoplay" crossorigin="anonymous" controls="controls">';
             } else {
 
                 // Chrome 35 won't play with preload none
-                html += '<video class="itemVideo" id="itemVideo" preload="metadata" autoplay>';
+                html += '<video class="itemVideo" id="itemVideo" preload="metadata" crossorigin="anonymous" autoplay>';
             }
 
             html += '<source type="' + contentType + '" src="' + videoUrl + '" />';
@@ -967,7 +967,6 @@
 
                 var textStream = textStreams[i];
                 var textStreamUrl = textStream.DeliveryUrl;
-
                 var defaultAttribute = textStream.Index == mediaSource.DefaultSubtitleStreamIndex ? ' default' : '';
 
                 html += '<track kind="subtitles" src="' + textStreamUrl + '" srclang="' + (textStream.Language || 'und') + '"' + defaultAttribute + '></track>';
diff --git a/dashboard-ui/scripts/mediaplayer.js b/dashboard-ui/scripts/mediaplayer.js
index 20ea889fb..455ad2d8d 100644
--- a/dashboard-ui/scripts/mediaplayer.js
+++ b/dashboard-ui/scripts/mediaplayer.js
@@ -399,6 +399,7 @@
             var currentSrc = element.currentSrc;
 
             var playSessionId = getParameterByName('PlaySessionId', currentSrc);
+            var liveStreamId = getParameterByName('LiveStreamId', currentSrc);
 
             if (params.AudioStreamIndex == null && params.SubtitleStreamIndex == null && params.Bitrate == null) {
 
@@ -419,14 +420,14 @@
                 subtitleStreamIndex = parseInt(subtitleStreamIndex);
             }
 
-            getPlaybackInfo(self.currentItem.Id, deviceProfile, ticks, self.currentMediaSource, audioStreamIndex, subtitleStreamIndex).done(function (result) {
+            getPlaybackInfo(self.currentItem.Id, deviceProfile, ticks, self.currentMediaSource, audioStreamIndex, subtitleStreamIndex, liveStreamId).done(function (result) {
 
                 if (validatePlaybackInfoResult(result)) {
 
                     self.currentMediaSource = result.MediaSources[0];
                     self.currentSubtitleStreamIndex = subtitleStreamIndex;
 
-                    currentSrc = ApiClient.getUrl(self.currentMediaSource.TranscodingUrl);
+                    currentSrc = self.currentMediaSource.TranscodingUrl;
                     changeStreamToUrl(element, playSessionId, currentSrc, ticks);
                 }
             });
@@ -660,7 +661,7 @@
             })[0];
         }
 
-        function getPlaybackInfo(itemId, deviceProfile, startPosition, mediaSource, audioStreamIndex, subtitleStreamIndex) {
+        function getPlaybackInfo(itemId, deviceProfile, startPosition, mediaSource, audioStreamIndex, subtitleStreamIndex, liveStreamId) {
 
             var postData = {
                 DeviceProfile: deviceProfile
@@ -680,6 +681,9 @@
             if (mediaSource) {
                 query.MediaSourceId = mediaSource.Id;
             }
+            if (liveStreamId) {
+                query.LiveStreamId = liveStreamId;
+            }
 
             return ApiClient.ajax({
                 url: ApiClient.getUrl('Items/' + itemId + '/PlaybackInfo', query),
@@ -750,7 +754,7 @@
                     } else {
 
                         startTimeTicksOffset = startPosition || 0;
-                        mediaUrl = ApiClient.getUrl(mediaSource.TranscodingUrl);
+                        mediaUrl = mediaSource.TranscodingUrl;
 
                         if (mediaSource.TranscodingSubProtocol == 'hls') {
 
@@ -789,7 +793,7 @@
 
                         contentType = 'audio/' + mediaSource.TranscodingContainer;
 
-                        mediaUrl = ApiClient.getUrl(mediaSource.TranscodingUrl);
+                        mediaUrl = mediaSource.TranscodingUrl;
                     }
 
                     startTimeTicksOffset = startPosition || 0;
diff --git a/dashboard-ui/scripts/mypreferencesdisplay.js b/dashboard-ui/scripts/mypreferencesdisplay.js
index 13bf6b589..1f33a5bce 100644
--- a/dashboard-ui/scripts/mypreferencesdisplay.js
+++ b/dashboard-ui/scripts/mypreferencesdisplay.js
@@ -133,6 +133,8 @@
         $('#chkDisplayCollectionView', page).checked(user.Configuration.DisplayCollectionsView || false).checkboxradio("refresh");
         $('#chkDisplayFolderView', page).checked(user.Configuration.DisplayFoldersView || false).checkboxradio("refresh");
 
+        $('#chkHidePlayedFromLatest', page).checked(user.Configuration.HidePlayedInLatest || false).checkboxradio("refresh");
+
         var promise1 = ApiClient.getItems(user.Id, {
             sortBy: "SortName"
         });
@@ -163,6 +165,8 @@
         user.Configuration.DisplayCollectionsView = $('#chkDisplayCollectionView', page).checked();
         user.Configuration.DisplayFoldersView = $('#chkDisplayFolderView', page).checked();
 
+        user.Configuration.HidePlayedInLatest = $('#chkHidePlayedFromLatest', page).checked();
+
         user.Configuration.IncludeTrailersInSuggestions = $('#chkDisplayTrailersWithinMovieSuggestions', page).checked();
 
         user.Configuration.LatestItemsExcludes = $(".chkIncludeInLatest:not(:checked)", page).get().map(function (i) {

From 240a0fe22fcb8fc4986b649893ea81472a5e14fa Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Wed, 1 Apr 2015 00:23:34 -0400
Subject: [PATCH 22/33] post release housecleaning

---
 dashboard-ui/scripts/supporterpage.js     |  4 ++--
 dashboard-ui/scripts/userlibraryaccess.js | 28 ++++-------------------
 2 files changed, 6 insertions(+), 26 deletions(-)

diff --git a/dashboard-ui/scripts/supporterpage.js b/dashboard-ui/scripts/supporterpage.js
index 91d7ac026..e3f3dc90a 100644
--- a/dashboard-ui/scripts/supporterpage.js
+++ b/dashboard-ui/scripts/supporterpage.js
@@ -43,10 +43,10 @@
         return $(".radioDonationType:checked", page).val();
     }
 
-    var lifeTimeAmount = 40;
+    var lifeTimeAmount = 59;
     var dailyAmount = 1;
     var monthlyAmount = 4;
-    var yearlyAmount = 28;
+    var yearlyAmount = 32;
     function getDonationAmount(page) {
 
         var type = getDonationType(page);
diff --git a/dashboard-ui/scripts/userlibraryaccess.js b/dashboard-ui/scripts/userlibraryaccess.js
index 0fd0de9de..4a2c65090 100644
--- a/dashboard-ui/scripts/userlibraryaccess.js
+++ b/dashboard-ui/scripts/userlibraryaccess.js
@@ -14,12 +14,7 @@
 
             var id = 'mediaFolder' + i;
 
-            var isChecked;
-            if (user.Policy.BlockedMediaFolders != null) {
-                isChecked = user.Policy.BlockedMediaFolders.indexOf(folder.Id) == -1 && user.Policy.BlockedMediaFolders.indexOf(folder.Name) == -1;
-            } else {
-                isChecked = user.Policy.EnableAllFolders || user.Policy.EnabledFolders.indexOf(folder.Id) != -1;
-            }
+            var isChecked = user.Policy.EnableAllFolders || user.Policy.EnabledFolders.indexOf(folder.Id) != -1;
             var checkedAttribute = isChecked ? ' checked="checked"' : '';
 
             html += '<input class="chkFolder" data-id="' + folder.Id + '" type="checkbox" id="' + id + '"' + checkedAttribute + ' />';
@@ -30,11 +25,7 @@
 
         $('.folderAccess', page).html(html).trigger('create');
 
-        if (user.Policy.BlockedMediaFolders != null) {
-            $('#chkEnableAllFolders', page).checked(user.Policy.BlockedMediaFolders.length == 0).checkboxradio('refresh').trigger('change');
-        } else {
-            $('#chkEnableAllFolders', page).checked(user.Policy.EnableAllFolders).checkboxradio('refresh').trigger('change');
-        }
+        $('#chkEnableAllFolders', page).checked(user.Policy.EnableAllFolders).checkboxradio('refresh').trigger('change');
     }
 
     function loadChannels(page, user, channels) {
@@ -51,12 +42,7 @@
 
             var id = 'channels' + i;
 
-            var isChecked;
-            if (user.Policy.BlockedChannels != null) {
-                isChecked = user.Policy.BlockedChannels.indexOf(folder.Id) == -1;
-            } else {
-                isChecked = user.Policy.EnableAllChannels || user.Policy.EnabledChannels.indexOf(folder.Id) != -1;
-            }
+            var isChecked = user.Policy.EnableAllChannels || user.Policy.EnabledChannels.indexOf(folder.Id) != -1;
             var checkedAttribute = isChecked ? ' checked="checked"' : '';
 
             html += '<input class="chkChannel" data-id="' + folder.Id + '" type="checkbox" id="' + id + '"' + checkedAttribute + ' />';
@@ -73,11 +59,7 @@
             $('.channelAccessContainer', page).hide();
         }
 
-        if (user.Policy.BlockedChannels != null) {
-            $('#chkEnableAllChannels', page).checked(user.Policy.BlockedChannels.length == 0).checkboxradio('refresh').trigger('change');
-        } else {
-            $('#chkEnableAllChannels', page).checked(user.Policy.EnableAllChannels).checkboxradio('refresh').trigger('change');
-        }
+        $('#chkEnableAllChannels', page).checked(user.Policy.EnableAllChannels).checkboxradio('refresh').trigger('change');
     }
 
     function loadDevices(page, user, devices) {
@@ -140,7 +122,6 @@
                 return this.getAttribute('data-id');
 
             }).get();
-        user.Policy.BlockedMediaFolders = null;
 
         user.Policy.EnableAllChannels = $('#chkEnableAllChannels', page).checked();
         user.Policy.EnabledChannels = user.Policy.EnableAllChannels ?
@@ -150,7 +131,6 @@
                 return this.getAttribute('data-id');
 
             }).get();
-        user.Policy.BlockedChannels = null;
 
         user.Policy.EnableAllDevices = $('#chkEnableAllDevices', page).checked();
         user.Policy.EnabledDevices = user.Policy.EnableAllDevices ?

From a0ff8fc2a592a810d9f907110f9b16a6ef5ec1b2 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Wed, 1 Apr 2015 13:09:08 -0400
Subject: [PATCH 23/33] fix isLoggedIntoConnect check

---
 dashboard-ui/thirdparty/apiclient/connectionmanager.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/dashboard-ui/thirdparty/apiclient/connectionmanager.js b/dashboard-ui/thirdparty/apiclient/connectionmanager.js
index 46b303761..c56402612 100644
--- a/dashboard-ui/thirdparty/apiclient/connectionmanager.js
+++ b/dashboard-ui/thirdparty/apiclient/connectionmanager.js
@@ -455,7 +455,10 @@
         self.isLoggedIntoConnect = function () {
 
             // Make sure it returns true or false
-            return (self.connectToken() && self.connectUserId()) == true;
+            if (!self.connectToken() || !self.connectUserId()) {
+                return false;
+            }
+            return true;
         };
 
         self.logout = function () {

From b0fe9cc1240f9c6e2ca294023117293fef327eba Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Wed, 1 Apr 2015 17:55:50 -0400
Subject: [PATCH 24/33] add missing PlaySessionId

---
 dashboard-ui/scripts/mediacontroller.js | 4 ++++
 dashboard-ui/scripts/mediaplayer.js     | 1 +
 2 files changed, 5 insertions(+)

diff --git a/dashboard-ui/scripts/mediacontroller.js b/dashboard-ui/scripts/mediacontroller.js
index c53fde76c..0143a1b6c 100644
--- a/dashboard-ui/scripts/mediacontroller.js
+++ b/dashboard-ui/scripts/mediacontroller.js
@@ -63,6 +63,10 @@
                 stopInfo.LiveStreamId = state.PlayState.LiveStreamId;
             }
 
+            if (state.PlayState.PlaySessionId) {
+                stopInfo.PlaySessionId = state.PlayState.PlaySessionId;
+            }
+
             ApiClient.reportPlaybackStopped(stopInfo);
 
         }).on('positionchange.mediacontroller', function (e, state) {
diff --git a/dashboard-ui/scripts/mediaplayer.js b/dashboard-ui/scripts/mediaplayer.js
index 455ad2d8d..6ef491ad5 100644
--- a/dashboard-ui/scripts/mediaplayer.js
+++ b/dashboard-ui/scripts/mediaplayer.js
@@ -1398,6 +1398,7 @@
                         'Transcode';
 
                     state.PlayState.LiveStreamId = getParameterByName('LiveStreamId', currentSrc);
+                    state.PlayState.PlaySessionId = getParameterByName('PlaySessionId', currentSrc);
                 }
             }
 

From c280d5e59d84ba2e237afdb511be8ce46291031d Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Wed, 1 Apr 2015 17:56:32 -0400
Subject: [PATCH 25/33] rework media source methods

---
 dashboard-ui/scripts/site.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js
index 705ddc620..a4816364a 100644
--- a/dashboard-ui/scripts/site.js
+++ b/dashboard-ui/scripts/site.js
@@ -185,8 +185,7 @@ var Dashboard = {
         var url = getWindowUrl().toLowerCase();
 
         return url.indexOf('mediabrowser.tv') != -1 ||
-			url.indexOf('emby.media') != -1 ||
-			url.indexOf('mediabrowser.github') != -1;
+			url.indexOf('emby.media') != -1;
     },
 
     logout: function (logoutWithServer) {
@@ -1355,7 +1354,9 @@ var Dashboard = {
         });
 
         if (!Dashboard.isServerlessPage()) {
+
             if (Dashboard.serverAddress() && Dashboard.getCurrentUserId() && Dashboard.getAccessToken()) {
+
                 window.ApiClient = new MediaBrowser.ApiClient(Logger, Dashboard.serverAddress(), appName, appVersion, deviceName, deviceId);
 
                 ApiClient.setCurrentUserId(Dashboard.getCurrentUserId(), Dashboard.getAccessToken());
@@ -1364,6 +1365,7 @@ var Dashboard = {
 
                 ConnectionManager.addApiClient(ApiClient, true).fail(Dashboard.logout);
             } else {
+
                 Dashboard.logout();
                 return;
             }

From 9e547131ef18967f5b82003f0d6e3b972c6753b1 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Wed, 1 Apr 2015 22:47:59 -0400
Subject: [PATCH 26/33] resolve reverse proxy issue

---
 dashboard-ui/scripts/mediaplayer-video.js | 2 +-
 dashboard-ui/scripts/mediaplayer.js       | 6 +++---
 dashboard-ui/scripts/supporterpage.js     | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dashboard-ui/scripts/mediaplayer-video.js b/dashboard-ui/scripts/mediaplayer-video.js
index 0370061fc..f93c2b765 100644
--- a/dashboard-ui/scripts/mediaplayer-video.js
+++ b/dashboard-ui/scripts/mediaplayer-video.js
@@ -966,7 +966,7 @@
             for (var i = 0, length = textStreams.length; i < length; i++) {
 
                 var textStream = textStreams[i];
-                var textStreamUrl = textStream.DeliveryUrl;
+                var textStreamUrl = !textStream.IsExternalUrl ? ApiClient.getUrl(textStream.DeliveryUrl) : textStream.DeliveryUrl;
                 var defaultAttribute = textStream.Index == mediaSource.DefaultSubtitleStreamIndex ? ' default' : '';
 
                 html += '<track kind="subtitles" src="' + textStreamUrl + '" srclang="' + (textStream.Language || 'und') + '"' + defaultAttribute + '></track>';
diff --git a/dashboard-ui/scripts/mediaplayer.js b/dashboard-ui/scripts/mediaplayer.js
index 6ef491ad5..2337faf97 100644
--- a/dashboard-ui/scripts/mediaplayer.js
+++ b/dashboard-ui/scripts/mediaplayer.js
@@ -427,7 +427,7 @@
                     self.currentMediaSource = result.MediaSources[0];
                     self.currentSubtitleStreamIndex = subtitleStreamIndex;
 
-                    currentSrc = self.currentMediaSource.TranscodingUrl;
+                    currentSrc = ApiClient.getUrl(self.currentMediaSource.TranscodingUrl);
                     changeStreamToUrl(element, playSessionId, currentSrc, ticks);
                 }
             });
@@ -754,7 +754,7 @@
                     } else {
 
                         startTimeTicksOffset = startPosition || 0;
-                        mediaUrl = mediaSource.TranscodingUrl;
+                        mediaUrl = ApiClient.getUrl(mediaSource.TranscodingUrl);
 
                         if (mediaSource.TranscodingSubProtocol == 'hls') {
 
@@ -793,7 +793,7 @@
 
                         contentType = 'audio/' + mediaSource.TranscodingContainer;
 
-                        mediaUrl = mediaSource.TranscodingUrl;
+                        mediaUrl = ApiClient.getUrl(mediaSource.TranscodingUrl);
                     }
 
                     startTimeTicksOffset = startPosition || 0;
diff --git a/dashboard-ui/scripts/supporterpage.js b/dashboard-ui/scripts/supporterpage.js
index 91d7ac026..e3f3dc90a 100644
--- a/dashboard-ui/scripts/supporterpage.js
+++ b/dashboard-ui/scripts/supporterpage.js
@@ -43,10 +43,10 @@
         return $(".radioDonationType:checked", page).val();
     }
 
-    var lifeTimeAmount = 40;
+    var lifeTimeAmount = 59;
     var dailyAmount = 1;
     var monthlyAmount = 4;
-    var yearlyAmount = 28;
+    var yearlyAmount = 32;
     function getDonationAmount(page) {
 
         var type = getDonationType(page);

From b76c9e5bf34754bfa143fd29f7de2cc024ae16c4 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Thu, 2 Apr 2015 12:24:59 -0400
Subject: [PATCH 27/33] fix hasMediaSources exception

---
 dashboard-ui/scripts/indexpage.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dashboard-ui/scripts/indexpage.js b/dashboard-ui/scripts/indexpage.js
index 5baa1e687..8e5664657 100644
--- a/dashboard-ui/scripts/indexpage.js
+++ b/dashboard-ui/scripts/indexpage.js
@@ -469,7 +469,7 @@
         switch (index) {
 
             case 0:
-                return 'smalllibrarytiles-automobile';
+                return 'librarytiles-automobile';
             case 1:
                 return 'resume';
             case 2:

From 782cfa7ee18e092a58cf2ffd799ffc4043e2733b Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Thu, 2 Apr 2015 12:26:42 -0400
Subject: [PATCH 28/33] combine movie fixes

---
 dashboard-ui/collections.html             |  3 +-
 dashboard-ui/episodes.html                |  2 +-
 dashboard-ui/gamegenres.html              |  2 +-
 dashboard-ui/games.html                   |  2 +-
 dashboard-ui/gamesrecommended.html        |  2 +-
 dashboard-ui/gamestudios.html             |  2 +-
 dashboard-ui/gamesystems.html             |  2 +-
 dashboard-ui/itembynamedetails.html       | 23 +++++++--------
 dashboard-ui/itemdetails.html             | 15 +++++-----
 dashboard-ui/livetvchannel.html           |  2 +-
 dashboard-ui/livetvchannels.html          |  2 +-
 dashboard-ui/livetvguide.html             |  2 +-
 dashboard-ui/livetvitems.html             |  2 +-
 dashboard-ui/livetvnewrecording.html      |  2 +-
 dashboard-ui/livetvprogram.html           |  2 +-
 dashboard-ui/livetvrecording.html         |  2 +-
 dashboard-ui/livetvrecordinglist.html     |  2 +-
 dashboard-ui/livetvrecordings.html        |  2 +-
 dashboard-ui/livetvseriestimer.html       |  2 +-
 dashboard-ui/livetvseriestimers.html      |  2 +-
 dashboard-ui/livetvsuggested.html         |  2 +-
 dashboard-ui/livetvtimer.html             |  2 +-
 dashboard-ui/livetvtimers.html            |  2 +-
 dashboard-ui/moviegenres.html             |  3 +-
 dashboard-ui/moviepeople.html             |  3 +-
 dashboard-ui/movies.html                  |  3 +-
 dashboard-ui/movieslatest.html            | 34 -----------------------
 dashboard-ui/moviesrecommended.html       | 11 ++++++--
 dashboard-ui/moviestudios.html            |  3 +-
 dashboard-ui/movietrailers.html           |  3 +-
 dashboard-ui/musicalbumartists.html       |  2 +-
 dashboard-ui/musicalbums.html             |  2 +-
 dashboard-ui/musicartists.html            |  2 +-
 dashboard-ui/musicgenres.html             |  2 +-
 dashboard-ui/musicrecommended.html        |  2 +-
 dashboard-ui/musicvideos.html             |  2 +-
 dashboard-ui/scripts/librarybrowser.js    |  2 +-
 dashboard-ui/scripts/movieslatest.js      | 34 -----------------------
 dashboard-ui/scripts/moviesrecommended.js | 33 ++++++++++++++++++++--
 dashboard-ui/songs.html                   |  2 +-
 dashboard-ui/tvgenres.html                |  2 +-
 dashboard-ui/tvlatest.html                |  2 +-
 dashboard-ui/tvpeople.html                |  2 +-
 dashboard-ui/tvrecommended.html           |  2 +-
 dashboard-ui/tvshows.html                 |  2 +-
 dashboard-ui/tvstudios.html               |  2 +-
 dashboard-ui/tvupcoming.html              |  2 +-
 47 files changed, 97 insertions(+), 141 deletions(-)
 delete mode 100644 dashboard-ui/movieslatest.html
 delete mode 100644 dashboard-ui/scripts/movieslatest.js

diff --git a/dashboard-ui/collections.html b/dashboard-ui/collections.html
index 7d9eb01ae..d30d9dacb 100644
--- a/dashboard-ui/collections.html
+++ b/dashboard-ui/collections.html
@@ -7,8 +7,7 @@
     <div id="boxsetsPage" data-role="page" class="page libraryPage backdropPage collectionEditorPage" data-backdroptype="movie,boxset">
 
         <div class="libraryViewNav scopedLibraryViewNav movieTabs">
-            <a href="movieslatest.html">${TabLatest}</a>
-            <a href="moviesrecommended.html">${TabSuggested}</a>
+            <a href="moviesrecommended.html">${TabSuggestions}</a>
             <a href="movies.html">${TabMovies}</a>
             <a href="movietrailers.html">${TabTrailers}</a>
             <a href="#" class="ui-btn-active">${TabCollections}</a>
diff --git a/dashboard-ui/episodes.html b/dashboard-ui/episodes.html
index dffcea861..a96363884 100644
--- a/dashboard-ui/episodes.html
+++ b/dashboard-ui/episodes.html
@@ -7,7 +7,7 @@
     <div id="episodesPage" data-role="page" class="page libraryPage">
 
         <div class="libraryViewNav scopedLibraryViewNav">
-            <a href="tvrecommended.html">${TabSuggested}</a>
+            <a href="tvrecommended.html">${TabSuggestions}</a>
             <a href="tvlatest.html">${TabLatest}</a>
             <a href="tvupcoming.html">${TabUpcoming}</a>
             <a href="tvshows.html">${TabShows}</a>
diff --git a/dashboard-ui/gamegenres.html b/dashboard-ui/gamegenres.html
index eab7e4ef9..6d7c441fb 100644
--- a/dashboard-ui/gamegenres.html
+++ b/dashboard-ui/gamegenres.html
@@ -6,7 +6,7 @@
 <body>
     <div id="gameGenresPage" data-role="page" class="page libraryPage listPage">
         <div class="libraryViewNav scopedLibraryViewNav">
-            <a href="gamesrecommended.html">${TabSuggested}</a>
+            <a href="gamesrecommended.html">${TabSuggestions}</a>
             <a href="games.html">${TabGames}</a>
             <a href="gamesystems.html">${TabGameSystems}</a>
             <a href="#" class="ui-btn-active">${TabGenres}</a>
diff --git a/dashboard-ui/games.html b/dashboard-ui/games.html
index 76e18e484..2dd51720f 100644
--- a/dashboard-ui/games.html
+++ b/dashboard-ui/games.html
@@ -6,7 +6,7 @@
 <body>
     <div id="gamesPage" data-role="page" class="page libraryPage listPage">
         <div class="libraryViewNav scopedLibraryViewNav">
-            <a href="gamesrecommended.html">${TabSuggested}</a>
+            <a href="gamesrecommended.html">${TabSuggestions}</a>
             <a href="#" class="ui-btn-active">${TabGames}</a>
             <a href="gamesystems.html">${TabGameSystems}</a>
             <a href="gamegenres.html">${TabGenres}</a>
diff --git a/dashboard-ui/gamesrecommended.html b/dashboard-ui/gamesrecommended.html
index ec54afcba..e77a049d1 100644
--- a/dashboard-ui/gamesrecommended.html
+++ b/dashboard-ui/gamesrecommended.html
@@ -6,7 +6,7 @@
 <body>
     <div id="gamesRecommendedPage" data-role="page" class="page libraryPage backdropPage" data-backdroptype="game">
         <div class="libraryViewNav scopedLibraryViewNav">
-            <a href="#" class="ui-btn-active">${TabSuggested}</a>
+            <a href="#" class="ui-btn-active">${TabSuggestions}</a>
             <a href="games.html">${TabGames}</a>
             <a href="gamesystems.html">Game Systems</a>
             <a href="gamegenres.html">${TabGenres}</a>
diff --git a/dashboard-ui/gamestudios.html b/dashboard-ui/gamestudios.html
index 90a1b6cb2..7d96fc496 100644
--- a/dashboard-ui/gamestudios.html
+++ b/dashboard-ui/gamestudios.html
@@ -6,7 +6,7 @@
 <body>
     <div id="gameStudiosPage" data-role="page" class="page libraryPage listPage">
         <div class="libraryViewNav scopedLibraryViewNav">
-            <a href="gamesrecommended.html">${TabSuggested}</a>
+            <a href="gamesrecommended.html">${TabSuggestions}</a>
             <a href="games.html">${TabGames}</a>
             <a href="gamesystems.html">${TabGameSystems}</a>
             <a href="gamegenres.html">${TabGenres}</a>
diff --git a/dashboard-ui/gamesystems.html b/dashboard-ui/gamesystems.html
index ff9cb82df..30f60eea0 100644
--- a/dashboard-ui/gamesystems.html
+++ b/dashboard-ui/gamesystems.html
@@ -6,7 +6,7 @@
 <body>
     <div id="gamesystemsPage" data-role="page" class="page libraryPage backdropPage" data-backdroptype="gamesystem">
         <div class="libraryViewNav scopedLibraryViewNav">
-            <a href="gamesrecommended.html">${TabSuggested}</a>
+            <a href="gamesrecommended.html">${TabSuggestions}</a>
             <a href="games.html">${TabGames}</a>
             <a href="#" class="ui-btn-active">${TabGameSystems}</a>
             <a href="gamegenres.html">${TabGenres}</a>
diff --git a/dashboard-ui/itembynamedetails.html b/dashboard-ui/itembynamedetails.html
index 67befae75..9ce83dce8 100644
--- a/dashboard-ui/itembynamedetails.html
+++ b/dashboard-ui/itembynamedetails.html
@@ -8,8 +8,7 @@
     <div id="itemByNameDetailPage" data-role="page" class="page libraryPage itemDetailPage lightBackdropPage">
         <div id="movieGenreTabs" class="itemTabs" style="display: none;">
             <div class="libraryViewNav scopedLibraryViewNav">
-                <a href="movieslatest.html">${TabLatest}</a>
-                <a href="moviesrecommended.html">${TabSuggested}</a>
+                <a href="moviesrecommended.html">${TabSuggestions}</a>
                 <a href="movies.html">${TabMovies}</a>
                 <a href="movietrailers.html">${TabTrailers}</a>
                 <a href="collections.html?context=movies">${TabCollections}</a>
@@ -20,8 +19,7 @@
         </div>
         <div id="moviePeopleTabs" class="itemTabs" style="display: none;">
             <div class="libraryViewNav scopedLibraryViewNav">
-                <a href="movieslatest.html">${TabLatest}</a>
-                <a href="moviesrecommended.html">${TabSuggested}</a>
+                <a href="moviesrecommended.html">${TabSuggestions}</a>
                 <a href="movies.html">${TabMovies}</a>
                 <a href="movietrailers.html">${TabTrailers}</a>
                 <a href="collections.html?context=movies">${TabCollections}</a>
@@ -32,8 +30,7 @@
         </div>
         <div id="movieStudioTabs" class="itemTabs" style="display: none;">
             <div class="libraryViewNav scopedLibraryViewNav">
-                <a href="movieslatest.html">${TabLatest}</a>
-                <a href="moviesrecommended.html">${TabSuggested}</a>
+                <a href="moviesrecommended.html">${TabSuggestions}</a>
                 <a href="movies.html">${TabMovies}</a>
                 <a href="movietrailers.html">${TabTrailers}</a>
                 <a href="collections.html?context=movies">${TabCollections}</a>
@@ -44,7 +41,7 @@
         </div>
         <div id="tvGenreTabs" class="itemTabs" style="display: none;">
             <div class="libraryViewNav scopedLibraryViewNav">
-                <a href="tvrecommended.html">${TabSuggested}</a>
+                <a href="tvrecommended.html">${TabSuggestions}</a>
                 <a href="tvlatest.html">${TabLatest}</a>
                 <a href="tvupcoming.html">${TabUpcoming}</a>
                 <a href="tvshows.html">${TabShows}</a>
@@ -56,7 +53,7 @@
         </div>
         <div id="tvPeopleTabs" class="itemTabs" style="display: none;">
             <div class="libraryViewNav scopedLibraryViewNav">
-                <a href="tvrecommended.html">${TabSuggested}</a>
+                <a href="tvrecommended.html">${TabSuggestions}</a>
                 <a href="tvlatest.html">${TabLatest}</a>
                 <a href="tvupcoming.html">${TabUpcoming}</a>
                 <a href="tvshows.html">${TabShows}</a>
@@ -68,7 +65,7 @@
         </div>
         <div id="tvStudioTabs" class="itemTabs" style="display: none;">
             <div class="libraryViewNav scopedLibraryViewNav">
-                <a href="tvrecommended.html">${TabSuggested}</a>
+                <a href="tvrecommended.html">${TabSuggestions}</a>
                 <a href="tvlatest.html">${TabLatest}</a>
                 <a href="tvupcoming.html">${TabUpcoming}</a>
                 <a href="tvshows.html">${TabShows}</a>
@@ -80,7 +77,7 @@
         </div>
         <div id="musicGenreTabs" class="itemTabs" style="display: none;">
             <div class="libraryViewNav scopedLibraryViewNav">
-                <a href="musicrecommended.html">${TabSuggested}</a>
+                <a href="musicrecommended.html">${TabSuggestions}</a>
                 <a href="songs.html">${TabSongs}</a>
                 <a href="musicalbums.html">${TabAlbums}</a>
                 <a href="musicalbumartists.html">${TabAlbumArtists}</a>
@@ -91,7 +88,7 @@
         </div>
         <div id="artistTabs" class="itemTabs" style="display: none;">
             <div class="libraryViewNav scopedLibraryViewNav">
-                <a href="musicrecommended.html">${TabSuggested}</a>
+                <a href="musicrecommended.html">${TabSuggestions}</a>
                 <a href="songs.html">${TabSongs}</a>
                 <a href="musicalbums.html">${TabAlbums}</a>
                 <a href="musicalbumartists.html">${TabAlbumArtists}</a>
@@ -102,7 +99,7 @@
         </div>
         <div id="gameGenreTabs" class="itemTabs" style="display: none;">
             <div class="libraryViewNav scopedLibraryViewNav">
-                <a href="gamesrecommended.html">${TabSuggested}</a>
+                <a href="gamesrecommended.html">${TabSuggestions}</a>
                 <a href="games.html">${TabGames}</a>
                 <a href="gamesystems.html">Game Systems</a>
                 <a href="gamegenres.html" class="ui-btn-active">${TabGenres}</a>
@@ -111,7 +108,7 @@
         </div>
         <div id="gameStudioTabs" class="itemTabs" style="display: none;">
             <div class="libraryViewNav scopedLibraryViewNav">
-                <a href="gamesrecommended.html">${TabSuggested}</a>
+                <a href="gamesrecommended.html">${TabSuggestions}</a>
                 <a href="games.html">${TabGames}</a>
                 <a href="gamesystems.html">Game Systems</a>
                 <a href="gamegenres.html">${TabGenres}</a>
diff --git a/dashboard-ui/itemdetails.html b/dashboard-ui/itemdetails.html
index 0d668fb1c..64a43b3a0 100644
--- a/dashboard-ui/itemdetails.html
+++ b/dashboard-ui/itemdetails.html
@@ -31,8 +31,7 @@
 
         <div id="movieTabs" class="itemTabs" style="display: none;">
             <div class="libraryViewNav scopedLibraryViewNav">
-                <a href="movieslatest.html">${TabLatest}</a>
-                <a href="moviesrecommended.html">${TabSuggested}</a>
+                <a href="moviesrecommended.html">${TabSuggestions}</a>
                 <a href="movies.html" class="lnkMovies">${TabMovies}</a>
                 <a href="movietrailers.html" class="lnkMovieTrailers">${TabTrailers}</a>
                 <a href="collections.html?context=movies" class="lnkCollections">${TabCollections}</a>
@@ -43,7 +42,7 @@
         </div>
         <div id="tvShowsTabs" class="itemTabs" style="display: none;">
             <div class="libraryViewNav scopedLibraryViewNav">
-                <a href="tvrecommended.html">${TabSuggested}</a>
+                <a href="tvrecommended.html">${TabSuggestions}</a>
                 <a href="tvlatest.html">${TabLatest}</a>
                 <a href="tvupcoming.html">${TabUpcoming}</a>
                 <a href="tvshows.html" class="ui-btn-active">${TabShows}</a>
@@ -55,7 +54,7 @@
         </div>
         <div id="songTabs" class="itemTabs" style="display: none;">
             <div class="libraryViewNav scopedLibraryViewNav">
-                <a href="musicrecommended.html">${TabSuggested}</a>
+                <a href="musicrecommended.html">${TabSuggestions}</a>
                 <a href="songs.html" class="ui-btn-active">${TabSongs}</a>
                 <a href="musicalbums.html">${TabAlbums}</a>
                 <a href="musicalbumartists.html">${TabAlbumArtists}</a>
@@ -66,7 +65,7 @@
         </div>
         <div id="albumTabs" class="itemTabs" style="display: none;">
             <div class="libraryViewNav scopedLibraryViewNav">
-                <a href="musicrecommended.html">${TabSuggested}</a>
+                <a href="musicrecommended.html">${TabSuggestions}</a>
                 <a href="songs.html">${TabSongs}</a>
                 <a href="musicalbums.html" class="ui-btn-active">${TabAlbums}</a>
                 <a href="musicalbumartists.html">${TabAlbumArtists}</a>
@@ -77,7 +76,7 @@
         </div>
         <div id="musicVideoTabs" class="itemTabs" style="display: none;">
             <div class="libraryViewNav scopedLibraryViewNav">
-                <a href="musicrecommended.html">${TabSuggested}</a>
+                <a href="musicrecommended.html">${TabSuggestions}</a>
                 <a href="songs.html">${TabSongs}</a>
                 <a href="musicalbums.html">${TabAlbums}</a>
                 <a href="musicalbumartists.html">${TabAlbumArtists}</a>
@@ -88,7 +87,7 @@
         </div>
         <div id="gameTabs" class="itemTabs" style="display: none;">
             <div class="libraryViewNav scopedLibraryViewNav">
-                <a href="gamesrecommended.html">${TabSuggested}</a>
+                <a href="gamesrecommended.html">${TabSuggestions}</a>
                 <a href="games.html" class="ui-btn-active">${TabGames}</a>
                 <a href="gamesystems.html">Game Systems</a>
                 <a href="gamegenres.html">${TabGenres}</a>
@@ -97,7 +96,7 @@
         </div>
         <div id="gameSystemTabs" class="itemTabs" style="display: none;">
             <div class="libraryViewNav scopedLibraryViewNav">
-                <a href="gamesrecommended.html">${TabSuggested}</a>
+                <a href="gamesrecommended.html">${TabSuggestions}</a>
                 <a href="games.html">${TabGames}</a>
                 <a href="gamesystems.html" class="ui-btn-active">${TabGameSystems}</a>
                 <a href="gamegenres.html">${TabGenres}</a>
diff --git a/dashboard-ui/livetvchannel.html b/dashboard-ui/livetvchannel.html
index 09ace6103..85e0c1d32 100644
--- a/dashboard-ui/livetvchannel.html
+++ b/dashboard-ui/livetvchannel.html
@@ -6,7 +6,7 @@
 <body>
     <div id="liveTvChannelPage" data-role="page" class="page libraryPage liveTvPage" data-contextname="${HeaderLiveTv}">
         <div class="libraryViewNav">
-            <a href="livetvsuggested.html">${TabSuggested}</a>
+            <a href="livetvsuggested.html">${TabSuggestions}</a>
             <a href="livetvguide.html">${TabGuide}</a>
             <a href="livetvchannels.html" class="ui-btn-active">${TabChannels}</a>
             <a href="livetvrecordings.html">${TabRecordings}</a>
diff --git a/dashboard-ui/livetvchannels.html b/dashboard-ui/livetvchannels.html
index 7733379c8..fc79bc3fb 100644
--- a/dashboard-ui/livetvchannels.html
+++ b/dashboard-ui/livetvchannels.html
@@ -6,7 +6,7 @@
 <body>
     <div id="liveTvChannelsPage" data-role="page" class="page libraryPage liveTvPage" data-contextname="${HeaderLiveTv}">
         <div class="libraryViewNav">
-            <a href="livetvsuggested.html">${TabSuggested}</a>
+            <a href="livetvsuggested.html">${TabSuggestions}</a>
             <a href="livetvguide.html">${TabGuide}</a>
             <a href="livetvchannels.html" class="ui-btn-active">${TabChannels}</a>
             <a href="livetvrecordings.html">${TabRecordings}</a>
diff --git a/dashboard-ui/livetvguide.html b/dashboard-ui/livetvguide.html
index 50342200b..25e3b9059 100644
--- a/dashboard-ui/livetvguide.html
+++ b/dashboard-ui/livetvguide.html
@@ -6,7 +6,7 @@
 <body>
     <div id="liveTvGuidePage" data-role="page" class="page libraryPage liveTvPage" data-contextname="${HeaderLiveTv}">
         <div class="libraryViewNav">
-            <a href="livetvsuggested.html">${TabSuggested}</a>
+            <a href="livetvsuggested.html">${TabSuggestions}</a>
             <a href="livetvguide.html" class="ui-btn-active">${TabGuide}</a>
             <a href="livetvchannels.html">${TabChannels}</a>
             <a href="livetvrecordings.html">${TabRecordings}</a>
diff --git a/dashboard-ui/livetvitems.html b/dashboard-ui/livetvitems.html
index 5020a1ea3..d3594f3cf 100644
--- a/dashboard-ui/livetvitems.html
+++ b/dashboard-ui/livetvitems.html
@@ -6,7 +6,7 @@
 <body>
     <div id="liveTvItemsPage" data-role="page" class="page libraryPage liveTvPage" data-contextname="${HeaderLiveTv}">
         <div class="libraryViewNav">
-            <a href="livetvsuggested.html" class="ui-btn-active">${TabSuggested}</a>
+            <a href="livetvsuggested.html" class="ui-btn-active">${TabSuggestions}</a>
             <a href="livetvguide.html">${TabGuide}</a>
             <a href="livetvchannels.html">${TabChannels}</a>
             <a href="livetvrecordings.html">${TabRecordings}</a>
diff --git a/dashboard-ui/livetvnewrecording.html b/dashboard-ui/livetvnewrecording.html
index be2ecddc7..b3071e5f8 100644
--- a/dashboard-ui/livetvnewrecording.html
+++ b/dashboard-ui/livetvnewrecording.html
@@ -6,7 +6,7 @@
 <body>
     <div id="liveTvNewRecordingPage" data-role="page" class="page libraryPage liveTvPage" data-contextname="${HeaderLiveTv}">
         <div class="libraryViewNav">
-            <a href="livetvsuggested.html">${TabSuggested}</a>
+            <a href="livetvsuggested.html">${TabSuggestions}</a>
             <a href="livetvguide.html">${TabGuide}</a>
             <a href="livetvchannels.html">${TabChannels}</a>
             <a href="livetvrecordings.html" class="ui-btn-active">${TabRecordings}</a>
diff --git a/dashboard-ui/livetvprogram.html b/dashboard-ui/livetvprogram.html
index 5ecda6d56..62d4cf5e4 100644
--- a/dashboard-ui/livetvprogram.html
+++ b/dashboard-ui/livetvprogram.html
@@ -6,7 +6,7 @@
 <body>
     <div id="liveTvProgramPage" data-role="page" class="page libraryPage liveTvPage" data-contextname="${HeaderLiveTv}">
         <div class="libraryViewNav">
-            <a href="livetvsuggested.html">${TabSuggested}</a>
+            <a href="livetvsuggested.html">${TabSuggestions}</a>
             <a href="livetvguide.html">${TabGuide}</a>
             <a href="livetvchannels.html" class="ui-btn-active">${TabChannels}</a>
             <a href="livetvrecordings.html">${TabRecordings}</a>
diff --git a/dashboard-ui/livetvrecording.html b/dashboard-ui/livetvrecording.html
index 2fb072e01..d6347452e 100644
--- a/dashboard-ui/livetvrecording.html
+++ b/dashboard-ui/livetvrecording.html
@@ -6,7 +6,7 @@
 <body>
     <div id="liveTvRecordingPage" data-role="page" class="page libraryPage liveTvPage" data-contextname="${HeaderLiveTv}">
         <div class="libraryViewNav">
-            <a href="livetvsuggested.html">${TabSuggested}</a>
+            <a href="livetvsuggested.html">${TabSuggestions}</a>
             <a href="livetvguide.html">${TabGuide}</a>
             <a href="livetvchannels.html">${TabChannels}</a>
             <a href="livetvrecordings.html" class="ui-btn-active">${TabRecordings}</a>
diff --git a/dashboard-ui/livetvrecordinglist.html b/dashboard-ui/livetvrecordinglist.html
index e7fedb359..70d29340b 100644
--- a/dashboard-ui/livetvrecordinglist.html
+++ b/dashboard-ui/livetvrecordinglist.html
@@ -6,7 +6,7 @@
 <body>
     <div id="liveTvRecordingListPage" data-role="page" class="page libraryPage liveTvPage" data-contextname="${HeaderLiveTv}">
         <div class="libraryViewNav">
-            <a href="livetvsuggested.html">${TabSuggested}</a>
+            <a href="livetvsuggested.html">${TabSuggestions}</a>
             <a href="livetvguide.html">${TabGuide}</a>
             <a href="livetvchannels.html">${TabChannels}</a>
             <a href="livetvrecordings.html" class="ui-btn-active">${TabRecordings}</a>
diff --git a/dashboard-ui/livetvrecordings.html b/dashboard-ui/livetvrecordings.html
index 88412b480..4b4813973 100644
--- a/dashboard-ui/livetvrecordings.html
+++ b/dashboard-ui/livetvrecordings.html
@@ -6,7 +6,7 @@
 <body>
     <div id="liveTvRecordingsPage" data-role="page" class="page libraryPage liveTvPage" data-contextname="${HeaderLiveTv}">
         <div class="libraryViewNav">
-            <a href="livetvsuggested.html">${TabSuggested}</a>
+            <a href="livetvsuggested.html">${TabSuggestions}</a>
             <a href="livetvguide.html">${TabGuide}</a>
             <a href="livetvchannels.html">${TabChannels}</a>
             <a href="livetvrecordings.html" class="ui-btn-active">${TabRecordings}</a>
diff --git a/dashboard-ui/livetvseriestimer.html b/dashboard-ui/livetvseriestimer.html
index 3f703d33b..36c4b8c38 100644
--- a/dashboard-ui/livetvseriestimer.html
+++ b/dashboard-ui/livetvseriestimer.html
@@ -6,7 +6,7 @@
 <body>
     <div id="liveTvSeriesTimerPage" data-role="page" class="page libraryPage liveTvPage" data-contextname="${HeaderLiveTv}">
         <div class="libraryViewNav">
-            <a href="livetvsuggested.html">${TabSuggested}</a>
+            <a href="livetvsuggested.html">${TabSuggestions}</a>
             <a href="livetvguide.html">${TabGuide}</a>
             <a href="livetvchannels.html">${TabChannels}</a>
             <a href="livetvrecordings.html">${TabRecordings}</a>
diff --git a/dashboard-ui/livetvseriestimers.html b/dashboard-ui/livetvseriestimers.html
index 9e0db536d..770cecd25 100644
--- a/dashboard-ui/livetvseriestimers.html
+++ b/dashboard-ui/livetvseriestimers.html
@@ -6,7 +6,7 @@
 <body>
     <div id="liveTvSeriesTimersPage" data-role="page" class="page libraryPage liveTvPage" data-contextname="${HeaderLiveTv}">
         <div class="libraryViewNav">
-            <a href="livetvsuggested.html">${TabSuggested}</a>
+            <a href="livetvsuggested.html">${TabSuggestions}</a>
             <a href="livetvguide.html">${TabGuide}</a>
             <a href="livetvchannels.html">${TabChannels}</a>
             <a href="livetvrecordings.html">${TabRecordings}</a>
diff --git a/dashboard-ui/livetvsuggested.html b/dashboard-ui/livetvsuggested.html
index 0f936adce..1275ef657 100644
--- a/dashboard-ui/livetvsuggested.html
+++ b/dashboard-ui/livetvsuggested.html
@@ -6,7 +6,7 @@
 <body>
     <div id="liveTvSuggestedPage" data-role="page" class="page libraryPage liveTvPage" data-contextname="${HeaderLiveTv}">
         <div class="libraryViewNav">
-            <a href="#" class="ui-btn-active">${TabSuggested}</a>
+            <a href="#" class="ui-btn-active">${TabSuggestions}</a>
             <a href="livetvguide.html">${TabGuide}</a>
             <a href="livetvchannels.html">${TabChannels}</a>
             <a href="livetvrecordings.html">${TabRecordings}</a>
diff --git a/dashboard-ui/livetvtimer.html b/dashboard-ui/livetvtimer.html
index 7a9b2b330..ce30c92aa 100644
--- a/dashboard-ui/livetvtimer.html
+++ b/dashboard-ui/livetvtimer.html
@@ -6,7 +6,7 @@
 <body>
     <div id="liveTvTimerPage" data-role="page" class="page libraryPage liveTvPage" data-contextname="${HeaderLiveTv}">
         <div class="libraryViewNav">
-            <a href="livetvsuggested.html">${TabSuggested}</a>
+            <a href="livetvsuggested.html">${TabSuggestions}</a>
             <a href="livetvguide.html">${TabGuide}</a>
             <a href="livetvchannels.html">${TabChannels}</a>
             <a href="livetvrecordings.html">${TabRecordings}</a>
diff --git a/dashboard-ui/livetvtimers.html b/dashboard-ui/livetvtimers.html
index e3b8eb303..ebaec3ad7 100644
--- a/dashboard-ui/livetvtimers.html
+++ b/dashboard-ui/livetvtimers.html
@@ -6,7 +6,7 @@
 <body>
     <div id="liveTvTimersPage" data-role="page" class="page libraryPage liveTvPage" data-contextname="${HeaderLiveTv}">
         <div class="libraryViewNav">
-            <a href="livetvsuggested.html">${TabSuggested}</a>
+            <a href="livetvsuggested.html">${TabSuggestions}</a>
             <a href="livetvguide.html">${TabGuide}</a>
             <a href="livetvchannels.html">${TabChannels}</a>
             <a href="livetvrecordings.html">${TabRecordings}</a>
diff --git a/dashboard-ui/moviegenres.html b/dashboard-ui/moviegenres.html
index ed4de7f7a..02374bb18 100644
--- a/dashboard-ui/moviegenres.html
+++ b/dashboard-ui/moviegenres.html
@@ -7,8 +7,7 @@
     <div id="movieGenresPage" data-role="page" class="page libraryPage">
 
         <div class="libraryViewNav scopedLibraryViewNav">
-            <a href="movieslatest.html">${TabLatest}</a>
-            <a href="moviesrecommended.html">${TabSuggested}</a>
+            <a href="moviesrecommended.html">${TabSuggestions}</a>
             <a href="movies.html">${TabMovies}</a>
             <a href="movietrailers.html">${TabTrailers}</a>
             <a href="collections.html?context=movies">${TabCollections}</a>
diff --git a/dashboard-ui/moviepeople.html b/dashboard-ui/moviepeople.html
index b376b6bf1..e5714175a 100644
--- a/dashboard-ui/moviepeople.html
+++ b/dashboard-ui/moviepeople.html
@@ -7,8 +7,7 @@
     <div id="moviePeoplePage" data-role="page" class="page libraryPage">
 
         <div class="libraryViewNav scopedLibraryViewNav">
-            <a href="movieslatest.html">${TabLatest}</a>
-            <a href="moviesrecommended.html">${TabSuggested}</a>
+            <a href="moviesrecommended.html">${TabSuggestions}</a>
             <a href="movies.html">${TabMovies}</a>
             <a href="movietrailers.html">${TabTrailers}</a>
             <a href="collections.html?context=movies">${TabCollections}</a>
diff --git a/dashboard-ui/movies.html b/dashboard-ui/movies.html
index d22d910e9..7f3fa062a 100644
--- a/dashboard-ui/movies.html
+++ b/dashboard-ui/movies.html
@@ -7,8 +7,7 @@
     <div id="moviesPage" data-role="page" class="page libraryPage collectionEditorPage">
 
         <div class="libraryViewNav scopedLibraryViewNav">
-            <a href="movieslatest.html">${TabLatest}</a>
-            <a href="moviesrecommended.html">${TabSuggested}</a>
+            <a href="moviesrecommended.html">${TabSuggestions}</a>
             <a href="#" class="ui-btn-active">${TabMovies}</a>
             <a href="movietrailers.html">${TabTrailers}</a>
             <a href="collections.html?context=movies">${TabCollections}</a>
diff --git a/dashboard-ui/movieslatest.html b/dashboard-ui/movieslatest.html
deleted file mode 100644
index 4becc84c8..000000000
--- a/dashboard-ui/movieslatest.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <title>Emby</title>
-</head>
-<body>
-    <div id="moviesLatestPage" data-role="page" class="page libraryPage backdropPage" data-backdroptype="movie">
-
-        <div class="libraryViewNav scopedLibraryViewNav">
-            <a href="#" class="ui-btn-active">${TabLatest}</a>
-            <a href="moviesrecommended.html">${TabSuggested}</a>
-            <a href="movies.html">${TabMovies}</a>
-            <a href="movietrailers.html">${TabTrailers}</a>
-            <a href="collections.html?context=movies">${TabCollections}</a>
-            <a href="moviegenres.html">${TabGenres}</a>
-            <a href="moviepeople.html">${TabPeople}</a>
-            <a href="moviestudios.html">${TabStudios}</a>
-        </div>
-
-        <div data-role="content">
-
-            <div class="ehsContent portraitEhsContent">
-                <div>
-                    <h1 class="listHeader" style="display:inline-block;vertical-align:middle;">${HeaderLatestMovies}</h1>
-                    <a href="#" class="accentButton categorySyncButton" data-category="Latest"><i class="fa fa-cloud"></i>${ButtonSync}</a>
-                </div>
-
-                <div id="recentlyAddedItems" class="itemsContainer">
-                </div>
-            </div>
-        </div>
-    </div>
-</body>
-</html>
diff --git a/dashboard-ui/moviesrecommended.html b/dashboard-ui/moviesrecommended.html
index 9ac43e153..57150b5fd 100644
--- a/dashboard-ui/moviesrecommended.html
+++ b/dashboard-ui/moviesrecommended.html
@@ -7,8 +7,7 @@
     <div id="moviesRecommendedPage" data-role="page" class="page libraryPage backdropPage" data-backdroptype="movie">
 
         <div class="libraryViewNav scopedLibraryViewNav">
-            <a href="movieslatest.html">${TabLatest}</a>
-            <a href="#" class="ui-btn-active">${TabSuggested}</a>
+            <a href="#" class="ui-btn-active">${TabSuggestions}</a>
             <a href="movies.html">${TabMovies}</a>
             <a href="movietrailers.html">${TabTrailers}</a>
             <a href="collections.html?context=movies">${TabCollections}</a>
@@ -29,6 +28,14 @@
                     </div>
                 </div>
 
+                <div>
+                    <h1 class="listHeader" style="display:inline-block;vertical-align:middle;">${HeaderLatestMovies}</h1>
+                    <a href="#" class="accentButton categorySyncButton" data-category="Latest"><i class="fa fa-cloud"></i>${ButtonSync}</a>
+                </div>
+
+                <div id="recentlyAddedItems" class="itemsContainer">
+                </div>
+
                 <div class="recommendations">
                 </div>
                 <div class="noItemsMessage" style="display: none;">
diff --git a/dashboard-ui/moviestudios.html b/dashboard-ui/moviestudios.html
index a64f6f351..4a768c41c 100644
--- a/dashboard-ui/moviestudios.html
+++ b/dashboard-ui/moviestudios.html
@@ -7,8 +7,7 @@
     <div id="movieStudiosPage" data-role="page" class="page libraryPage">
 
         <div class="libraryViewNav scopedLibraryViewNav">
-            <a href="movieslatest.html">${TabLatest}</a>
-            <a href="moviesrecommended.html">${TabSuggested}</a>
+            <a href="moviesrecommended.html">${TabSuggestions}</a>
             <a href="movies.html">${TabMovies}</a>
             <a href="movietrailers.html">${TabTrailers}</a>
             <a href="collections.html?context=movies">${TabCollections}</a>
diff --git a/dashboard-ui/movietrailers.html b/dashboard-ui/movietrailers.html
index 2238813f6..e19be46be 100644
--- a/dashboard-ui/movietrailers.html
+++ b/dashboard-ui/movietrailers.html
@@ -7,8 +7,7 @@
     <div id="movieTrailersPage" data-role="page" class="page libraryPage">
 
         <div class="libraryViewNav scopedLibraryViewNav">
-            <a href="movieslatest.html">${TabLatest}</a>
-            <a href="moviesrecommended.html">${TabSuggested}</a>
+            <a href="moviesrecommended.html">${TabSuggestions}</a>
             <a href="movies.html">${TabMovies}</a>
             <a href="#" class="ui-btn-active">${TabTrailers}</a>
             <a href="collections.html?context=movies">${TabCollections}</a>
diff --git a/dashboard-ui/musicalbumartists.html b/dashboard-ui/musicalbumartists.html
index f9429b904..e5eef649b 100644
--- a/dashboard-ui/musicalbumartists.html
+++ b/dashboard-ui/musicalbumartists.html
@@ -6,7 +6,7 @@
 <body>
     <div id="musicAlbumArtistsPage" data-role="page" class="page libraryPage">
         <div class="libraryViewNav scopedLibraryViewNav">
-            <a href="musicrecommended.html">${TabSuggested}</a>
+            <a href="musicrecommended.html">${TabSuggestions}</a>
             <a href="songs.html">${TabSongs}</a>
             <a href="musicalbums.html">${TabAlbums}</a>
             <a href="#" class="ui-btn-active">${TabAlbumArtists}</a>
diff --git a/dashboard-ui/musicalbums.html b/dashboard-ui/musicalbums.html
index c24bc9f6b..49b129e6f 100644
--- a/dashboard-ui/musicalbums.html
+++ b/dashboard-ui/musicalbums.html
@@ -6,7 +6,7 @@
 <body>
     <div id="musicAlbumsPage" data-role="page" class="page libraryPage">
         <div class="libraryViewNav scopedLibraryViewNav">
-            <a href="musicrecommended.html">${TabSuggested}</a>
+            <a href="musicrecommended.html">${TabSuggestions}</a>
             <a href="songs.html">${TabSongs}</a>
             <a href="#" class="ui-btn-active">${TabAlbums}</a>
             <a href="musicalbumartists.html">${TabAlbumArtists}</a>
diff --git a/dashboard-ui/musicartists.html b/dashboard-ui/musicartists.html
index 580f80654..bbfb95a3a 100644
--- a/dashboard-ui/musicartists.html
+++ b/dashboard-ui/musicartists.html
@@ -6,7 +6,7 @@
 <body>
     <div id="musicArtistsPage" data-role="page" class="page libraryPage">
         <div class="libraryViewNav scopedLibraryViewNav">
-            <a href="musicrecommended.html">${TabSuggested}</a>
+            <a href="musicrecommended.html">${TabSuggestions}</a>
             <a href="songs.html">${TabSongs}</a>
             <a href="musicalbums.html">${TabAlbums}</a>
             <a href="musicalbumartists.html">${TabAlbumArtists}</a>
diff --git a/dashboard-ui/musicgenres.html b/dashboard-ui/musicgenres.html
index 3bbd796af..aad15dcf3 100644
--- a/dashboard-ui/musicgenres.html
+++ b/dashboard-ui/musicgenres.html
@@ -6,7 +6,7 @@
 <body>
     <div id="musicGenresPage" data-role="page" class="page libraryPage">
         <div class="libraryViewNav scopedLibraryViewNav">
-            <a href="musicrecommended.html">${TabSuggested}</a>
+            <a href="musicrecommended.html">${TabSuggestions}</a>
             <a href="songs.html">${TabSongs}</a>
             <a href="musicalbums.html">${TabAlbums}</a>
             <a href="musicalbumartists.html">${TabAlbumArtists}</a>
diff --git a/dashboard-ui/musicrecommended.html b/dashboard-ui/musicrecommended.html
index 26641bf60..1d155dd5b 100644
--- a/dashboard-ui/musicrecommended.html
+++ b/dashboard-ui/musicrecommended.html
@@ -6,7 +6,7 @@
 <body>
     <div id="musicRecommendedPage" data-role="page" class="page libraryPage backdropPage" data-backdroptype="musicartist">
         <div class="libraryViewNav scopedLibraryViewNav">
-            <a href="#" class="ui-btn-active">${TabSuggested}</a>
+            <a href="#" class="ui-btn-active">${TabSuggestions}</a>
             <a href="songs.html">${TabSongs}</a>
             <a href="musicalbums.html">${TabAlbums}</a>
             <a href="musicalbumartists.html">${TabAlbumArtists}</a>
diff --git a/dashboard-ui/musicvideos.html b/dashboard-ui/musicvideos.html
index 4d415e144..ec7d64cff 100644
--- a/dashboard-ui/musicvideos.html
+++ b/dashboard-ui/musicvideos.html
@@ -7,7 +7,7 @@
     <div id="musicVideosPage" data-role="page" class="page libraryPage">
 
         <div class="libraryViewNav scopedLibraryViewNav">
-            <a href="musicrecommended.html">${TabSuggested}</a>
+            <a href="musicrecommended.html">${TabSuggestions}</a>
             <a href="songs.html">${TabSongs}</a>
             <a href="musicalbums.html">${TabAlbums}</a>
             <a href="musicalbumartists.html">${TabAlbumArtists}</a>
diff --git a/dashboard-ui/scripts/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js
index 3704ff8aa..48aa421ca 100644
--- a/dashboard-ui/scripts/librarybrowser.js
+++ b/dashboard-ui/scripts/librarybrowser.js
@@ -477,7 +477,7 @@
 
             if (context != 'folders') {
                 if (item.CollectionType == 'movies') {
-                    return 'movieslatest.html?topParentId=' + item.Id;
+                    return 'moviesrecommended.html?topParentId=' + item.Id;
                 }
 
                 if (item.CollectionType == 'boxsets') {
diff --git a/dashboard-ui/scripts/movieslatest.js b/dashboard-ui/scripts/movieslatest.js
deleted file mode 100644
index 09f4e62f7..000000000
--- a/dashboard-ui/scripts/movieslatest.js
+++ /dev/null
@@ -1,34 +0,0 @@
-(function ($, document) {
-
-    $(document).on('pagebeforeshow', "#moviesLatestPage", function () {
-
-        var parentId = LibraryMenu.getTopParentId();
-        var userId = Dashboard.getCurrentUserId();
-        
-        var page = this;
-
-        var options = {
-
-            IncludeItemTypes: "Movie",
-            Limit: 30,
-            Fields: "PrimaryImageAspectRatio,MediaSourceCount,SyncInfo",
-            ParentId: parentId,
-            ImageTypeLimit: 1,
-            EnableImageTypes: "Primary,Backdrop,Banner,Thumb"
-        };
-
-        ApiClient.getJSON(ApiClient.getUrl('Users/' + userId + '/Items/Latest', options)).done(function (items) {
-
-            $('#recentlyAddedItems', page).html(LibraryBrowser.getPosterViewHtml({
-                items: items,
-                lazy: true,
-                shape: 'portrait',
-                overlayText: false
-
-            })).lazyChildren().trigger('create');
-        });
-
-    });
-
-
-})(jQuery, document);
\ No newline at end of file
diff --git a/dashboard-ui/scripts/moviesrecommended.js b/dashboard-ui/scripts/moviesrecommended.js
index dcf02ffac..0d6cca8f5 100644
--- a/dashboard-ui/scripts/moviesrecommended.js
+++ b/dashboard-ui/scripts/moviesrecommended.js
@@ -1,5 +1,29 @@
 (function ($, document) {
 
+    function loadLatest(page, userId, parentId) {
+
+        var options = {
+
+            IncludeItemTypes: "Movie",
+            Limit: 20,
+            Fields: "PrimaryImageAspectRatio,MediaSourceCount,SyncInfo",
+            ParentId: parentId,
+            ImageTypeLimit: 1,
+            EnableImageTypes: "Primary,Backdrop,Banner,Thumb"
+        };
+
+        ApiClient.getJSON(ApiClient.getUrl('Users/' + userId + '/Items/Latest', options)).done(function (items) {
+
+            $('#recentlyAddedItems', page).html(LibraryBrowser.getPosterViewHtml({
+                items: items,
+                lazy: true,
+                shape: 'portrait',
+                overlayText: false
+
+            })).lazyChildren().trigger('create');
+        });
+    }
+
     function getRecommendationHtml(recommendation) {
 
         var html = '';
@@ -51,6 +75,7 @@
         var screenWidth = $(window).width();
 
         var page = this;
+        var userId = Dashboard.getCurrentUserId();
 
         var options = {
 
@@ -58,7 +83,7 @@
             SortOrder: "Descending",
             IncludeItemTypes: "Movie",
             Filters: "IsResumable",
-            Limit: screenWidth >= 1920 ? 12 : (screenWidth >= 1600 ? 8 : 6),
+            Limit: screenWidth >= 1920 ? 6 : (screenWidth >= 1600 ? 4 : 3),
             Recursive: true,
             Fields: "PrimaryImageAspectRatio,MediaSourceCount,SyncInfo",
             CollapseBoxSetItems: false,
@@ -67,7 +92,7 @@
             EnableImageTypes: "Primary,Backdrop,Banner,Thumb"
         };
 
-        ApiClient.getItems(Dashboard.getCurrentUserId(), options).done(function (result) {
+        ApiClient.getItems(userId, options).done(function (result) {
 
             if (result.Items.length) {
                 $('#resumableSection', page).show();
@@ -87,9 +112,11 @@
 
         });
 
+        loadLatest(page, userId, parentId);
+
         var url = ApiClient.getUrl("Movies/Recommendations", {
 
-            userId: Dashboard.getCurrentUserId(),
+            userId: userId,
             categoryLimit: screenWidth >= 1200 ? 4 : 3,
             ItemLimit: screenWidth >= 1920 ? 10 : (screenWidth >= 1600 ? 8 : (screenWidth >= 1200 ? 7 : 6)),
             Fields: "PrimaryImageAspectRatio,MediaSourceCount,SyncInfo",
diff --git a/dashboard-ui/songs.html b/dashboard-ui/songs.html
index a39ca7234..f43900d6f 100644
--- a/dashboard-ui/songs.html
+++ b/dashboard-ui/songs.html
@@ -6,7 +6,7 @@
 <body>
     <div id="songsPage" data-role="page" class="page libraryPage">
         <div class="libraryViewNav scopedLibraryViewNav">
-            <a href="musicrecommended.html">${TabSuggested}</a>
+            <a href="musicrecommended.html">${TabSuggestions}</a>
             <a href="#" class="ui-btn-active">${TabSongs}</a>
             <a href="musicalbums.html">${TabAlbums}</a>
             <a href="musicalbumartists.html">${TabAlbumArtists}</a>
diff --git a/dashboard-ui/tvgenres.html b/dashboard-ui/tvgenres.html
index 4dfdefe01..e847a4c3f 100644
--- a/dashboard-ui/tvgenres.html
+++ b/dashboard-ui/tvgenres.html
@@ -6,7 +6,7 @@
 <body>
     <div id="tvGenresPage" data-role="page" class="page libraryPage">
         <div class="libraryViewNav scopedLibraryViewNav">
-            <a href="tvrecommended.html">${TabSuggested}</a>
+            <a href="tvrecommended.html">${TabSuggestions}</a>
             <a href="tvlatest.html">${TabLatest}</a>
             <a href="tvupcoming.html">${TabUpcoming}</a>
             <a href="tvshows.html">${TabShows}</a>
diff --git a/dashboard-ui/tvlatest.html b/dashboard-ui/tvlatest.html
index c5ceed36d..2d2c08096 100644
--- a/dashboard-ui/tvlatest.html
+++ b/dashboard-ui/tvlatest.html
@@ -6,7 +6,7 @@
 <body>
     <div id="tvNextUpPage" data-role="page" class="page libraryPage backdropPage" data-backdroptype="series">
         <div class="libraryViewNav scopedLibraryViewNav">
-            <a href="tvrecommended.html">${TabSuggested}</a>
+            <a href="tvrecommended.html">${TabSuggestions}</a>
             <a href="#" class="ui-btn-active">${TabLatest}</a>
             <a href="tvupcoming.html">${TabUpcoming}</a>
             <a href="tvshows.html">${TabShows}</a>
diff --git a/dashboard-ui/tvpeople.html b/dashboard-ui/tvpeople.html
index 4d0ba2c3c..4c93612fa 100644
--- a/dashboard-ui/tvpeople.html
+++ b/dashboard-ui/tvpeople.html
@@ -6,7 +6,7 @@
 <body>
     <div id="tvPeoplePage" data-role="page" class="page libraryPage">
         <div class="libraryViewNav scopedLibraryViewNav">
-            <a href="tvrecommended.html">${TabSuggested}</a>
+            <a href="tvrecommended.html">${TabSuggestions}</a>
             <a href="tvlatest.html">${TabLatest}</a>
             <a href="tvupcoming.html">${TabUpcoming}</a>
             <a href="tvshows.html">${TabShows}</a>
diff --git a/dashboard-ui/tvrecommended.html b/dashboard-ui/tvrecommended.html
index 6e2edba3b..62ef7c311 100644
--- a/dashboard-ui/tvrecommended.html
+++ b/dashboard-ui/tvrecommended.html
@@ -14,7 +14,7 @@
             <a href="tvupcoming.html">${TabUpcoming}</a>
         </div>
         <div class="libraryViewNav scopedLibraryViewNav" style="display: none;">
-            <a href="tvrecommended.html" class="ui-btn-active">${TabSuggested}</a>
+            <a href="tvrecommended.html" class="ui-btn-active">${TabSuggestions}</a>
             <a href="tvlatest.html">${TabLatest}</a>
             <a href="tvupcoming.html">${TabUpcoming}</a>
             <a href="tvshows.html">${TabShows}</a>
diff --git a/dashboard-ui/tvshows.html b/dashboard-ui/tvshows.html
index b3712f7d5..edd14dd1c 100644
--- a/dashboard-ui/tvshows.html
+++ b/dashboard-ui/tvshows.html
@@ -6,7 +6,7 @@
 <body>
     <div id="tvShowsPage" data-role="page" class="page libraryPage">
         <div class="libraryViewNav scopedLibraryViewNav">
-            <a href="tvrecommended.html">${TabSuggested}</a>
+            <a href="tvrecommended.html">${TabSuggestions}</a>
             <a href="tvlatest.html">${TabLatest}</a>
             <a href="tvupcoming.html">${TabUpcoming}</a>
             <a href="#" class="ui-btn-active">${TabShows}</a>
diff --git a/dashboard-ui/tvstudios.html b/dashboard-ui/tvstudios.html
index 6336bcd8e..54bb4b90e 100644
--- a/dashboard-ui/tvstudios.html
+++ b/dashboard-ui/tvstudios.html
@@ -6,7 +6,7 @@
 <body>
     <div id="tvStudiosPage" data-role="page" class="page libraryPage">
         <div class="libraryViewNav scopedLibraryViewNav">
-            <a href="tvrecommended.html">${TabSuggested}</a>
+            <a href="tvrecommended.html">${TabSuggestions}</a>
             <a href="tvlatest.html">${TabLatest}</a>
             <a href="tvupcoming.html">${TabUpcoming}</a>
             <a href="tvshows.html">${TabShows}</a>
diff --git a/dashboard-ui/tvupcoming.html b/dashboard-ui/tvupcoming.html
index 7607efc42..4ace1a5ff 100644
--- a/dashboard-ui/tvupcoming.html
+++ b/dashboard-ui/tvupcoming.html
@@ -13,7 +13,7 @@
             <a href="#" class="ui-btn-active">${TabUpcoming}</a>
         </div>
         <div class="libraryViewNav scopedLibraryViewNav" style="display: none;">
-            <a href="tvrecommended.html">${TabSuggested}</a>
+            <a href="tvrecommended.html">${TabSuggestions}</a>
             <a href="tvlatest.html">${TabLatest}</a>
             <a href="tvupcoming.html" class="ui-btn-active">${TabUpcoming}</a>
             <a href="tvshows.html">${TabShows}</a>

From 908160cdbe91bd1fa1c086d42deafdc4ab3f3487 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Thu, 2 Apr 2015 17:01:42 -0400
Subject: [PATCH 29/33] add poster dynamic images

---
 dashboard-ui/collections.html            |  3 ++-
 dashboard-ui/scripts/moviecollections.js | 11 +++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/dashboard-ui/collections.html b/dashboard-ui/collections.html
index d30d9dacb..f9b5235cb 100644
--- a/dashboard-ui/collections.html
+++ b/dashboard-ui/collections.html
@@ -51,7 +51,8 @@
                         <select id="selectView">
                             <option value="Poster">${OptionPoster}</option>
                             <option value="List">${OptionList}</option>
-                        </select>
+                            <option value="Thumb">${OptionThumb}</option>
+                       </select>
                     </div>
                     <br />
                     <div>
diff --git a/dashboard-ui/scripts/moviecollections.js b/dashboard-ui/scripts/moviecollections.js
index 00d9abc3e..2ef0cd848 100644
--- a/dashboard-ui/scripts/moviecollections.js
+++ b/dashboard-ui/scripts/moviecollections.js
@@ -74,6 +74,17 @@
                         lazy: true
                     });
                 }
+                else if (view == "Thumb") {
+                    html = LibraryBrowser.getPosterViewHtml({
+                        items: result.Items,
+                        shape: "backdrop",
+                        context: 'movies',
+                        showTitle: true,
+                        centerText: true,
+                        lazy: true,
+                        preferThumb: true
+                    });
+                }
 
                 $('.noItemsMessage', page).hide();
 

From bab5d2af2a0442693cb84967bc107691d9791640 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Thu, 2 Apr 2015 22:54:40 -0400
Subject: [PATCH 30/33] update dynamic images

---
 dashboard-ui/scripts/mediaplayer.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/dashboard-ui/scripts/mediaplayer.js b/dashboard-ui/scripts/mediaplayer.js
index 2337faf97..a67b4125c 100644
--- a/dashboard-ui/scripts/mediaplayer.js
+++ b/dashboard-ui/scripts/mediaplayer.js
@@ -1535,7 +1535,6 @@
 
             if (item.MediaType == "Video") {
 
-                ApiClient.stopActiveEncodings(playSessionId);
                 if (self.isFullScreen()) {
                     self.exitFullScreen();
                 }

From fd459b0744a40b53f25c3d0813f0be07dbc81bc0 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Fri, 3 Apr 2015 11:52:49 -0400
Subject: [PATCH 31/33] restore model properties

---
 dashboard-ui/appservices.html               |  2 +-
 dashboard-ui/css/librarybrowser.css         |  3 --
 dashboard-ui/dashboard.html                 | 11 +------
 dashboard-ui/scripts/dashboardpage.js       | 34 +++++++++++++++------
 dashboard-ui/scripts/userparentalcontrol.js |  2 +-
 dashboard-ui/syncactivity.html              |  2 +-
 dashboard-ui/userprofiles.html              |  2 +-
 7 files changed, 30 insertions(+), 26 deletions(-)

diff --git a/dashboard-ui/appservices.html b/dashboard-ui/appservices.html
index cbbe17611..386f86354 100644
--- a/dashboard-ui/appservices.html
+++ b/dashboard-ui/appservices.html
@@ -32,7 +32,7 @@
                 <div class="detailSectionHeader">${HeaderAvailableServices}</div>
                 <div class="catalog"></div>
 
-                <div class="supporterPromotion syncPromotion" style="display:none;">
+                <div class="staticSupporterPromotion supporterPromotion syncPromotion" style="display:none;">
                     <a class="btn btnActionAccent" href="supporter.html" style="font-size:14px;">
                         <div>
                             ${HeaderSyncRequiresSupporterMembership}
diff --git a/dashboard-ui/css/librarybrowser.css b/dashboard-ui/css/librarybrowser.css
index 62de223e2..93bceb1ac 100644
--- a/dashboard-ui/css/librarybrowser.css
+++ b/dashboard-ui/css/librarybrowser.css
@@ -1445,7 +1445,4 @@ span.itemCommunityRating:not(:empty) + .userDataIcons {
     .smallDetailImageContainer {
         padding-left: 1em;
     }
-}
-
-.homeTopViews .cardText{
 }
\ No newline at end of file
diff --git a/dashboard-ui/dashboard.html b/dashboard-ui/dashboard.html
index 528ff8e6a..66fbf2c8e 100644
--- a/dashboard-ui/dashboard.html
+++ b/dashboard-ui/dashboard.html
@@ -14,16 +14,6 @@
                     <a href="dashboardgeneral.html" data-role="button">${TabSettings}</a>
                 </div>
                 <div class="dashboardContent">
-                    <div class="supporterPromotion" style="display:none;">
-                        <a class="btn btnActionAccent" href="supporter.html" style="font-size:14px;">
-                            <div>
-                                ${HeaderSupportTheTeam}
-                            </div>
-                            <div style="font-weight:normal;font-size:90%;margin-top:5px;">
-                                ${TextEnjoyBonusFeatures}
-                            </div>
-                        </a>
-                    </div>
                     <div class="ui-bar-a welcomeMessage" style="display: none; padding: 2em; border-radius: 10px; margin: 2em 0; font-weight: normal; max-width: 800px;">
                         <h1 style="margin-top: 0;" class="tourHeader"></h1>
                         <p>
@@ -141,6 +131,7 @@
                         </div>
                     </div>
                 </div>
+                
             </div>
         </div>
     </div>
diff --git a/dashboard-ui/scripts/dashboardpage.js b/dashboard-ui/scripts/dashboardpage.js
index 9538dc7dc..827f54389 100644
--- a/dashboard-ui/scripts/dashboardpage.js
+++ b/dashboard-ui/scripts/dashboardpage.js
@@ -24,12 +24,6 @@
 
         Dashboard.getPluginSecurityInfo().done(function (pluginSecurityInfo) {
 
-            if (pluginSecurityInfo.IsMBSupporter) {
-                $('.supporterPromotion', page).hide();
-            } else {
-                $('.supporterPromotion', page).show();
-            }
-
             DashboardPage.renderSupporterIcon(page, pluginSecurityInfo);
         });
 
@@ -625,7 +619,7 @@
 
             return "<img src='css/images/clients/mbc.png' />";
         }
-        if (clientLowered == "media browser theater") {
+        if (clientLowered == "emby theater") {
 
             return "<img src='css/images/clients/mb.png' />";
         }
@@ -1288,7 +1282,7 @@ $(document).on('pagebeforeshow', "#dashboardPage", DashboardPage.onPageShow)
                     $('.tourButtonText', elem).html(Globalize.translate('ButtonTakeTheTourToSeeWhatsNew'));
 
                 } else {
-                    
+
                     $('.tourHeader', elem).html(Globalize.translate('HeaderWelcomeToProjectServerDashboard'));
                     $('.tourButtonText', elem).html(Globalize.translate('ButtonTakeTheTour'));
                 }
@@ -1338,4 +1332,26 @@ $(document).on('pagebeforeshow', "#dashboardPage", DashboardPage.onPageShow)
 
     });
 
-})(jQuery, document, window);
\ No newline at end of file
+})(jQuery, document, window);
+
+(function () {
+
+    $(document).on('pagebeforeshow', ".type-interior", function () {
+
+        var page = this;
+
+        Dashboard.getPluginSecurityInfo().done(function (pluginSecurityInfo) {
+
+            if (!$('.staticSupporterPromotion', page).length) {
+                $('.supporterPromotion', page).remove();
+
+                if (!pluginSecurityInfo.IsMBSupporter) {
+                    $('.content-primary', page).append('<div class="supporterPromotion"><a class="btn btnActionAccent" href="supporter.html" style="font-size:14px;"><div>' + Globalize.translate('HeaderSupportTheTeam') + '</div><div style="font-weight:normal;font-size:90%;margin-top:5px;">' + Globalize.translate('TextEnjoyBonusFeatures') + '</div></a></div>');
+                }
+            }
+
+        });
+
+    });
+
+})();
\ No newline at end of file
diff --git a/dashboard-ui/scripts/userparentalcontrol.js b/dashboard-ui/scripts/userparentalcontrol.js
index c1e54a3f6..c57f19e22 100644
--- a/dashboard-ui/scripts/userparentalcontrol.js
+++ b/dashboard-ui/scripts/userparentalcontrol.js
@@ -165,7 +165,7 @@
             itemHtml += '<li class="liSchedule" data-day="' + a.DayOfWeek + '" data-start="' + a.StartHour + '" data-end="' + a.EndHour + '">';
 
             itemHtml += '<a href="#">';
-            itemHtml += '<h3>' + a.DayOfWeek + '</h3>';
+            itemHtml += '<h3>' + Globalize.translate('Option' + a.DayOfWeek) + '</h3>';
             itemHtml += '<p>' + getDisplayTime(a.StartHour) + ' - ' + getDisplayTime(a.EndHour) + '</p>';
             itemHtml += '</a>';
 
diff --git a/dashboard-ui/syncactivity.html b/dashboard-ui/syncactivity.html
index 179fa9958..1b2f90b4b 100644
--- a/dashboard-ui/syncactivity.html
+++ b/dashboard-ui/syncactivity.html
@@ -20,7 +20,7 @@
                     <progress max="100" min="0" style="width:100px;display:none;" class="syncProgress"></progress>
                 </div>
                 <br />
-                <div class="supporterPromotion syncPromotion" style="display:none;">
+                <div class="staticSupporterPromotion supporterPromotion syncPromotion" style="display:none;">
                     <a class="btn btnActionAccent" href="supporter.html" style="font-size:14px;">
                         <div>
                             ${HeaderSyncRequiresSupporterMembership}
diff --git a/dashboard-ui/userprofiles.html b/dashboard-ui/userprofiles.html
index 120ccf701..f97e9f05a 100644
--- a/dashboard-ui/userprofiles.html
+++ b/dashboard-ui/userprofiles.html
@@ -55,7 +55,7 @@
                     <form class="addUserForm">
                         <div>
                             <label for="txtConnectUsername">${LabelConnectGuestUserName}</label>
-                            <input type="text" id="txtConnectUsername" value="" placeholder="Username" required="required">
+                            <input type="text" id="txtConnectUsername" value="" placeholder="${PlaceholderUsername}" required="required">
                             <div class="fieldDescription">
                                 <div>${LabelConnectGuestUserNameHelp}</div>
                                 <div style="margin-top: .75em;"><a href="http://emby.media/connect" target="_blank">${ButtonLearnMoreAboutEmbyConnect}</a></div>

From a25bc8c8a37d4e7518d027ac34c7a44c38f8ba9b Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Fri, 3 Apr 2015 12:31:56 -0400
Subject: [PATCH 32/33] add sports to suggested tv

---
 dashboard-ui/livetvsuggested.html       |  8 +++++++
 dashboard-ui/scripts/livetvitems.js     | 29 ++-----------------------
 dashboard-ui/scripts/livetvsuggested.js | 25 ++++++++++++++++++++-
 3 files changed, 34 insertions(+), 28 deletions(-)

diff --git a/dashboard-ui/livetvsuggested.html b/dashboard-ui/livetvsuggested.html
index 1275ef657..2374bee7a 100644
--- a/dashboard-ui/livetvsuggested.html
+++ b/dashboard-ui/livetvsuggested.html
@@ -33,6 +33,14 @@
                     </div>
                     <br />
                 </div>
+                <div id="upcomingSports">
+                    <h1 class="listHeader">${HeaderUpcomingSports}</h1>
+                    <div class="upcomingSportsItems itemsContainer"></div>
+                    <div>
+                        <a data-role="button" href="livetvitems.html?type=sports" data-inline="true" data-mini="true">${ButtonMoreItems}</a>
+                    </div>
+                    <br />
+                </div>
             </div>
         </div>
     </div>
diff --git a/dashboard-ui/scripts/livetvitems.js b/dashboard-ui/scripts/livetvitems.js
index 4dfbec203..6639d3735 100644
--- a/dashboard-ui/scripts/livetvitems.js
+++ b/dashboard-ui/scripts/livetvitems.js
@@ -8,7 +8,7 @@
     // The base query options
     var query = {
         UserId: Dashboard.getCurrentUserId(),
-        SortBy: "PremiereDate,SortName",
+        SortBy: "StartDate,SortName",
         SortOrder: "Ascending",
         StartIndex: 0
     };
@@ -19,19 +19,6 @@
 
     function updateFilterControls(page) {
 
-        // Reset form values using the last used query
-        $('.radioSortBy', page).each(function () {
-
-            this.checked = (query.SortBy || '').toLowerCase() == this.getAttribute('data-sortby').toLowerCase();
-
-        }).checkboxradio('refresh');
-
-        $('.radioSortOrder', page).each(function () {
-
-            this.checked = (query.SortOrder || '').toLowerCase() == this.getAttribute('data-sortorder').toLowerCase();
-
-        }).checkboxradio('refresh');
-
         $('#selectView', page).val(view).selectmenu('refresh');
         $('.alphabetPicker', page).alphaValue(query.NameStartsWithOrGreater);
         $('#selectPageSize', page).val(query.Limit).selectmenu('refresh');
@@ -58,7 +45,6 @@
             $('.listTopPaging', page).html(pagingHtml).trigger('create');
 
             updateFilterControls(page);
-            var trigger = false;
 
             if (view == "Poster") {
                 html = LibraryBrowser.getPosterViewHtml({
@@ -112,18 +98,6 @@
 
         var page = this;
 
-        $('.radioSortBy', this).on('click', function () {
-            query.StartIndex = 0;
-            query.SortBy = this.getAttribute('data-sortby');
-            reloadItems(page);
-        });
-
-        $('.radioSortOrder', this).on('click', function () {
-            query.StartIndex = 0;
-            query.SortOrder = this.getAttribute('data-sortorder');
-            reloadItems(page);
-        });
-
         $('#selectView', this).on('change', function () {
 
             view = this.value;
@@ -179,6 +153,7 @@
         }
 
         query.IsMovie = getParameterByName('type') == 'movies' ? true : null;
+        query.IsSports = getParameterByName('type') == 'sports' ? true : null;
 
         var viewkey = getSavedQueryKey();
 
diff --git a/dashboard-ui/scripts/livetvsuggested.js b/dashboard-ui/scripts/livetvsuggested.js
index 827b2f04a..bacf8dd0a 100644
--- a/dashboard-ui/scripts/livetvsuggested.js
+++ b/dashboard-ui/scripts/livetvsuggested.js
@@ -33,7 +33,8 @@
             IsAiring: false,
             HasAired: false,
             limit: 10,
-            IsMovie: false
+            IsMovie: false,
+            IsSports: false
 
         }).done(function (result) {
 
@@ -73,6 +74,28 @@
 
             $('.upcomingTvMovieItems', page).html(html).lazyChildren();
         });
+
+        ApiClient.getLiveTvRecommendedPrograms({
+
+            userId: Dashboard.getCurrentUserId(),
+            IsAiring: false,
+            HasAired: false,
+            limit: 10,
+            IsSports: true
+
+        }).done(function (result) {
+
+            var html = LibraryBrowser.getPosterViewHtml({
+                items: result.Items,
+                shape: "auto",
+                showTitle: true,
+                coverImage: true,
+                overlayText: false,
+                lazy: true
+            });
+
+            $('.upcomingSportsItems', page).html(html).lazyChildren();
+        });
     }
 
     $(document).on('pagebeforeshow', "#liveTvSuggestedPage", function () {

From bb0a406de8ca1554cce3343b54c53f9c94d54d83 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Fri, 3 Apr 2015 12:58:12 -0400
Subject: [PATCH 33/33] update images

---
 dashboard-ui/moviestudios.html | 2 +-
 dashboard-ui/tvstudios.html    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dashboard-ui/moviestudios.html b/dashboard-ui/moviestudios.html
index 4a768c41c..aa1a62f1b 100644
--- a/dashboard-ui/moviestudios.html
+++ b/dashboard-ui/moviestudios.html
@@ -21,7 +21,7 @@
                 <div class="listTopPaging">
                 </div>
             </div>
-            <div id="items" class="itemsContainer paddedItemsContainer"></div>
+            <div id="items" class="itemsContainer paddedItemsContainer" style="text-align:center;"></div>
         </div>
 
         <div data-role="panel" class="viewPanel" data-theme="a" data-position="right" data-display="overlay" data-position-fixed="true">
diff --git a/dashboard-ui/tvstudios.html b/dashboard-ui/tvstudios.html
index 54bb4b90e..87b2b765f 100644
--- a/dashboard-ui/tvstudios.html
+++ b/dashboard-ui/tvstudios.html
@@ -20,7 +20,7 @@
                 <div class="listTopPaging">
                 </div>
             </div>
-            <div id="items" class="itemsContainer paddedItemsContainer"></div>
+            <div id="items" class="itemsContainer paddedItemsContainer" style="text-align:center;"></div>
         </div>
 
         <div data-role="panel" class="viewPanel" data-theme="a" data-position="right" data-display="overlay" data-position-fixed="true">