diff options
Diffstat (limited to 'MediaBrowser.Controller')
| -rw-r--r-- | MediaBrowser.Controller/Entities/Book.cs | 4 | ||||
| -rw-r--r-- | MediaBrowser.Controller/Entities/IHasSoundtracks.cs | 12 | ||||
| -rw-r--r-- | MediaBrowser.Controller/Entities/Video.cs | 5 | ||||
| -rw-r--r-- | MediaBrowser.Controller/LiveTv/ILiveTvRecording.cs | 3 |
4 files changed, 17 insertions, 7 deletions
diff --git a/MediaBrowser.Controller/Entities/Book.cs b/MediaBrowser.Controller/Entities/Book.cs index 29d6e4084e..ea7ecfb4a0 100644 --- a/MediaBrowser.Controller/Entities/Book.cs +++ b/MediaBrowser.Controller/Entities/Book.cs @@ -1,7 +1,7 @@ -using System.Linq; -using MediaBrowser.Controller.Providers; +using MediaBrowser.Controller.Providers; using MediaBrowser.Model.Configuration; using System.Collections.Generic; +using System.Linq; namespace MediaBrowser.Controller.Entities { diff --git a/MediaBrowser.Controller/Entities/IHasSoundtracks.cs b/MediaBrowser.Controller/Entities/IHasSoundtracks.cs index 31defc9f47..3ac2491fbc 100644 --- a/MediaBrowser.Controller/Entities/IHasSoundtracks.cs +++ b/MediaBrowser.Controller/Entities/IHasSoundtracks.cs @@ -13,5 +13,17 @@ namespace MediaBrowser.Controller.Entities /// </summary> /// <value>The soundtrack ids.</value> List<Guid> SoundtrackIds { get; set; } + + /// <summary> + /// Gets the name. + /// </summary> + /// <value>The name.</value> + string Name { get; } + + /// <summary> + /// Gets the identifier. + /// </summary> + /// <value>The identifier.</value> + Guid Id { get; } } } diff --git a/MediaBrowser.Controller/Entities/Video.cs b/MediaBrowser.Controller/Entities/Video.cs index e16683d6d0..fa85f0edce 100644 --- a/MediaBrowser.Controller/Entities/Video.cs +++ b/MediaBrowser.Controller/Entities/Video.cs @@ -127,11 +127,6 @@ namespace MediaBrowser.Controller.Entities /// <returns>List{System.String}.</returns> public List<string> GetPlayableStreamFiles(string rootPath) { - if (PlayableStreamFileNames == null) - { - return null; - } - var allFiles = Directory.EnumerateFiles(rootPath, "*", SearchOption.AllDirectories).ToList(); return PlayableStreamFileNames.Select(name => allFiles.FirstOrDefault(f => string.Equals(System.IO.Path.GetFileName(f), name, StringComparison.OrdinalIgnoreCase))) diff --git a/MediaBrowser.Controller/LiveTv/ILiveTvRecording.cs b/MediaBrowser.Controller/LiveTv/ILiveTvRecording.cs index 668c3a414b..edf86cae8d 100644 --- a/MediaBrowser.Controller/LiveTv/ILiveTvRecording.cs +++ b/MediaBrowser.Controller/LiveTv/ILiveTvRecording.cs @@ -2,6 +2,7 @@ using MediaBrowser.Controller.Providers; using System.Threading; using System.Threading.Tasks; +using MediaBrowser.Model.Library; namespace MediaBrowser.Controller.LiveTv { @@ -20,5 +21,7 @@ namespace MediaBrowser.Controller.LiveTv bool IsParentalAllowed(User user); Task RefreshMetadata(MetadataRefreshOptions options, CancellationToken cancellationToken); + + PlayAccess GetPlayAccess(User user); } } |
