diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-07-16 14:47:05 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-07-16 14:47:05 -0400 |
| commit | 2c22db8b8d42e42a0575e0c2d9366f47f9ee7a24 (patch) | |
| tree | 5160543394f69112738f78785c776c24a4071c90 /MediaBrowser.Providers | |
| parent | 27c644e6c8e215efe47e16bf49db0aec619409bc (diff) | |
Added an adult video entity
Diffstat (limited to 'MediaBrowser.Providers')
| -rw-r--r-- | MediaBrowser.Providers/MediaInfo/FFProbeVideoInfoProvider.cs | 2 | ||||
| -rw-r--r-- | MediaBrowser.Providers/Savers/MovieXmlSaver.cs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/MediaBrowser.Providers/MediaInfo/FFProbeVideoInfoProvider.cs b/MediaBrowser.Providers/MediaInfo/FFProbeVideoInfoProvider.cs index 8d0d2cb965..ee5df7dca3 100644 --- a/MediaBrowser.Providers/MediaInfo/FFProbeVideoInfoProvider.cs +++ b/MediaBrowser.Providers/MediaInfo/FFProbeVideoInfoProvider.cs @@ -353,7 +353,7 @@ namespace MediaBrowser.Providers.MediaInfo /// <param name="video">The video.</param> private void AddExternalSubtitles(Video video) { - var useParent = (video.VideoType == VideoType.VideoFile || video.VideoType == VideoType.Iso) && !(video is Movie) && !(video is MusicVideo); + var useParent = !video.ResolveArgs.IsDirectory; if (useParent && video.Parent == null) { diff --git a/MediaBrowser.Providers/Savers/MovieXmlSaver.cs b/MediaBrowser.Providers/Savers/MovieXmlSaver.cs index 66eeeed9e8..4dd756d54c 100644 --- a/MediaBrowser.Providers/Savers/MovieXmlSaver.cs +++ b/MediaBrowser.Providers/Savers/MovieXmlSaver.cs @@ -47,7 +47,7 @@ namespace MediaBrowser.Providers.Savers return !trailer.IsLocalTrailer; } - return item is Movie || item is MusicVideo; + return item is Movie || item is MusicVideo || item is AdultVideo; } return false; |