diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2014-12-24 01:28:40 -0500 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2014-12-24 01:28:40 -0500 |
| commit | 36577ac42ea9a38a155ca7cd0d17d2d43563a27f (patch) | |
| tree | 5acb9adb80f588c8e675b82681548e09e33d4bab /MediaBrowser.Model | |
| parent | 381aa7adc529c4c18735667fc91e9091b5fd5bcd (diff) | |
sync updates
Diffstat (limited to 'MediaBrowser.Model')
| -rw-r--r-- | MediaBrowser.Model/Dlna/StreamInfo.cs | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/MediaBrowser.Model/Dlna/StreamInfo.cs b/MediaBrowser.Model/Dlna/StreamInfo.cs index 7ca8ab6b06..703c735666 100644 --- a/MediaBrowser.Model/Dlna/StreamInfo.cs +++ b/MediaBrowser.Model/Dlna/StreamInfo.cs @@ -374,9 +374,17 @@ namespace MediaBrowser.Model.Dlna MediaStream stream = TargetAudioStream; int? streamChannels = stream == null ? null : stream.Channels; - return MaxAudioChannels.HasValue && !IsDirectStream - ? (streamChannels.HasValue ? Math.Min(MaxAudioChannels.Value, streamChannels.Value) : MaxAudioChannels.Value) - : streamChannels; + if (MaxAudioChannels.HasValue && !IsDirectStream) + { + if (streamChannels.HasValue) + { + return Math.Min(MaxAudioChannels.Value, streamChannels.Value); + } + + return MaxAudioChannels.Value; + } + + return streamChannels; } } |
