diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2014-09-04 23:48:53 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2014-09-04 23:48:53 -0400 |
| commit | 91ffff7771cb4ae9f89dbc2cb7a5cec70a3301c2 (patch) | |
| tree | 4c14c426a7de3469d281ad22110959958c9412a9 /MediaBrowser.Api/Playback | |
| parent | dd2798a3d6a03c73067e93b398108d4e8678e8f5 (diff) | |
added dlna music folders
Diffstat (limited to 'MediaBrowser.Api/Playback')
| -rw-r--r-- | MediaBrowser.Api/Playback/BaseStreamingService.cs | 2 | ||||
| -rw-r--r-- | MediaBrowser.Api/Playback/Hls/VideoHlsService.cs | 8 |
2 files changed, 1 insertions, 9 deletions
diff --git a/MediaBrowser.Api/Playback/BaseStreamingService.cs b/MediaBrowser.Api/Playback/BaseStreamingService.cs index 5cae6b0104..e20c4c1157 100644 --- a/MediaBrowser.Api/Playback/BaseStreamingService.cs +++ b/MediaBrowser.Api/Playback/BaseStreamingService.cs @@ -788,7 +788,7 @@ namespace MediaBrowser.Api.Playback /// <returns>System.String.</returns> protected string GetInputArgument(string transcodingJobId, StreamState state) { - if (state.InputProtocol == MediaProtocol.File && + if (SupportsThrottling && state.InputProtocol == MediaProtocol.File && state.RunTimeTicks.HasValue && state.VideoType == VideoType.VideoFile && !string.Equals(state.OutputVideoCodec, "copy", StringComparison.OrdinalIgnoreCase)) diff --git a/MediaBrowser.Api/Playback/Hls/VideoHlsService.cs b/MediaBrowser.Api/Playback/Hls/VideoHlsService.cs index 3581b9e172..9f85f64e1a 100644 --- a/MediaBrowser.Api/Playback/Hls/VideoHlsService.cs +++ b/MediaBrowser.Api/Playback/Hls/VideoHlsService.cs @@ -62,14 +62,6 @@ namespace MediaBrowser.Api.Playback.Hls { } - protected override bool SupportsThrottling - { - get - { - return false; - } - } - /// <summary> /// Gets the specified request. /// </summary> |