lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #744 from 7illusions/master

Browse Source 
PlayTo Detection fix
This commit is contained in:
7illusions 2014-03-18 18:36:17 +01:00
commit 4112b37481
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
MediaBrowser.Dlna/PlayTo/Device.cs
View File

@ -12,8 +12,8 @@ namespace MediaBrowser.Dlna.PlayTo
{ {
public class Device : IDisposable public class Device : IDisposable
{ {
const string ServiceAvtransportId = "urn:upnp-org:serviceId:AVTransport"; const string ServiceAvtransportType = "urn:schemas-upnp-org:service:AVTransport:1";
const string ServiceRenderingId = "urn:upnp-org:serviceId:RenderingControl"; const string ServiceRenderingType = "urn:schemas-upnp-org:service:RenderingControl:1";
#region Fields & Properties #region Fields & Properties
@ -213,7 +213,7 @@ namespace MediaBrowser.Dlna.PlayTo
if (command == null) if (command == null)
return true; return true;
var service = Properties.Services.FirstOrDefault(s => s.ServiceId == ServiceRenderingId); var service = Properties.Services.FirstOrDefault(s => s.ServiceType == ServiceRenderingType);
if (service == null) if (service == null)
{ {
@ -232,7 +232,7 @@ namespace MediaBrowser.Dlna.PlayTo
if (command == null) if (command == null)
return value; return value;
var service = Properties.Services.FirstOrDefault(s => s.ServiceId == ServiceAvtransportId); var service = Properties.Services.FirstOrDefault(s => s.ServiceType == ServiceAvtransportType);
if (service == null) if (service == null)
{ {
@ -262,7 +262,7 @@ namespace MediaBrowser.Dlna.PlayTo
{"CurrentURIMetaData", CreateDidlMeta(metaData)} {"CurrentURIMetaData", CreateDidlMeta(metaData)}
}; };
var service = Properties.Services.FirstOrDefault(s => s.ServiceId == ServiceAvtransportId); var service = Properties.Services.FirstOrDefault(s => s.ServiceType == ServiceAvtransportType);
if (service == null) if (service == null)
{ {
@ -307,7 +307,7 @@ namespace MediaBrowser.Dlna.PlayTo
{"NextURIMetaData", CreateDidlMeta(metaData)} {"NextURIMetaData", CreateDidlMeta(metaData)}
}; };
var service = Properties.Services.FirstOrDefault(s => s.ServiceId == ServiceAvtransportId); var service = Properties.Services.FirstOrDefault(s => s.ServiceType == ServiceAvtransportType);
if (service == null) if (service == null)
{ {
@ -328,7 +328,7 @@ namespace MediaBrowser.Dlna.PlayTo
if (command == null) if (command == null)
return false; return false;
var service = Properties.Services.FirstOrDefault(s => s.ServiceId == ServiceAvtransportId); var service = Properties.Services.FirstOrDefault(s => s.ServiceType == ServiceAvtransportType);
if (service == null) if (service == null)
{ {
@ -348,7 +348,7 @@ namespace MediaBrowser.Dlna.PlayTo
if (command == null) if (command == null)
return false; return false;
var service = Properties.Services.FirstOrDefault(s => s.ServiceId == ServiceAvtransportId); var service = Properties.Services.FirstOrDefault(s => s.ServiceType == ServiceAvtransportType);
var result = await new SsdpHttpClient(_httpClient, _config).SendCommandAsync(Properties.BaseUrl, service, command.Name, RendererCommands.BuildPost(command, service.ServiceType, 1)) var result = await new SsdpHttpClient(_httpClient, _config).SendCommandAsync(Properties.BaseUrl, service, command.Name, RendererCommands.BuildPost(command, service.ServiceType, 1))
.ConfigureAwait(false); .ConfigureAwait(false);
@ -362,7 +362,7 @@ namespace MediaBrowser.Dlna.PlayTo
if (command == null) if (command == null)
return false; return false;
var service = Properties.Services.FirstOrDefault(s => s.ServiceId == ServiceAvtransportId); var service = Properties.Services.FirstOrDefault(s => s.ServiceType == ServiceAvtransportType);
var result = await new SsdpHttpClient(_httpClient, _config).SendCommandAsync(Properties.BaseUrl, service, command.Name, RendererCommands.BuildPost(command, service.ServiceType, 1)) var result = await new SsdpHttpClient(_httpClient, _config).SendCommandAsync(Properties.BaseUrl, service, command.Name, RendererCommands.BuildPost(command, service.ServiceType, 1))
.ConfigureAwait(false); .ConfigureAwait(false);
@ -436,7 +436,7 @@ namespace MediaBrowser.Dlna.PlayTo
if (command == null) if (command == null)
return; return;
var service = Properties.Services.FirstOrDefault(s => s.ServiceId == ServiceRenderingId); var service = Properties.Services.FirstOrDefault(s => s.ServiceType == ServiceRenderingType);
if (service == null) if (service == null)
{ {
@ -470,7 +470,7 @@ namespace MediaBrowser.Dlna.PlayTo
if (command == null) if (command == null)
return; return;
var service = Properties.Services.FirstOrDefault(s => s.ServiceId == ServiceAvtransportId); var service = Properties.Services.FirstOrDefault(s => s.ServiceType == ServiceAvtransportType);
if (service == null) if (service == null)
return; return;
@ -497,7 +497,7 @@ namespace MediaBrowser.Dlna.PlayTo
if (command == null) if (command == null)
return; return;
var service = Properties.Services.FirstOrDefault(s => s.ServiceId == ServiceAvtransportId); var service = Properties.Services.FirstOrDefault(s => s.ServiceType == ServiceAvtransportType);
if (service == null) if (service == null)
{ {
@ -538,7 +538,7 @@ namespace MediaBrowser.Dlna.PlayTo
if (command == null) if (command == null)
return true; return true;
var service = Properties.Services.FirstOrDefault(s => s.ServiceId == ServiceAvtransportId); var service = Properties.Services.FirstOrDefault(s => s.ServiceType == ServiceAvtransportType);
if (service == null) if (service == null)
{ {
@ -596,7 +596,7 @@ namespace MediaBrowser.Dlna.PlayTo
private async Task GetAVProtocolAsync() private async Task GetAVProtocolAsync()
{ {
var avService = Properties.Services.FirstOrDefault(s => s.ServiceId == ServiceAvtransportId); var avService = Properties.Services.FirstOrDefault(s => s.ServiceType == ServiceAvtransportType);
if (avService == null) if (avService == null)
return; return;
@ -614,7 +614,7 @@ namespace MediaBrowser.Dlna.PlayTo
private async Task GetRenderingProtocolAsync() private async Task GetRenderingProtocolAsync()
{ {
var avService = Properties.Services.FirstOrDefault(s => s.ServiceId == ServiceRenderingId); var avService = Properties.Services.FirstOrDefault(s => s.ServiceType == ServiceRenderingType);
if (avService == null) if (avService == null)
return; return;
@ -711,7 +711,7 @@ namespace MediaBrowser.Dlna.PlayTo
if (service != null) if (service != null)
{ {
deviceProperties.Services.Add(service); deviceProperties.Services.Add(service);
if (service.ServiceId == ServiceAvtransportId) if (service.ServiceType == ServiceAvtransportType)
{ {
isRenderer = true; isRenderer = true;
} }