3 files changed, 7 insertions, 6 deletions
diff --git a/MediaBrowser.Api/ConfigurationService.cs b/MediaBrowser.Api/ConfigurationService.cs
index ce6ca015d..f6edea86e 100644
--- a/MediaBrowser.Api/ConfigurationService.cs
+++ b/MediaBrowser.Api/ConfigurationService.cs
@@ -124,7 +124,7 @@ namespace MediaBrowser.Api
 
         public void Post(AutoSetMetadataOptions request)
         {
-            _configurationManager.DisableMetadataService("Media Browser Xml");
+            _configurationManager.DisableMetadataService("Media Browser Legacy Xml");
             _configurationManager.SaveConfiguration();
         }
 
diff --git a/MediaBrowser.Api/Playback/BaseStreamingService.cs b/MediaBrowser.Api/Playback/BaseStreamingService.cs
index 9c8075bfb..c716ee150 100644
--- a/MediaBrowser.Api/Playback/BaseStreamingService.cs
+++ b/MediaBrowser.Api/Playback/BaseStreamingService.cs
@@ -995,7 +995,7 @@ namespace MediaBrowser.Api.Playback
 
                 if (state.ReadInputAtNativeFramerate)
                 {
-                    await Task.Delay(1000, cancellationTokenSource.Token).ConfigureAwait(false);
+                    await Task.Delay(1500, cancellationTokenSource.Token).ConfigureAwait(false);
                 }
             }
 
@@ -1619,8 +1619,6 @@ namespace MediaBrowser.Api.Playback
 
             AttachMediaStreamInfo(state, mediaStreams, videoRequest, url);
 
-            state.SegmentLength = 6;
-
             var container = Path.GetExtension(state.RequestedUrl);
 
             if (string.IsNullOrEmpty(container))
diff --git a/MediaBrowser.Api/Playback/StreamState.cs b/MediaBrowser.Api/Playback/StreamState.cs
index b6423ed2f..d26259a3a 100644
--- a/MediaBrowser.Api/Playback/StreamState.cs
+++ b/MediaBrowser.Api/Playback/StreamState.cs
@@ -63,11 +63,14 @@ namespace MediaBrowser.Api.Playback
 
         public string LiveTvStreamId { get; set; }
 
-        public int SegmentLength = 10;
+        public int SegmentLength = 6;
 
         public int HlsListSize
         {
-            get { return ReadInputAtNativeFramerate ? 100 : 1440; }
+            get
+            {
+                return ReadInputAtNativeFramerate ? 1000 : 0;
+            }
         }
 
         public long? RunTimeTicks;