michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update recording conversion

Browse Source
This commit is contained in:
Luke Pulverenti 2017-02-22 15:58:02 -05:00
parent 76b456d5e8
commit 6847cac829
2 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Emby.Server.Core/EntryPoints/ExternalPortForwarding.cs
View File

@ -187,7 +187,10 @@ namespace Emby.Server.Core.EntryPoints
private void ClearCreatedRules(object state) private void ClearCreatedRules(object state)
{ {
_createdRules = new List<string>(); lock (_createdRules)
{
_createdRules.Clear();
}
lock (_usnsHandled) lock (_usnsHandled)
{ {
_usnsHandled.Clear(); _usnsHandled.Clear();
@ -236,16 +239,23 @@ namespace Emby.Server.Core.EntryPoints
var address = device.LocalAddress.ToString(); var address = device.LocalAddress.ToString();
if (!_createdRules.Contains(address)) lock (_createdRules)
{ {
_createdRules.Add(address); if (!_createdRules.Contains(address))
var success = await CreatePortMap(device, _appHost.HttpPort, _config.Configuration.PublicPort).ConfigureAwait(false);
if (success)
{ {
await CreatePortMap(device, _appHost.HttpsPort, _config.Configuration.PublicHttpsPort).ConfigureAwait(false); _createdRules.Add(address);
} }
else
{
return;
}
}
var success = await CreatePortMap(device, _appHost.HttpPort, _config.Configuration.PublicPort).ConfigureAwait(false);
if (success)
{
await CreatePortMap(device, _appHost.HttpsPort, _config.Configuration.PublicHttpsPort).ConfigureAwait(false);
} }
} }

6
Emby.Server.Implementations/LiveTv/EmbyTV/EncodedRecorder.cs
View File

@ -67,7 +67,11 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
private bool CopySubtitles private bool CopySubtitles
{ {
get { return string.Equals(OutputFormat, "mkv", StringComparison.OrdinalIgnoreCase); } get
{
return false;
//return string.Equals(OutputFormat, "mkv", StringComparison.OrdinalIgnoreCase);
}
} }
public string GetOutputPath(MediaSourceInfo mediaSource, string targetFile) public string GetOutputPath(MediaSourceInfo mediaSource, string targetFile)