always supply SeriesTimerId

2 files changed, 10 insertions, 5 deletions

diff --git a/MediaBrowser.Api/Playback/Hls/BaseHlsService.cs b/MediaBrowser.Api/Playback/Hls/BaseHlsService.cs
index 1e056f670a..761b1eb4ec 100644
--- a/MediaBrowser.Api/Playback/Hls/BaseHlsService.cs
+++ b/MediaBrowser.Api/Playback/Hls/BaseHlsService.cs
@@ -150,9 +150,10 @@ namespace MediaBrowser.Api.Playback.Hls
                 {
                     var text = reader.ReadToEnd();
 
+                    text = text.Replace("#EXTM3U", "#EXTM3U\n#EXT-X-PLAYLIST-TYPE:EVENT");
+
                     var newDuration = "#EXT-X-TARGETDURATION:" + segmentLength.ToString(UsCulture);
 
-                    // ffmpeg pads the reported length by a full second
                     text = text.Replace("#EXT-X-TARGETDURATION:" + (segmentLength + 1).ToString(UsCulture), newDuration, StringComparison.OrdinalIgnoreCase);
 
                     return text;
diff --git a/MediaBrowser.Api/Playback/StreamState.cs b/MediaBrowser.Api/Playback/StreamState.cs
index d6ccdd1fda..109aa85de4 100644
--- a/MediaBrowser.Api/Playback/StreamState.cs
+++ b/MediaBrowser.Api/Playback/StreamState.cs
@@ -73,6 +73,10 @@ namespace MediaBrowser.Api.Playback
         {
             get
             {
+                if (!RunTimeTicks.HasValue)
+                {
+                    return 6;
+                }
                 if (string.Equals(OutputVideoCodec, "copy", StringComparison.OrdinalIgnoreCase))
                 {
                     var userAgent = UserAgent ?? string.Empty;
@@ -88,13 +92,13 @@ namespace MediaBrowser.Api.Playback
                         return 10;
                     }
 
-                    if (!RunTimeTicks.HasValue)
-                    {
-                        return 10;
-                    }
                     return 6;
                 }
 
+                if (!RunTimeTicks.HasValue)
+                {
+                    return 6;
+                }
                 return 3;
             }
         }