From 1662f5e539adee25c293df5a8d063efcec3bbb06 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Tue, 27 Oct 2015 11:53:50 -0400 Subject: [PATCH 1/2] fix notifications markup --- dashboard-ui/scripts/notifications.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dashboard-ui/scripts/notifications.js b/dashboard-ui/scripts/notifications.js index 96dae57942..30c761629a 100644 --- a/dashboard-ui/scripts/notifications.js +++ b/dashboard-ui/scripts/notifications.js @@ -132,7 +132,7 @@ if (notification.Level == "Error") { itemHtml += ''; } else { - itemHtml += ''; + itemHtml += ''; } itemHtml += ''; From dd83646325839e4cb895695fb672bdba6a4ed513 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Tue, 27 Oct 2015 13:23:56 -0400 Subject: [PATCH 2/2] fix web client stream copy --- dashboard-ui/scripts/mediaplayer.js | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dashboard-ui/scripts/mediaplayer.js b/dashboard-ui/scripts/mediaplayer.js index 64ea3dd813..83aa6b9f1e 100644 --- a/dashboard-ui/scripts/mediaplayer.js +++ b/dashboard-ui/scripts/mediaplayer.js @@ -950,16 +950,15 @@ if (mediaSource.TranscodingSubProtocol == 'hls') { - // Reports of stuttering with h264 stream copy in IE - mediaUrl += '&EnableAutoStreamCopy=false'; + if (mediaSource.RunTimeTicks) { + // Reports of stuttering with h264 stream copy in IE + mediaUrl += '&EnableAutoStreamCopy=false'; + } mediaUrl += seekParam; contentType = 'application/x-mpegURL'; } else { - // Reports of stuttering with h264 stream copy in IE - mediaUrl += '&EnableAutoStreamCopy=false'; - startTimeTicksOffset = startPosition || 0; contentType = 'video/' + mediaSource.TranscodingContainer; }