From c8c84652b9559b5c5d1cdf2bc2b1f7a794fbe10e Mon Sep 17 00:00:00 2001 From: Techywarrior Date: Wed, 17 Apr 2013 18:51:31 -0700 Subject: [PATCH 1/2] hide queue button if nothing playing, poster links to item details --- dashboard-ui/playlist.html | 2 +- dashboard-ui/scripts/Itemdetailpage.js | 5 ++++- dashboard-ui/scripts/mediaplayer.js | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dashboard-ui/playlist.html b/dashboard-ui/playlist.html index 42a3cce4ab..0779d94fe1 100644 --- a/dashboard-ui/playlist.html +++ b/dashboard-ui/playlist.html @@ -6,7 +6,7 @@

- Playlist

+ Now Playing
diff --git a/dashboard-ui/scripts/Itemdetailpage.js b/dashboard-ui/scripts/Itemdetailpage.js index 094c7c7ff7..3fb91253e3 100644 --- a/dashboard-ui/scripts/Itemdetailpage.js +++ b/dashboard-ui/scripts/Itemdetailpage.js @@ -38,7 +38,10 @@ if (MediaPlayer.canPlay(item)) { $('#btnPlayMenu', page).show(); $('#playButtonShadow', page).show(); - $('#btnQueueMenu', page).show(); + if (MediaPlayer.isPlaying()) + $('#btnQueueMenu', page).show(); + else + $('#btnQueueMenu', page).hide(); } else { $('#btnPlayMenu', page).hide(); $('#playButtonShadow', page).hide(); diff --git a/dashboard-ui/scripts/mediaplayer.js b/dashboard-ui/scripts/mediaplayer.js index bd0e76c4cf..b8028dc89b 100644 --- a/dashboard-ui/scripts/mediaplayer.js +++ b/dashboard-ui/scripts/mediaplayer.js @@ -307,7 +307,7 @@ seriesName = item.SeriesName || item.Album || item.ProductionYear; } - html += "
"; + html += "
"; if (item.Type == "Movie") html += '
' + name + '
' + seriesName + '
'; else From 31317a0954347a052d21f634e0a3215cf3b77599 Mon Sep 17 00:00:00 2001 From: Techywarrior Date: Wed, 17 Apr 2013 20:03:34 -0700 Subject: [PATCH 2/2] added mkv stream for chrome --- dashboard-ui/scripts/mediaplayer.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dashboard-ui/scripts/mediaplayer.js b/dashboard-ui/scripts/mediaplayer.js index b8028dc89b..749ee0b44f 100644 --- a/dashboard-ui/scripts/mediaplayer.js +++ b/dashboard-ui/scripts/mediaplayer.js @@ -150,8 +150,14 @@ audioCodec: 'Vorbis' })); + var mkvVideoUrl = ApiClient.getUrl('Videos/' + item.Id + '/stream.mkv', $.extend({}, baseParams, { + videoCodec: 'h264', + audioCodec: 'aac' + })); + (this).src([ { type: "application/x-mpegURL", src: hlsVideoUrl }, + { type: "video/x-matroska", src: mkvVideoUrl }, { type: "video/webm", src: webmVideoUrl }, { type: "video/mp4", src: mp4VideoUrl }, { type: "video/mp2t; codecs='h264, aac'", src: tsVideoUrl },