aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Controller
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2014-02-23 00:52:30 -0500
committerLuke Pulverenti <luke.pulverenti@gmail.com>2014-02-23 00:52:30 -0500
commit2d27b10d11552d160cb2b3c41c5e0e5bf60e7350 (patch)
treece3fefde2e9da005549491419eab2daa4ef2fd95 /MediaBrowser.Controller
parent2d0ce724ea09bf51cb12b6b04ea63dfaf74b0ad2 (diff)
added chromecast boilerplate
Diffstat (limited to 'MediaBrowser.Controller')
-rw-r--r--MediaBrowser.Controller/Entities/Book.cs4
-rw-r--r--MediaBrowser.Controller/Entities/IHasSoundtracks.cs12
-rw-r--r--MediaBrowser.Controller/Entities/Video.cs5
-rw-r--r--MediaBrowser.Controller/LiveTv/ILiveTvRecording.cs3
4 files changed, 17 insertions, 7 deletions
diff --git a/MediaBrowser.Controller/Entities/Book.cs b/MediaBrowser.Controller/Entities/Book.cs
index 29d6e4084..ea7ecfb4a 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 31defc9f4..3ac2491fb 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 e16683d6d..fa85f0edc 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 668c3a414..edf86cae8 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);
}
}