diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2015-03-31 15:33:38 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2015-03-31 15:33:38 -0400 |
| commit | 0bcc43098ea5d58b7ae346e9f9599547d64259c2 (patch) | |
| tree | d222c617e727ec87e77ef1517c810969f13e91d7 /MediaBrowser.Model | |
| parent | 2632093ebbc95f8963b8d3adbd973dda61854496 (diff) | |
fix handling of bare nfo's
Diffstat (limited to 'MediaBrowser.Model')
| -rw-r--r-- | MediaBrowser.Model/Dlna/StreamBuilder.cs | 6 | ||||
| -rw-r--r-- | MediaBrowser.Model/Dto/MediaSourceInfo.cs | 7 |
2 files changed, 11 insertions, 2 deletions
diff --git a/MediaBrowser.Model/Dlna/StreamBuilder.cs b/MediaBrowser.Model/Dlna/StreamBuilder.cs index b27138b4a..bc9f07d04 100644 --- a/MediaBrowser.Model/Dlna/StreamBuilder.cs +++ b/MediaBrowser.Model/Dlna/StreamBuilder.cs @@ -341,7 +341,11 @@ namespace MediaBrowser.Model.Dlna MediaStream subtitleStream = playlistItem.SubtitleStreamIndex.HasValue ? item.GetMediaStream(MediaStreamType.Subtitle, playlistItem.SubtitleStreamIndex.Value) : null; MediaStream audioStream = item.GetDefaultAudioStream(options.AudioStreamIndex ?? item.DefaultAudioStreamIndex); - int? audioStreamIndex = audioStream == null ? (int?)null : audioStream.Index; + int? audioStreamIndex = null; + if (audioStream != null) + { + audioStreamIndex = audioStream.Index; + } MediaStream videoStream = item.VideoStream; diff --git a/MediaBrowser.Model/Dto/MediaSourceInfo.cs b/MediaBrowser.Model/Dto/MediaSourceInfo.cs index 302d18bc0..8897edcbd 100644 --- a/MediaBrowser.Model/Dto/MediaSourceInfo.cs +++ b/MediaBrowser.Model/Dto/MediaSourceInfo.cs @@ -150,7 +150,12 @@ namespace MediaBrowser.Model.Dto } } - return numStreams == 0 ? (int?)null : numMatches; + if (numStreams == 0) + { + return null; + } + + return numMatches; } public bool? IsSecondaryAudio(MediaStream stream) |
