aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Dlna/PlayTo/Device.cs
diff options
context:
space:
mode:
Diffstat (limited to 'MediaBrowser.Dlna/PlayTo/Device.cs')
-rw-r--r--MediaBrowser.Dlna/PlayTo/Device.cs17
1 files changed, 12 insertions, 5 deletions
diff --git a/MediaBrowser.Dlna/PlayTo/Device.cs b/MediaBrowser.Dlna/PlayTo/Device.cs
index 2b43c019c..a677cf5dd 100644
--- a/MediaBrowser.Dlna/PlayTo/Device.cs
+++ b/MediaBrowser.Dlna/PlayTo/Device.cs
@@ -607,7 +607,7 @@ namespace MediaBrowser.Dlna.PlayTo
url = "/" + url;
var httpClient = new SsdpHttpClient(_httpClient, _config);
- var document = await httpClient.GetDataAsync(new Uri(Properties.BaseUrl + url));
+ var document = await httpClient.GetDataAsync(Properties.BaseUrl + url);
AvCommands = TransportCommands.Create(document);
}
@@ -625,7 +625,7 @@ namespace MediaBrowser.Dlna.PlayTo
url = "/" + url;
var httpClient = new SsdpHttpClient(_httpClient, _config);
- var document = await httpClient.GetDataAsync(new Uri(Properties.BaseUrl + url));
+ var document = await httpClient.GetDataAsync(Properties.BaseUrl + url);
RendererCommands = TransportCommands.Create(document);
}
@@ -646,7 +646,7 @@ namespace MediaBrowser.Dlna.PlayTo
{
var ssdpHttpClient = new SsdpHttpClient(httpClient, config);
- var document = await ssdpHttpClient.GetDataAsync(url).ConfigureAwait(false);
+ var document = await ssdpHttpClient.GetDataAsync(url.ToString()).ConfigureAwait(false);
var deviceProperties = new DeviceInfo();
@@ -681,10 +681,18 @@ namespace MediaBrowser.Dlna.PlayTo
var presentationUrl = document.Descendants(uPnpNamespaces.ud.GetName("presentationURL")).FirstOrDefault();
if (presentationUrl != null)
deviceProperties.PresentationUrl = presentationUrl.Value;
+
var modelUrl = document.Descendants(uPnpNamespaces.ud.GetName("modelURL")).FirstOrDefault();
if (modelUrl != null)
deviceProperties.ModelUrl = modelUrl.Value;
-
+
+ var serialNumber = document.Descendants(uPnpNamespaces.ud.GetName("serialNumber")).FirstOrDefault();
+ if (serialNumber != null)
+ deviceProperties.SerialNumber = serialNumber.Value;
+
+ var modelDescription = document.Descendants(uPnpNamespaces.ud.GetName("modelDescription")).FirstOrDefault();
+ if (modelDescription != null)
+ deviceProperties.ModelDescription = modelDescription.Value;
deviceProperties.BaseUrl = String.Format("http://{0}:{1}", url.Host, url.Port);
@@ -724,7 +732,6 @@ namespace MediaBrowser.Dlna.PlayTo
if (isRenderer)
{
-
var device = new Device(deviceProperties, httpClient, logger, config);
await device.GetRenderingProtocolAsync().ConfigureAwait(false);