aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--MediaBrowser.Model/ApiClient/IApiClient.cs8
-rw-r--r--MediaBrowser.Model/ApiClient/IServerEvents.cs8
-rw-r--r--MediaBrowser.Server.Implementations/EntryPoints/ServerEventNotifier.cs16
-rw-r--r--MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj3
-rw-r--r--Nuget/MediaBrowser.Common.Internal.nuspec6
-rw-r--r--Nuget/MediaBrowser.Common.nuspec2
-rw-r--r--Nuget/MediaBrowser.Server.Core.nuspec4
7 files changed, 18 insertions, 29 deletions
diff --git a/MediaBrowser.Model/ApiClient/IApiClient.cs b/MediaBrowser.Model/ApiClient/IApiClient.cs
index bfc631c79..f4620acf7 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.
/// </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
diff --git a/MediaBrowser.Model/ApiClient/IServerEvents.cs b/MediaBrowser.Model/ApiClient/IServerEvents.cs
index 8e46f3d9f..62d8fdff3 100644
--- a/MediaBrowser.Model/ApiClient/IServerEvents.cs
+++ b/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>
diff --git a/MediaBrowser.Server.Implementations/EntryPoints/ServerEventNotifier.cs b/MediaBrowser.Server.Implementations/EntryPoints/ServerEventNotifier.cs
index 773ee24a9..54cd21cdf 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 <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>
diff --git a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
index 7f9d6919e..ac9d700fa 100644
--- a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
+++ b/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" />
diff --git a/Nuget/MediaBrowser.Common.Internal.nuspec b/Nuget/MediaBrowser.Common.Internal.nuspec
index bf60bf700..8890d754f 100644
--- a/Nuget/MediaBrowser.Common.Internal.nuspec
+++ b/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>
diff --git a/Nuget/MediaBrowser.Common.nuspec b/Nuget/MediaBrowser.Common.nuspec
index 3065ba17d..4a3bac116 100644
--- a/Nuget/MediaBrowser.Common.nuspec
+++ b/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>
diff --git a/Nuget/MediaBrowser.Server.Core.nuspec b/Nuget/MediaBrowser.Server.Core.nuspec
index 140d02ece..6d35ea755 100644
--- a/Nuget/MediaBrowser.Server.Core.nuspec
+++ b/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>
generated by cgit v1.2.3 (git 2.46.0) at 2025-12-06 18:45:12 +0000