From a938d0854d08e18a8e21fc8ab8b481e26c6f3479 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Thu, 8 May 2014 21:49:12 -0400 Subject: [PATCH] updated nuget --- MediaBrowser.Model/ApiClient/IApiClient.cs | 8 ++++---- MediaBrowser.Model/ApiClient/IServerEvents.cs | 8 ++------ .../EntryPoints/ServerEventNotifier.cs | 16 ++++++---------- .../MediaBrowser.WebDashboard.csproj | 3 --- Nuget/MediaBrowser.Common.Internal.nuspec | 6 +++--- Nuget/MediaBrowser.Common.nuspec | 2 +- Nuget/MediaBrowser.Server.Core.nuspec | 4 ++-- 7 files changed, 18 insertions(+), 29 deletions(-) diff --git a/MediaBrowser.Model/ApiClient/IApiClient.cs b/MediaBrowser.Model/ApiClient/IApiClient.cs index bfc631c793..f4620acf7b 100644 --- a/MediaBrowser.Model/ApiClient/IApiClient.cs +++ b/MediaBrowser.Model/ApiClient/IApiClient.cs @@ -601,17 +601,17 @@ namespace MediaBrowser.Model.ApiClient /// Sets the index of the audio stream. /// /// The session identifier. - /// The volume. + /// The index. /// Task. - Task SetAudioStreamIndex(string sessionId, int? volume); + Task SetAudioStreamIndex(string sessionId, int index); /// /// Sets the index of the subtitle stream. /// /// The session identifier. - /// The volume. + /// The index. /// Task. - Task SetSubtitleStreamIndex(string sessionId, int? volume); + Task SetSubtitleStreamIndex(string sessionId, int? index); /// /// Instructs the client to display a message to the user diff --git a/MediaBrowser.Model/ApiClient/IServerEvents.cs b/MediaBrowser.Model/ApiClient/IServerEvents.cs index 8e46f3d9f0..62d8fdff3d 100644 --- a/MediaBrowser.Model/ApiClient/IServerEvents.cs +++ b/MediaBrowser.Model/ApiClient/IServerEvents.cs @@ -19,10 +19,6 @@ namespace MediaBrowser.Model.ApiClient /// event EventHandler> UserDeleted; /// - /// Occurs when [scheduled task started]. - /// - event EventHandler> ScheduledTaskStarted; - /// /// Occurs when [scheduled task ended]. /// event EventHandler> ScheduledTaskEnded; @@ -97,7 +93,7 @@ namespace MediaBrowser.Model.ApiClient /// /// Occurs when [send text command]. /// - event EventHandler> SendTextCommand; + event EventHandler> SendStringCommand; /// /// Occurs when [set volume command]. /// @@ -109,7 +105,7 @@ namespace MediaBrowser.Model.ApiClient /// /// Occurs when [set video stream index command]. /// - event EventHandler> SetVideoStreamIndexCommand; + event EventHandler> SetSubtitleStreamIndexCommand; /// /// Occurs when [sessions updated]. /// diff --git a/MediaBrowser.Server.Implementations/EntryPoints/ServerEventNotifier.cs b/MediaBrowser.Server.Implementations/EntryPoints/ServerEventNotifier.cs index 773ee24a9d..54cd21cdfc 100644 --- a/MediaBrowser.Server.Implementations/EntryPoints/ServerEventNotifier.cs +++ b/MediaBrowser.Server.Implementations/EntryPoints/ServerEventNotifier.cs @@ -1,5 +1,4 @@ -using MediaBrowser.Common.Events; -using MediaBrowser.Common.Net; +using MediaBrowser.Common.Net; using MediaBrowser.Common.Plugins; using MediaBrowser.Common.ScheduledTasks; using MediaBrowser.Common.Updates; @@ -54,8 +53,12 @@ namespace MediaBrowser.Server.Implementations.EntryPoints /// Initializes a new instance of the class. /// /// The server manager. - /// The logger. + /// The application host. /// The user manager. + /// The installation manager. + /// The task manager. + /// The dto service. + /// The session manager. public ServerEventNotifier(IServerManager serverManager, IServerApplicationHost appHost, IUserManager userManager, IInstallationManager installationManager, ITaskManager taskManager, IDtoService dtoService, ISessionManager sessionManager) { _serverManager = serverManager; @@ -80,7 +83,6 @@ namespace MediaBrowser.Server.Implementations.EntryPoints _installationManager.PackageInstallationCompleted += _installationManager_PackageInstallationCompleted; _installationManager.PackageInstallationFailed += _installationManager_PackageInstallationFailed; - _taskManager.TaskExecuting += _taskManager_TaskExecuting; _taskManager.TaskCompleted += _taskManager_TaskCompleted; } @@ -109,12 +111,6 @@ namespace MediaBrowser.Server.Implementations.EntryPoints _serverManager.SendWebSocketMessage("ScheduledTaskEnded", e.Argument); } - void _taskManager_TaskExecuting(object sender, EventArgs e) - { - var task = (IScheduledTask)sender; - _serverManager.SendWebSocketMessage("ScheduledTaskStarted", task.Name); - } - /// /// Installations the manager_ plugin uninstalled. /// diff --git a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj index 7f9d6919e0..ac9d700fab 100644 --- a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj +++ b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj @@ -2069,9 +2069,6 @@ PreserveNewest - - Designer - diff --git a/Nuget/MediaBrowser.Common.Internal.nuspec b/Nuget/MediaBrowser.Common.Internal.nuspec index bf60bf7009..8890d754f0 100644 --- a/Nuget/MediaBrowser.Common.Internal.nuspec +++ b/Nuget/MediaBrowser.Common.Internal.nuspec @@ -2,7 +2,7 @@ MediaBrowser.Common.Internal - 3.0.362 + 3.0.365 MediaBrowser.Common.Internal Luke ebr,Luke,scottisafool @@ -12,9 +12,9 @@ Contains common components shared by Media Browser Theater and Media Browser Server. Not intended for plugin developer consumption. Copyright © Media Browser 2013 - + - + diff --git a/Nuget/MediaBrowser.Common.nuspec b/Nuget/MediaBrowser.Common.nuspec index 3065ba17db..4a3bac116a 100644 --- a/Nuget/MediaBrowser.Common.nuspec +++ b/Nuget/MediaBrowser.Common.nuspec @@ -2,7 +2,7 @@ MediaBrowser.Common - 3.0.362 + 3.0.365 MediaBrowser.Common Media Browser Team ebr,Luke,scottisafool diff --git a/Nuget/MediaBrowser.Server.Core.nuspec b/Nuget/MediaBrowser.Server.Core.nuspec index 140d02ece6..6d35ea7556 100644 --- a/Nuget/MediaBrowser.Server.Core.nuspec +++ b/Nuget/MediaBrowser.Server.Core.nuspec @@ -2,7 +2,7 @@ MediaBrowser.Server.Core - 3.0.362 + 3.0.365 Media Browser.Server.Core Media Browser Team ebr,Luke,scottisafool @@ -12,7 +12,7 @@ Contains core components required to build plugins for Media Browser Server. Copyright © Media Browser 2013 - +