diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-09-30 14:49:19 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-09-30 14:49:19 -0400 |
| commit | e5d026c4835408e9413daff3eadc208b1417d099 (patch) | |
| tree | ef6ec5a898be190b53b8f9451c53eda0c6371bc7 | |
| parent | 2aea48022513a2a9e41cde1271533b322b3e6146 (diff) | |
fixes #528 - Support podcasts in web client
| -rw-r--r-- | MediaBrowser.Api/Playback/BaseStreamingService.cs | 11 | ||||
| -rw-r--r-- | MediaBrowser.Api/Playback/Progressive/AudioService.cs | 4 |
2 files changed, 8 insertions, 7 deletions
diff --git a/MediaBrowser.Api/Playback/BaseStreamingService.cs b/MediaBrowser.Api/Playback/BaseStreamingService.cs index b002d556b..79a5a2846 100644 --- a/MediaBrowser.Api/Playback/BaseStreamingService.cs +++ b/MediaBrowser.Api/Playback/BaseStreamingService.cs @@ -470,12 +470,15 @@ namespace MediaBrowser.Api.Playback /// <returns>System.Nullable{System.Int32}.</returns> protected int? GetNumAudioChannelsParam(StreamRequest request, MediaStream audioStream) { - if (audioStream.Channels > 2 && request.AudioCodec.HasValue) + if (audioStream != null) { - if (request.AudioCodec.Value == AudioCodecs.Wma) + if (audioStream.Channels > 2 && request.AudioCodec.HasValue) { - // wmav2 currently only supports two channel output - return 2; + if (request.AudioCodec.Value == AudioCodecs.Wma) + { + // wmav2 currently only supports two channel output + return 2; + } } } diff --git a/MediaBrowser.Api/Playback/Progressive/AudioService.cs b/MediaBrowser.Api/Playback/Progressive/AudioService.cs index 915ec0c10..416505575 100644 --- a/MediaBrowser.Api/Playback/Progressive/AudioService.cs +++ b/MediaBrowser.Api/Playback/Progressive/AudioService.cs @@ -6,9 +6,7 @@ using MediaBrowser.Controller.Library; using MediaBrowser.Controller.Persistence; using MediaBrowser.Model.IO; using ServiceStack.ServiceHost; -using System; using System.Collections.Generic; -using System.IO; namespace MediaBrowser.Api.Playback.Progressive { @@ -94,7 +92,7 @@ namespace MediaBrowser.Api.Playback.Progressive { audioTranscodeParams.Add("-ac " + channels.Value); } - + if (request.AudioSampleRate.HasValue) { audioTranscodeParams.Add("-ar " + request.AudioSampleRate.Value); |