github-mirrors/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-04-24 22:17:25 -04:00
Code Issues Projects Releases Packages Wiki Activity

update ssdp handler

Browse source
This commit is contained in:
Luke Pulverenti 2016-10-19 02:27:02 -04:00
parent d43111813e
commit f988413e4b
2 changed files with 49 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

73
MediaBrowser.Dlna/Main/DlnaEntryPoint.cs
View file

@ -19,6 +19,7 @@ using System.Net;
using System.Threading.Tasks; using System.Threading.Tasks;
using MediaBrowser.Controller.MediaEncoding; using MediaBrowser.Controller.MediaEncoding;
using Rssdp; using Rssdp;
using Rssdp.Infrastructure;
namespace MediaBrowser.Dlna.Main namespace MediaBrowser.Dlna.Main
{ {
@ -154,8 +155,14 @@ namespace MediaBrowser.Dlna.Main
} }
} }
private void LogMessage(string msg)
{
//_logger.Debug(msg);
}
private void StartPublishing() private void StartPublishing()
{ {
SsdpDevicePublisherBase.LogFunction = LogMessage;
_Publisher = new SsdpDevicePublisher(); _Publisher = new SsdpDevicePublisher();
} }
@ -237,46 +244,64 @@ namespace MediaBrowser.Dlna.Main
var udn = (addressString).GetMD5().ToString("N"); var udn = (addressString).GetMD5().ToString("N");
var services = new List<string> var fullService = "urn:schemas-upnp-org:device:MediaServer:1";
_logger.Info("Registering publisher for {0} on {1}", fullService, addressString);
var descriptorUri = "/dlna/" + udn + "/description.xml";
var uri = new Uri(_appHost.GetLocalApiUrl(address) + descriptorUri);
var device = new SsdpRootDevice
{
CacheLifetime = TimeSpan.FromSeconds(cacheLength), //How long SSDP clients can cache this info.
Location = uri, // Must point to the URL that serves your devices UPnP description document.
FriendlyName = "Emby Server",
Manufacturer = "Emby",
ModelName = "Emby Server",
Uuid = udn
// This must be a globally unique value that survives reboots etc. Get from storage or embedded hardware etc.
};
SetProperies(device, fullService);
_Publisher.AddDevice(device);
var embeddedDevices = new List<string>
{ {
"urn:schemas-upnp-org:device:MediaServer:1",
"urn:schemas-upnp-org:service:ContentDirectory:1", "urn:schemas-upnp-org:service:ContentDirectory:1",
"urn:schemas-upnp-org:service:ConnectionManager:1", "urn:schemas-upnp-org:service:ConnectionManager:1",
"urn:microsoft.com:service:X_MS_MediaReceiverRegistrar:1" "urn:microsoft.com:service:X_MS_MediaReceiverRegistrar:1"
}; };
foreach (var fullService in services) foreach (var subDevice in embeddedDevices)
{ {
_logger.Info("Registering publisher for {0} on {1}", fullService, addressString); var embeddedDevice = new SsdpEmbeddedDevice
var descriptorURI = "/dlna/" + udn + "/description.xml";
var uri = new Uri(_appHost.GetLocalApiUrl(address) + descriptorURI);
var service = fullService.Replace("urn:", string.Empty).Replace(":1", string.Empty);
var serviceParts = service.Split(':');
var deviceTypeNamespace = serviceParts[0].Replace('.', '-');
var device = new SsdpRootDevice
{ {
CacheLifetime = TimeSpan.FromSeconds(cacheLength), //How long SSDP clients can cache this info. FriendlyName = device.FriendlyName,
Location = uri, // Must point to the URL that serves your devices UPnP description document. Manufacturer = device.Manufacturer,
DeviceTypeNamespace = deviceTypeNamespace, ModelName = device.ModelName,
DeviceClass = serviceParts[1],
DeviceType = serviceParts[2],
FriendlyName = "Emby Server",
Manufacturer = "Emby",
ModelName = "Emby Server",
Uuid = udn Uuid = udn
// This must be a globally unique value that survives reboots etc. Get from storage or embedded hardware etc. // This must be a globally unique value that survives reboots etc. Get from storage or embedded hardware etc.
}; };
_Publisher.AddDevice(device); SetProperies(embeddedDevice, subDevice);
device.AddDevice(embeddedDevice);
} }
} }
} }
private void SetProperies(SsdpDevice device, string fullDeviceType)
{
var service = fullDeviceType.Replace("urn:", string.Empty).Replace(":1", string.Empty);
var serviceParts = service.Split(':');
var deviceTypeNamespace = serviceParts[0].Replace('.', '-');
device.DeviceTypeNamespace = deviceTypeNamespace;
device.DeviceClass = serviceParts[1];
device.DeviceType = serviceParts[2];
}
private readonly object _syncLock = new object(); private readonly object _syncLock = new object();
private void StartPlayToManager() private void StartPlayToManager()
{ {

6
MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
View file

@ -986,9 +986,6 @@
<Content Include="dashboard-ui\scripts\userparentalcontrol.js"> <Content Include="dashboard-ui\scripts\userparentalcontrol.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
<Content Include="dashboard-ui\scripts\wizardservice.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="dashboard-ui\scripts\wizardsettings.js"> <Content Include="dashboard-ui\scripts\wizardsettings.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
@ -1034,9 +1031,6 @@
<Content Include="dashboard-ui\wizardlivetvtuner.html"> <Content Include="dashboard-ui\wizardlivetvtuner.html">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
<Content Include="dashboard-ui\wizardservice.html">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="dashboard-ui\wizardsettings.html"> <Content Include="dashboard-ui\wizardsettings.html">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>