From f3c5b5b83617404adac7051ab549f618cdfd4e21 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Sat, 11 May 2013 12:45:20 -0400 Subject: [PATCH] updated ffmpeg --- MediaBrowser.Api/SessionsService.cs | 18 +++++++++++++++++- .../MediaBrowser.Server.Implementations.csproj | 2 +- .../ffmpeg20130428.zip.REMOVED.git-id | 1 - .../ffmpeg20130509.zip.REMOVED.git-id | 1 + 4 files changed, 19 insertions(+), 3 deletions(-) delete mode 100644 MediaBrowser.Server.Implementations/MediaEncoder/ffmpeg20130428.zip.REMOVED.git-id create mode 100644 MediaBrowser.Server.Implementations/MediaEncoder/ffmpeg20130509.zip.REMOVED.git-id diff --git a/MediaBrowser.Api/SessionsService.cs b/MediaBrowser.Api/SessionsService.cs index eae5d6d6a..03b90fc99 100644 --- a/MediaBrowser.Api/SessionsService.cs +++ b/MediaBrowser.Api/SessionsService.cs @@ -18,14 +18,25 @@ namespace MediaBrowser.Api [Api(("Gets a list of sessions"))] public class GetSessions : IReturn> { + /// + /// Gets or sets a value indicating whether [supports remote control]. + /// + /// null if [supports remote control] contains no value, true if [supports remote control]; otherwise, false. [ApiMember(Name = "SupportsRemoteControl", Description = "Optional. Filter by sessions that can be remote controlled.", IsRequired = false, DataType = "boolean", ParameterType = "query", Verb = "GET")] public bool? SupportsRemoteControl { get; set; } } + /// + /// Class BrowseTo + /// [Route("/Sessions/{Id}/Viewing", "POST")] [Api(("Instructs a session to browse to an item or view"))] public class BrowseTo : IReturnVoid { + /// + /// Gets or sets the id. + /// + /// The id. [ApiMember(Name = "Id", Description = "Session Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "POST")] public Guid Id { get; set; } @@ -64,7 +75,7 @@ namespace MediaBrowser.Api private readonly ISessionManager _sessionManager; /// - /// Initializes a new instance of the class. + /// Initializes a new instance of the class. /// /// The session manager. public SessionsService(ISessionManager sessionManager) @@ -89,6 +100,11 @@ namespace MediaBrowser.Api return ToOptimizedResult(result.Select(SessionInfoDtoBuilder.GetSessionInfoDto).ToList()); } + /// + /// Posts the specified request. + /// + /// The request. + /// public void Post(BrowseTo request) { var session = _sessionManager.Sessions.FirstOrDefault(i => i.Id == request.Id); diff --git a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj index 3474f2e05..55a6ff9c8 100644 --- a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj +++ b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj @@ -272,7 +272,7 @@ - + diff --git a/MediaBrowser.Server.Implementations/MediaEncoder/ffmpeg20130428.zip.REMOVED.git-id b/MediaBrowser.Server.Implementations/MediaEncoder/ffmpeg20130428.zip.REMOVED.git-id deleted file mode 100644 index d3e057697..000000000 --- a/MediaBrowser.Server.Implementations/MediaEncoder/ffmpeg20130428.zip.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -5994f82dccf0f39c69d830845c59564dcf6e6801 \ No newline at end of file diff --git a/MediaBrowser.Server.Implementations/MediaEncoder/ffmpeg20130509.zip.REMOVED.git-id b/MediaBrowser.Server.Implementations/MediaEncoder/ffmpeg20130509.zip.REMOVED.git-id new file mode 100644 index 000000000..d05d7c224 --- /dev/null +++ b/MediaBrowser.Server.Implementations/MediaEncoder/ffmpeg20130509.zip.REMOVED.git-id @@ -0,0 +1 @@ +2ecea48340becd42b1a3136c8ae551c96a2de324 \ No newline at end of file