From ad2a1b493d5a1efd49d528be33124edb535e06f8 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Thu, 19 Mar 2015 12:16:33 -0400
Subject: [PATCH] use stream id's to close streams

---
 dashboard-ui/scripts/librarybrowser.js    | 13 +++++++++++++
 dashboard-ui/scripts/livetvitems.js       |  9 +++++----
 dashboard-ui/scripts/mediaplayer-video.js |  6 +++---
 dashboard-ui/scripts/mediaplayer.js       |  4 ++--
 4 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/dashboard-ui/scripts/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js
index 1a0da80c32..b149d3b12d 100644
--- a/dashboard-ui/scripts/librarybrowser.js
+++ b/dashboard-ui/scripts/librarybrowser.js
@@ -1456,6 +1456,19 @@
 
             }
 
+            if (options.showProgramAirInfo) {
+
+                var date = parseISO8601Date(item.StartDate, { toLocal: true });
+
+                var text = item.StartDate ?
+                    date.toLocaleString() :
+                    '';
+
+                lines.push(text || '&nbsp;');
+
+                lines.push(item.ChannelName || '&nbsp;');
+            }
+
             html += LibraryBrowser.getCardTextLines(lines, cssClass, !options.overlayText);
 
             if (options.overlayText) {
diff --git a/dashboard-ui/scripts/livetvitems.js b/dashboard-ui/scripts/livetvitems.js
index 62b09c8f48..e9632048fa 100644
--- a/dashboard-ui/scripts/livetvitems.js
+++ b/dashboard-ui/scripts/livetvitems.js
@@ -1,6 +1,6 @@
 (function ($, document) {
 
-    var view = LibraryBrowser.getDefaultItemsView('Poster', 'Poster');
+    var view = LibraryBrowser.getDefaultItemsView('PosterCard', 'PosterCard');
 
     var currentDate = new Date();
     currentDate.setHours(0, 0, 0, 0);
@@ -69,7 +69,8 @@
                     showTitle: false,
                     centerText: true,
                     lazy: true,
-                    overlayText: false
+                    overlayText: false,
+                    showProgramAirInfo: true
                 });
             }
             else if (view == "PosterCard") {
@@ -78,9 +79,9 @@
                     shape: "portrait",
                     context: 'livetv',
                     showTitle: true,
-                    showYear: true,
                     lazy: true,
-                    cardLayout: true
+                    cardLayout: true,
+                    showProgramAirInfo: true
                 });
             }
 
diff --git a/dashboard-ui/scripts/mediaplayer-video.js b/dashboard-ui/scripts/mediaplayer-video.js
index f99496189d..0ec3bdf45e 100644
--- a/dashboard-ui/scripts/mediaplayer-video.js
+++ b/dashboard-ui/scripts/mediaplayer-video.js
@@ -1075,7 +1075,7 @@
             if (isStatic) {
                 mp4VideoUrl += seekParam;
             } else {
-                mp4VideoUrl += "&ClientTime=" + new Date().getTime();
+                mp4VideoUrl += "&StreamId=" + new Date().getTime();
             }
 
             var webmVideoUrl = ApiClient.getUrl('Videos/' + item.Id + '/stream.webm', $.extend({}, baseParams, {
@@ -1085,7 +1085,7 @@
                 videoBitrate: webmQuality.videoBitrate,
                 audioBitrate: webmQuality.audioBitrate,
                 EnableAutoStreamCopy: false,
-                ClientTime: new Date().getTime()
+                StreamId: new Date().getTime()
             }));
 
             var hlsVideoUrl = ApiClient.getUrl('Videos/' + item.Id + '/master.m3u8', $.extend({}, baseParams, {
@@ -1097,7 +1097,7 @@
                 profile: 'high',
                 level: '41',
                 StartTimeTicks: 0,
-                ClientTime: new Date().getTime()
+                StreamId: new Date().getTime()
 
             })) + seekParam;
 
diff --git a/dashboard-ui/scripts/mediaplayer.js b/dashboard-ui/scripts/mediaplayer.js
index fcc2d165f8..5caa88ef34 100644
--- a/dashboard-ui/scripts/mediaplayer.js
+++ b/dashboard-ui/scripts/mediaplayer.js
@@ -174,7 +174,7 @@
                         currentSrc = currentSrc.replace('.webm', '.mp4').replace('.m3u8', '.mp4');
                     } 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, 'StreamId', new Date().getTime());
                     }
 
                     currentSrc = replaceQueryString(currentSrc, 'AudioBitrate', finalParams.audioBitrate);
@@ -1422,7 +1422,7 @@
                 var seekParam = startPositionTicks ? '#t=' + (startPositionTicks / 10000000) : '';
                 audioUrl += "&static=true" + seekParam;
             } else {
-                audioUrl += "&ClientTime=" + new Date().getTime();
+                audioUrl += "&StreamId=" + new Date().getTime();
             }
 
             self.startTimeTicksOffset = isStatic ? 0 : startPositionTicks;