1 files changed, 18 insertions, 17 deletions
diff --git a/MediaBrowser.Api/Playback/Progressive/BaseProgressiveStreamingService.cs b/MediaBrowser.Api/Playback/Progressive/BaseProgressiveStreamingService.cs
index 4adf6fbca..809eabef8 100644
--- a/MediaBrowser.Api/Playback/Progressive/BaseProgressiveStreamingService.cs
+++ b/MediaBrowser.Api/Playback/Progressive/BaseProgressiveStreamingService.cs
@@ -121,32 +121,33 @@ namespace MediaBrowser.Api.Playback.Progressive
 
             var responseHeaders = new Dictionary<string, string>();
 
-            // Static remote stream
-            if (request.Static && state.InputProtocol == MediaProtocol.Http)
+            if (request.Static && state.DirectStreamProvider != null)
             {
                 AddDlnaHeaders(state, responseHeaders, true);
 
                 using (state)
                 {
-                    if (state.MediaPath.IndexOf("/livestreamfiles/", StringComparison.OrdinalIgnoreCase) != -1)
-                    {
-                        var parts = state.MediaPath.Split('/');
-                        var filename = parts[parts.Length - 2] + Path.GetExtension(parts[parts.Length - 1]);
-                        var filePath = Path.Combine(ServerConfigurationManager.ApplicationPaths.TranscodingTempPath, filename);
+                    var outputHeaders = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
 
-                        var outputHeaders = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
+                    // TODO: Don't hardcode this
+                    outputHeaders["Content-Type"] = MediaBrowser.Model.Net.MimeTypes.GetMimeType("file.ts");
 
-                        outputHeaders["Content-Type"] = MimeTypes.GetMimeType(filePath);
+                    var streamSource = new ProgressiveFileCopier(state.DirectStreamProvider, outputHeaders, null, Logger, CancellationToken.None)
+                    {
+                        AllowEndOfFile = false
+                    };
+                    return ResultFactory.GetAsyncStreamWriter(streamSource);
+                }
+            }
 
-                        var streamSource = new ProgressiveFileCopier(FileSystem, filePath, outputHeaders, null, Logger, CancellationToken.None)
-                        {
-                            AllowEndOfFile = false
-                        };
-                        return ResultFactory.GetAsyncStreamWriter(streamSource);
-                    }
+            // Static remote stream
+            if (request.Static && state.InputProtocol == MediaProtocol.Http)
+            {
+                AddDlnaHeaders(state, responseHeaders, true);
 
-                    return await GetStaticRemoteStreamResult(state, responseHeaders, isHeadRequest, cancellationTokenSource)
-                                .ConfigureAwait(false);
+                using (state)
+                {
+                    return await GetStaticRemoteStreamResult(state, responseHeaders, isHeadRequest, cancellationTokenSource).ConfigureAwait(false);
                 }
             }