alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-04-21 09:34:44 +01:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

resolve wtv transcoding

Browse Source
This commit is contained in:
Luke Pulverenti
2014-09-09 20:28:59 -04:00
parent a2dc5e090b
commit b314199319
7 changed files with 104 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
MediaBrowser.Server.Implementations/Connect/ConnectManager.cs
View File

@@ -31,8 +31,23 @@ namespace MediaBrowser.Server.Implementations.Connect
public string ConnectServerId { get; set; }
public string ConnectAccessKey { get; set; }
public string WanIpAddress { get; private set; }
public string DiscoveredWanIpAddress { get; private set; }
public string WanIpAddress
{
get
{
var address = _config.Configuration.WanDdns;
if (string.IsNullOrWhiteSpace(address))
{
address = DiscoveredWanIpAddress;
}
return address;
}
}
public string WanApiAddress
{
get
@@ -75,7 +90,7 @@ namespace MediaBrowser.Server.Implementations.Connect
internal void OnWanAddressResolved(string address)
{
WanIpAddress = address;
DiscoveredWanIpAddress = address;
//UpdateConnectInfo();
}

3
MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json
View File

@@ -445,5 +445,6 @@
"MessageTrialExpired": "The trial period for this feature has expired",
"MessageTrialWillExpireIn": "The trial period for this feature will expire in {0} day(s)",
"MessageInstallPluginFromApp": "This plugin must be installed from with in the app you intend to use it in.",
"ValuePriceUSD": "Price: {0} (USD)"
"ValuePriceUSD": "Price: {0} (USD)",
"MessageFeatureIncludedWithSupporter": "You are registered for this feature, and will be able to continue using it with an active supporter membership."
}

2
MediaBrowser.Server.Implementations/Localization/Server/server.json
View File

@@ -1152,5 +1152,5 @@
"XmlDocumentAttributeListHelp": "These attributes are applied to the root element of every xml response.",
"OptionSaveMetadataAsHidden": "Save metadata and images as hidden files",
"LabelExtractChaptersDuringLibraryScan": "Extract chapter images during the library scan",
"LabelExtractChaptersDuringLibraryScanHelp": "If enabled, chapter images will be extracted as part of the normal library scan. If disabled they will be extracted during the chapter images scheduled task, allowing the regular library scan to complete faster."
"LabelExtractChaptersDuringLibraryScanHelp": "If enabled, chapter images will be extracted when videos are imported during the library scan. If disabled they will be extracted during the chapter images scheduled task, allowing the regular library scan to complete faster."
}