aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--MediaBrowser.Api/Playback/BaseStreamingService.cs4
-rw-r--r--MediaBrowser.Dlna/Profiles/XboxOneProfile.cs2
-rw-r--r--MediaBrowser.Dlna/Profiles/Xml/Xbox One.xml2
-rw-r--r--MediaBrowser.Dlna/Ssdp/Datagram.cs81
-rw-r--r--MediaBrowser.WebDashboard/Api/PackageCreator.cs2
-rw-r--r--MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj3
6 files changed, 60 insertions, 34 deletions
diff --git a/MediaBrowser.Api/Playback/BaseStreamingService.cs b/MediaBrowser.Api/Playback/BaseStreamingService.cs
index 34fb29b94..5e06ab1d0 100644
--- a/MediaBrowser.Api/Playback/BaseStreamingService.cs
+++ b/MediaBrowser.Api/Playback/BaseStreamingService.cs
@@ -1086,6 +1086,10 @@ namespace MediaBrowser.Api.Playback
}
}
}
+ catch (ObjectDisposedException)
+ {
+ // Don't spam the log. This doesn't seem to throw in windows, but sometimes under linux
+ }
catch (Exception ex)
{
Logger.ErrorException("Error reading ffmpeg log", ex);
diff --git a/MediaBrowser.Dlna/Profiles/XboxOneProfile.cs b/MediaBrowser.Dlna/Profiles/XboxOneProfile.cs
index 4c3b049bd..b78b5df0c 100644
--- a/MediaBrowser.Dlna/Profiles/XboxOneProfile.cs
+++ b/MediaBrowser.Dlna/Profiles/XboxOneProfile.cs
@@ -14,7 +14,7 @@ namespace MediaBrowser.Dlna.Profiles
Identification = new DeviceIdentification
{
- FriendlyName = "XboxOne",
+ ModelName = "Xbox One",
Headers = new[]
{
diff --git a/MediaBrowser.Dlna/Profiles/Xml/Xbox One.xml b/MediaBrowser.Dlna/Profiles/Xml/Xbox One.xml
index 1aa2b9198..e1faea150 100644
--- a/MediaBrowser.Dlna/Profiles/Xml/Xbox One.xml
+++ b/MediaBrowser.Dlna/Profiles/Xml/Xbox One.xml
@@ -2,7 +2,7 @@
<Profile xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<Name>Xbox One</Name>
<Identification>
- <FriendlyName>XboxOne</FriendlyName>
+ <ModelName>Xbox One</ModelName>
<Headers>
<HttpHeaderInfo name="FriendlyName.DLNA.ORG" value="XboxOne" match="Substring" />
<HttpHeaderInfo name="User-Agent" value="NSPlayer/12" match="Substring" />
diff --git a/MediaBrowser.Dlna/Ssdp/Datagram.cs b/MediaBrowser.Dlna/Ssdp/Datagram.cs
index 4a0bb6f48..cca59720f 100644
--- a/MediaBrowser.Dlna/Ssdp/Datagram.cs
+++ b/MediaBrowser.Dlna/Ssdp/Datagram.cs
@@ -29,32 +29,43 @@ namespace MediaBrowser.Dlna.Ssdp
public void Send()
{
var msg = Encoding.ASCII.GetBytes(Message);
- try
+
+ var socket = CreateSocket();
+
+ if (socket == null)
{
- var client = CreateSocket();
+ return;
+ }
- if (FromEndPoint != null)
+ if (FromEndPoint != null)
+ {
+ try
{
- try
+ socket.Bind(FromEndPoint);
+ }
+ catch (Exception ex)
+ {
+ if (EnableDebugLogging)
{
- client.Bind(FromEndPoint);
+ _logger.ErrorException("Error binding datagram socket", ex);
}
- catch (Exception ex)
+
+ if (!IgnoreBindFailure)
{
- if (EnableDebugLogging)
- {
- _logger.ErrorException("Error binding datagram socket", ex);
- }
-
- if (!IgnoreBindFailure) throw;
+ CloseSocket(socket, false);
+
+ return;
}
}
+ }
- client.BeginSendTo(msg, 0, msg.Length, SocketFlags.None, ToEndPoint, result =>
+ try
+ {
+ socket.BeginSendTo(msg, 0, msg.Length, SocketFlags.None, ToEndPoint, result =>
{
try
{
- client.EndSend(result);
+ socket.EndSend(result);
}
catch (Exception ex)
{
@@ -65,32 +76,46 @@ namespace MediaBrowser.Dlna.Ssdp
}
finally
{
- try
- {
- client.Close();
- }
- catch (Exception ex)
- {
- if (EnableDebugLogging)
- {
- _logger.ErrorException("Error closing datagram socket", ex);
- }
- }
+ CloseSocket(socket, true);
}
}, null);
}
catch (Exception ex)
{
_logger.ErrorException("Error sending Datagram to {0} from {1}: " + Message, ex, ToEndPoint, FromEndPoint == null ? "" : FromEndPoint.ToString());
+ CloseSocket(socket, false);
+ }
+ }
+
+ private void CloseSocket(Socket socket, bool logError)
+ {
+ try
+ {
+ socket.Close();
+ }
+ catch (Exception ex)
+ {
+ if (logError && EnableDebugLogging)
+ {
+ _logger.ErrorException("Error closing datagram socket", ex);
+ }
}
}
private Socket CreateSocket()
{
- var socket = new Socket(AddressFamily.InterNetwork, SocketType.Dgram, ProtocolType.Udp);
+ try
+ {
+ var socket = new Socket(AddressFamily.InterNetwork, SocketType.Dgram, ProtocolType.Udp);
- socket.SetSocketOption(SocketOptionLevel.Socket, SocketOptionName.ReuseAddress, true);
- return socket;
+ socket.SetSocketOption(SocketOptionLevel.Socket, SocketOptionName.ReuseAddress, true);
+ return socket;
+ }
+ catch (Exception ex)
+ {
+ _logger.ErrorException("Error creating socket", ex);
+ return null;
+ }
}
}
}
diff --git a/MediaBrowser.WebDashboard/Api/PackageCreator.cs b/MediaBrowser.WebDashboard/Api/PackageCreator.cs
index 89ae4a9b6..761f7de7b 100644
--- a/MediaBrowser.WebDashboard/Api/PackageCreator.cs
+++ b/MediaBrowser.WebDashboard/Api/PackageCreator.cs
@@ -281,7 +281,7 @@ namespace MediaBrowser.WebDashboard.Api
await AppendResource(memoryStream, "thirdparty/jstree3.0.8/jstree.js", newLineBytes).ConfigureAwait(false);
- await AppendResource(memoryStream, "thirdparty/fastclick.js", newLineBytes).ConfigureAwait(false);
+ //await AppendResource(memoryStream, "thirdparty/fastclick.js", newLineBytes).ConfigureAwait(false);
await AppendResource(memoryStream, "thirdparty/headroom.js", newLineBytes).ConfigureAwait(false);
await AppendLocalization(memoryStream, culture).ConfigureAwait(false);
diff --git a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
index 7582daab9..3d6d2c8d9 100644
--- a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
+++ b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
@@ -363,9 +363,6 @@
<Content Include="dashboard-ui\css\images\icons\volumeup.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
- <Content Include="dashboard-ui\css\images\icons\wireless.png">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </Content>
<Content Include="dashboard-ui\css\images\items\detail\tv.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
generated by cgit v1.2.3 (git 2.46.0) at 2025-12-09 00:42:24 +0000