Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-07-09 03:04:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

Renamed

Browse Source
This commit is contained in:
BaronGreenback 2021-05-03 19:30:56 +01:00
parent 7936ea59eb
commit 7ff52bf755
6 changed files with 9 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Emby.Server.Implementations/ApplicationHost.cs
View File

@ -1201,25 +1201,12 @@ namespace Emby.Server.Implementations
} }
/// <inheritdoc/> /// <inheritdoc/>
public string GetInterfaceHttpApiUrl() public string GetUrlForUseByHttpApi()
{ {
// Published server ends with a / var bind = NetManager.GetInternalBindAddresses().FirstOrDefault() ??
if (!string.IsNullOrEmpty(PublishedServerUrl)) NetManager.GetAllBindInterfaces(true).FirstOrDefault();
{
// Published server ends with a '/', so we need to remove it.
return PublishedServerUrl.Trim('/');
}
var bind = NetManager.GetInternalBindAddresses().FirstOrDefault() ?? new IPNetAddress(IPAddress.None); return GetLocalApiUrl(bind.Address.ToString(), Uri.UriSchemeHttp);
string smart = NetManager.GetBindInterface(bind, out var port);
// If the smartAPI doesn't start with http then treat it as a host or ip.
if (smart.StartsWith("http", StringComparison.OrdinalIgnoreCase))
{
return smart.Trim('/');
}
return GetLocalApiUrl(smart.Trim('/'), null, port);
} }
/// <inheritdoc/> /// <inheritdoc/>

2
Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
View File

@ -1031,7 +1031,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
{ {
var stream = new MediaSourceInfo var stream = new MediaSourceInfo
{ {
EncoderPath = _appHost.GetInterfaceHttpApiUrl() + "/LiveTv/LiveRecordings/" + info.Id + "/stream", EncoderPath = _appHost.GetUrlForUseByHttpApi() + "/LiveTv/LiveRecordings/" + info.Id + "/stream",
EncoderProtocol = MediaProtocol.Http, EncoderProtocol = MediaProtocol.Http,
Path = info.Path, Path = info.Path,
Protocol = MediaProtocol.File, Protocol = MediaProtocol.File,

2
Emby.Server.Implementations/LiveTv/LiveTvMediaSourceProvider.cs
View File

@ -102,7 +102,7 @@ namespace Emby.Server.Implementations.LiveTv
// Dummy this up so that direct play checks can still run // Dummy this up so that direct play checks can still run
if (string.IsNullOrEmpty(source.Path) && source.Protocol == MediaProtocol.Http) if (string.IsNullOrEmpty(source.Path) && source.Protocol == MediaProtocol.Http)
{ {
source.Path = _appHost.GetInterfaceHttpApiUrl(); source.Path = _appHost.GetUrlForUseByHttpApi();
} }
} }

2
Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunUdpStream.cs
View File

@ -148,7 +148,7 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts.HdHomerun
// OpenedMediaSource.Path = tempFile; // OpenedMediaSource.Path = tempFile;
// OpenedMediaSource.ReadAtNativeFramerate = true; // OpenedMediaSource.ReadAtNativeFramerate = true;
MediaSource.Path = _appHost.GetInterfaceHttpApiUrl() + "/LiveTv/LiveStreamFiles/" + UniqueId + "/stream.ts"; MediaSource.Path = _appHost.GetUrlForUseByHttpApi() + "/LiveTv/LiveStreamFiles/" + UniqueId + "/stream.ts";
MediaSource.Protocol = MediaProtocol.Http; MediaSource.Protocol = MediaProtocol.Http;
// OpenedMediaSource.SupportsDirectPlay = false; // OpenedMediaSource.SupportsDirectPlay = false;
// OpenedMediaSource.SupportsDirectStream = true; // OpenedMediaSource.SupportsDirectStream = true;

2
Emby.Server.Implementations/LiveTv/TunerHosts/SharedHttpStream.cs
View File

@ -97,7 +97,7 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts
// OpenedMediaSource.Path = tempFile; // OpenedMediaSource.Path = tempFile;
// OpenedMediaSource.ReadAtNativeFramerate = true; // OpenedMediaSource.ReadAtNativeFramerate = true;
MediaSource.Path = _appHost.GetInterfaceHttpApiUrl() + "/LiveTv/LiveStreamFiles/" + UniqueId + "/stream.ts"; MediaSource.Path = _appHost.GetUrlForUseByHttpApi() + "/LiveTv/LiveStreamFiles/" + UniqueId + "/stream.ts";
MediaSource.Protocol = MediaProtocol.Http; MediaSource.Protocol = MediaProtocol.Http;
// OpenedMediaSource.Path = TempFilePath; // OpenedMediaSource.Path = TempFilePath;

2
MediaBrowser.Controller/IServerApplicationHost.cs
View File

@ -91,7 +91,7 @@ namespace MediaBrowser.Controller
/// Gets an URL that can be used to access the API over HTTP (not HTTPS). /// Gets an URL that can be used to access the API over HTTP (not HTTPS).
/// </summary> /// </summary>
/// <returns>The API URL.</returns> /// <returns>The API URL.</returns>
string GetInterfaceHttpApiUrl(); string GetUrlForUseByHttpApi();
/// <summary> /// <summary>
/// Gets a local (LAN) URL that can be used to access the API. /// Gets a local (LAN) URL that can be used to access the API.