Browse Source

updated nuget

Luke Pulverenti 11 years ago
parent
commit
a938d0854d

+ 4 - 4
MediaBrowser.Model/ApiClient/IApiClient.cs

@@ -601,17 +601,17 @@ namespace MediaBrowser.Model.ApiClient
         /// Sets the index of the audio stream.
         /// </summary>
         /// <param name="sessionId">The session identifier.</param>
-        /// <param name="volume">The volume.</param>
+        /// <param name="index">The index.</param>
         /// <returns>Task.</returns>
-        Task SetAudioStreamIndex(string sessionId, int? volume);
+        Task SetAudioStreamIndex(string sessionId, int index);
 
         /// <summary>
         /// Sets the index of the subtitle stream.
         /// </summary>
         /// <param name="sessionId">The session identifier.</param>
-        /// <param name="volume">The volume.</param>
+        /// <param name="index">The index.</param>
         /// <returns>Task.</returns>
-        Task SetSubtitleStreamIndex(string sessionId, int? volume);
+        Task SetSubtitleStreamIndex(string sessionId, int? index);
         
         /// <summary>
         /// Instructs the client to display a message to the user

+ 2 - 6
MediaBrowser.Model/ApiClient/IServerEvents.cs

@@ -19,10 +19,6 @@ namespace MediaBrowser.Model.ApiClient
         /// </summary>
         event EventHandler<GenericEventArgs<string>> UserDeleted;
         /// <summary>
-        /// Occurs when [scheduled task started].
-        /// </summary>
-        event EventHandler<GenericEventArgs<string>> ScheduledTaskStarted;
-        /// <summary>
         /// Occurs when [scheduled task ended].
         /// </summary>
         event EventHandler<GenericEventArgs<TaskResult>> ScheduledTaskEnded;
@@ -97,7 +93,7 @@ namespace MediaBrowser.Model.ApiClient
         /// <summary>
         /// Occurs when [send text command].
         /// </summary>
-        event EventHandler<GenericEventArgs<string>> SendTextCommand;
+        event EventHandler<GenericEventArgs<string>> SendStringCommand;
         /// <summary>
         /// Occurs when [set volume command].
         /// </summary>
@@ -109,7 +105,7 @@ namespace MediaBrowser.Model.ApiClient
         /// <summary>
         /// Occurs when [set video stream index command].
         /// </summary>
-        event EventHandler<GenericEventArgs<int>> SetVideoStreamIndexCommand;
+        event EventHandler<GenericEventArgs<int>> SetSubtitleStreamIndexCommand;
         /// <summary>
         /// Occurs when [sessions updated].
         /// </summary>

+ 6 - 10
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 <see cref="ServerEventNotifier" /> class.
         /// </summary>
         /// <param name="serverManager">The server manager.</param>
-        /// <param name="logger">The logger.</param>
+        /// <param name="appHost">The application host.</param>
         /// <param name="userManager">The user manager.</param>
+        /// <param name="installationManager">The installation manager.</param>
+        /// <param name="taskManager">The task manager.</param>
+        /// <param name="dtoService">The dto service.</param>
+        /// <param name="sessionManager">The session manager.</param>
         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);
-        }
-
         /// <summary>
         /// Installations the manager_ plugin uninstalled.
         /// </summary>

+ 0 - 3
MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj

@@ -2069,9 +2069,6 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
     <None Include="packages.config" />
-    <None Include="WebMarkupMin.Configuration.xsd">
-      <SubType>Designer</SubType>
-    </None>
   </ItemGroup>
   <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

+ 3 - 3
Nuget/MediaBrowser.Common.Internal.nuspec

@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
     <metadata>
         <id>MediaBrowser.Common.Internal</id>
-        <version>3.0.362</version>
+        <version>3.0.365</version>
         <title>MediaBrowser.Common.Internal</title>
         <authors>Luke</authors>
         <owners>ebr,Luke,scottisafool</owners>
@@ -12,9 +12,9 @@
         <description>Contains common components shared by Media Browser Theater and Media Browser Server. Not intended for plugin developer consumption.</description>
         <copyright>Copyright © Media Browser 2013</copyright>
         <dependencies>
-            <dependency id="MediaBrowser.Common" version="3.0.362" />
+            <dependency id="MediaBrowser.Common" version="3.0.365" />
             <dependency id="NLog" version="2.1.0" />
-            <dependency id="SimpleInjector" version="2.4.1" />
+            <dependency id="SimpleInjector" version="2.5.0" />
             <dependency id="sharpcompress" version="0.10.2" />
         </dependencies>
     </metadata>

+ 1 - 1
Nuget/MediaBrowser.Common.nuspec

@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
     <metadata>
         <id>MediaBrowser.Common</id>
-        <version>3.0.362</version>
+        <version>3.0.365</version>
         <title>MediaBrowser.Common</title>
         <authors>Media Browser Team</authors>
         <owners>ebr,Luke,scottisafool</owners>

+ 2 - 2
Nuget/MediaBrowser.Server.Core.nuspec

@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <metadata>
         <id>MediaBrowser.Server.Core</id>
-        <version>3.0.362</version>
+        <version>3.0.365</version>
         <title>Media Browser.Server.Core</title>
         <authors>Media Browser Team</authors>
         <owners>ebr,Luke,scottisafool</owners>
@@ -12,7 +12,7 @@
         <description>Contains core components required to build plugins for Media Browser Server.</description>
         <copyright>Copyright © Media Browser 2013</copyright>
         <dependencies>
-            <dependency id="MediaBrowser.Common" version="3.0.362" />
+            <dependency id="MediaBrowser.Common" version="3.0.365" />
         </dependencies>
     </metadata>
     <files>