diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2014-04-08 00:17:18 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2014-04-08 00:17:18 -0400 |
| commit | 2c6a9892f2082c6a288ba01033f3fd7d517fa92e (patch) | |
| tree | 3a3e4bcbbcb20fc4c6fc326cc6452bb0957de938 /MediaBrowser.Dlna | |
| parent | 63aea3d90836765ceb38f0b9b130970af9b132d9 (diff) | |
update translations
Diffstat (limited to 'MediaBrowser.Dlna')
| -rw-r--r-- | MediaBrowser.Dlna/PlayTo/Device.cs | 16 | ||||
| -rw-r--r-- | MediaBrowser.Dlna/PlayTo/PlayToManager.cs | 15 | ||||
| -rw-r--r-- | MediaBrowser.Dlna/PlayTo/SsdpHttpClient.cs | 9 | ||||
| -rw-r--r-- | MediaBrowser.Dlna/Profiles/DefaultProfile.cs | 2 |
4 files changed, 36 insertions, 6 deletions
diff --git a/MediaBrowser.Dlna/PlayTo/Device.cs b/MediaBrowser.Dlna/PlayTo/Device.cs index fc42e45652..12d4b41d15 100644 --- a/MediaBrowser.Dlna/PlayTo/Device.cs +++ b/MediaBrowser.Dlna/PlayTo/Device.cs @@ -575,7 +575,21 @@ namespace MediaBrowser.Dlna.PlayTo return false; } - var e = track.Element(uPnpNamespaces.items) ?? track; + var trackString = (string) track; + + XElement uPnpResponse; + + try + { + uPnpResponse = XElement.Parse(trackString); + } + catch + { + _logger.Error("Unable to parse xml {0}", trackString); + throw; + } + + var e = uPnpResponse.Element(uPnpNamespaces.items); var uTrack = CreateUBaseObject(e); diff --git a/MediaBrowser.Dlna/PlayTo/PlayToManager.cs b/MediaBrowser.Dlna/PlayTo/PlayToManager.cs index 50b3786416..1730245be7 100644 --- a/MediaBrowser.Dlna/PlayTo/PlayToManager.cs +++ b/MediaBrowser.Dlna/PlayTo/PlayToManager.cs @@ -59,7 +59,7 @@ namespace MediaBrowser.Dlna.PlayTo { _locations = new ConcurrentDictionary<string, DateTime>(); - foreach (var network in NetworkInterface.GetAllNetworkInterfaces()) + foreach (var network in GetNetworkInterfaces()) { _logger.Debug("Found interface: {0}. Type: {1}. Status: {2}", network.Name, network.NetworkInterfaceType, network.OperationalStatus); @@ -97,6 +97,19 @@ namespace MediaBrowser.Dlna.PlayTo } } + private IEnumerable<NetworkInterface> GetNetworkInterfaces() + { + try + { + return NetworkInterface.GetAllNetworkInterfaces(); + } + catch (Exception ex) + { + _logger.ErrorException("Error in GetAllNetworkInterfaces", ex); + return new List<NetworkInterface>(); + } + } + public void Stop() { } diff --git a/MediaBrowser.Dlna/PlayTo/SsdpHttpClient.cs b/MediaBrowser.Dlna/PlayTo/SsdpHttpClient.cs index 889ec86394..ee57a60bca 100644 --- a/MediaBrowser.Dlna/PlayTo/SsdpHttpClient.cs +++ b/MediaBrowser.Dlna/PlayTo/SsdpHttpClient.cs @@ -58,7 +58,8 @@ namespace MediaBrowser.Dlna.PlayTo { Url = url, UserAgent = USERAGENT, - LogRequest = _config.Configuration.DlnaOptions.EnableDebugLogging + LogRequest = _config.Configuration.DlnaOptions.EnableDebugLogging, + LogErrorResponseBody = true }; options.RequestHeaders["HOST"] = ip + ":" + port.ToString(_usCulture); @@ -102,7 +103,8 @@ namespace MediaBrowser.Dlna.PlayTo { Url = url, UserAgent = USERAGENT, - LogRequest = _config.Configuration.DlnaOptions.EnableDebugLogging + LogRequest = _config.Configuration.DlnaOptions.EnableDebugLogging, + LogErrorResponseBody = true }; options.RequestHeaders["FriendlyName.DLNA.ORG"] = FriendlyName; @@ -128,7 +130,8 @@ namespace MediaBrowser.Dlna.PlayTo { Url = url, UserAgent = USERAGENT, - LogRequest = _config.Configuration.DlnaOptions.EnableDebugLogging + LogRequest = _config.Configuration.DlnaOptions.EnableDebugLogging, + LogErrorResponseBody = true }; options.RequestHeaders["SOAPAction"] = soapAction; diff --git a/MediaBrowser.Dlna/Profiles/DefaultProfile.cs b/MediaBrowser.Dlna/Profiles/DefaultProfile.cs index ccecb07c6a..8740dcac5a 100644 --- a/MediaBrowser.Dlna/Profiles/DefaultProfile.cs +++ b/MediaBrowser.Dlna/Profiles/DefaultProfile.cs @@ -31,7 +31,7 @@ namespace MediaBrowser.Dlna.Profiles new TranscodingProfile { - Container = "mp4", + Container = "ts", Type = DlnaProfileType.Video, AudioCodec = "aac", VideoCodec = "h264", |