diff options
| author | Luke <luke.pulverenti@gmail.com> | 2016-10-19 16:32:41 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-19 16:32:41 -0400 |
| commit | b94f997a333d15d1c3d7d4410cd7dbb2e6aff377 (patch) | |
| tree | ea13d7ebc6031521f1badd20949159f64e49cb99 | |
| parent | 2cbc7d5c65d4b79a7cb146414886f554ae57cdc8 (diff) | |
| parent | b1f604b5e741709301f12374550dc6f4328d1e8d (diff) | |
Merge pull request #2246 from MediaBrowser/dev
fix upnp with vlc android
3 files changed, 8 insertions, 3 deletions
diff --git a/MediaBrowser.Dlna/Main/DlnaEntryPoint.cs b/MediaBrowser.Dlna/Main/DlnaEntryPoint.cs index f1eeb0a0a..277f80b47 100644 --- a/MediaBrowser.Dlna/Main/DlnaEntryPoint.cs +++ b/MediaBrowser.Dlna/Main/DlnaEntryPoint.cs @@ -242,7 +242,7 @@ namespace MediaBrowser.Dlna.Main var addressString = address.ToString(); - var udn = (addressString).GetMD5().ToString("N"); + var udn = CreateUuid(addressString); var fullService = "urn:schemas-upnp-org:device:MediaServer:1"; @@ -289,6 +289,11 @@ namespace MediaBrowser.Dlna.Main } } + private string CreateUuid(string text) + { + return text.GetMD5().ToString("N"); + } + private void SetProperies(SsdpDevice device, string fullDeviceType) { var service = fullDeviceType.Replace("urn:", string.Empty).Replace(":1", string.Empty); diff --git a/MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs b/MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs index 0939d1c6b..214bb8716 100644 --- a/MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs +++ b/MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs @@ -1021,7 +1021,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv.EmbyTV { var stream = new MediaSourceInfo { - Path = _appHost.GetLocalApiUrl("localhost") + "/LiveTv/LiveRecordings/" + recordingId + "/stream", + Path = _appHost.GetLocalApiUrl("127.0.0.1") + "/LiveTv/LiveRecordings/" + recordingId + "/stream", Id = recordingId, SupportsDirectPlay = false, SupportsDirectStream = true, diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunLiveStream.cs b/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunLiveStream.cs index 60222415c..91f0ee832 100644 --- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunLiveStream.cs +++ b/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunLiveStream.cs @@ -60,7 +60,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv.TunerHosts.HdHomerun //OpenedMediaSource.Path = tempFile; //OpenedMediaSource.ReadAtNativeFramerate = true; - OpenedMediaSource.Path = _appHost.GetLocalApiUrl("localhost") + "/LiveTv/LiveStreamFiles/" + UniqueId + "/stream.ts"; + OpenedMediaSource.Path = _appHost.GetLocalApiUrl("127.0.0.1") + "/LiveTv/LiveStreamFiles/" + UniqueId + "/stream.ts"; OpenedMediaSource.Protocol = MediaProtocol.Http; OpenedMediaSource.SupportsDirectPlay = false; OpenedMediaSource.SupportsDirectStream = true; |