diff options
| author | LukePulverenti <luke.pulverenti@gmail.com> | 2013-03-10 23:44:22 -0400 |
|---|---|---|
| committer | LukePulverenti <luke.pulverenti@gmail.com> | 2013-03-10 23:44:22 -0400 |
| commit | de755c4b9363134d7df144387e6394578a0db12b (patch) | |
| tree | 1d1bdcbda4e0272a80e5f9aa4f6eb31575628a7c | |
| parent | a96ec4f169f82d40595fbb0d8f40ccc90c1074e9 (diff) | |
fixed audio in hls
| -rw-r--r-- | MediaBrowser.Api/Playback/BaseStreamingService.cs | 6 | ||||
| -rw-r--r-- | MediaBrowser.Api/Playback/Hls/VideoHlsService.cs | 1 |
2 files changed, 2 insertions, 5 deletions
diff --git a/MediaBrowser.Api/Playback/BaseStreamingService.cs b/MediaBrowser.Api/Playback/BaseStreamingService.cs index f22a9e09b4..66b1a3353f 100644 --- a/MediaBrowser.Api/Playback/BaseStreamingService.cs +++ b/MediaBrowser.Api/Playback/BaseStreamingService.cs @@ -650,10 +650,8 @@ namespace MediaBrowser.Api.Playback state.VideoStream = GetMediaStream(media.MediaStreams, videoRequest.VideoStreamIndex, MediaStreamType.Video, true); state.SubtitleStream = GetMediaStream(media.MediaStreams, videoRequest.SubtitleStreamIndex, MediaStreamType.Subtitle, false); } - else - { - state.AudioStream = GetMediaStream(media.MediaStreams, null, MediaStreamType.Audio, true); - } + + state.AudioStream = GetMediaStream(media.MediaStreams, null, MediaStreamType.Audio, true); return state; } diff --git a/MediaBrowser.Api/Playback/Hls/VideoHlsService.cs b/MediaBrowser.Api/Playback/Hls/VideoHlsService.cs index 59ac741297..578eb93ac0 100644 --- a/MediaBrowser.Api/Playback/Hls/VideoHlsService.cs +++ b/MediaBrowser.Api/Playback/Hls/VideoHlsService.cs @@ -35,7 +35,6 @@ namespace MediaBrowser.Api.Playback.Hls var file = SegmentFilePrefix + request.SegmentId + Path.GetExtension(Request.PathInfo); file = Path.Combine(ApplicationPaths.EncodedMediaCachePath, file); - Logger.Info(file); return ToStaticFileResult(file); } |