diff --git a/dashboard-ui/bower_components/emby-webcomponents/browserdeviceprofile.js b/dashboard-ui/bower_components/emby-webcomponents/browserdeviceprofile.js index 8eee7ee7c..a5f352b49 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/browserdeviceprofile.js +++ b/dashboard-ui/bower_components/emby-webcomponents/browserdeviceprofile.js @@ -198,7 +198,8 @@ define(['browser'], function (browser) { Type: 'Video', AudioCodec: videoAudioCodecs.join(','), VideoCodec: 'h264', - Context: 'Streaming' + Context: 'Streaming', + CopyTimestamps: true }); } diff --git a/dashboard-ui/css/site.css b/dashboard-ui/css/site.css index 07c82b600..e68782fe9 100644 --- a/dashboard-ui/css/site.css +++ b/dashboard-ui/css/site.css @@ -43,7 +43,7 @@ html .ui-panel-page-container-a { html .ui-bar-a a, html .ui-body-a a, html body .ui-group-theme-a a { - color: #3388cc /*{a-link-color}*/; + color: #388E3C /*{a-link-color}*/; font-weight: bold; } @@ -51,21 +51,21 @@ html body .ui-group-theme-a a { html .ui-bar-a a:visited, html .ui-body-a a:visited, html body .ui-group-theme-a a:visited { - color: #3388cc /*{a-link-visited}*/; + color: #388E3C /*{a-link-visited}*/; } .ui-page-theme-a a:hover, html .ui-bar-a a:hover, html .ui-body-a a:hover, html body .ui-group-theme-a a:hover { - color: #005599 /*{a-link-hover}*/; + color: #1B5E20 /*{a-link-hover}*/; } .ui-page-theme-a a:active, html .ui-bar-a a:active, html .ui-body-a a:active, html body .ui-group-theme-a a:active { - color: #005599 /*{a-link-active}*/; + color: #1B5E20 /*{a-link-active}*/; } /* Button up */ @@ -171,20 +171,20 @@ html .ui-panel-page-container-b { /* Links */ .ui-body-b a { - color: #22aadd /*{b-link-color}*/; + color: #52B54B /*{b-link-color}*/; font-weight: bold; } .ui-body-b a:visited { - color: #22aadd /*{b-link-visited}*/; + color: #52B54B /*{b-link-visited}*/; } .ui-body-b a:hover { - color: #0088bb /*{b-link-hover}*/; + color: #2E7D32 /*{b-link-hover}*/; } .ui-body-b a:active { - color: #0088bb /*{b-link-active}*/; + color: #2E7D32 /*{b-link-active}*/; } /* Button up */ diff --git a/dashboard-ui/scripts/htmlmediarenderer.js b/dashboard-ui/scripts/htmlmediarenderer.js index eb4118ac6..d4e448616 100644 --- a/dashboard-ui/scripts/htmlmediarenderer.js +++ b/dashboard-ui/scripts/htmlmediarenderer.js @@ -522,10 +522,11 @@ // Safari uses integers for the mode property // http://www.jwplayer.com/html5/scripting/ + // edit: not anymore var useNumericMode = false; if (!isNaN(allTracks[i].mode)) { - useNumericMode = true; + //useNumericMode = true; } if (useNumericMode) { diff --git a/dashboard-ui/scripts/mediaplayer.js b/dashboard-ui/scripts/mediaplayer.js index 05902d0e1..7efcc719b 100644 --- a/dashboard-ui/scripts/mediaplayer.js +++ b/dashboard-ui/scripts/mediaplayer.js @@ -705,7 +705,10 @@ if (mediaUrl.indexOf('.mkv') == -1) { mediaUrl += '&EnableAutoStreamCopy=false'; } - startTimeTicksOffset = startPosition || 0; + + if (mediaUrl.toLowerCase().indexOf('copytimestamps=true') == -1) { + startTimeTicksOffset = startPosition || 0; + } contentType = 'video/' + mediaSource.TranscodingContainer; }