diff options
Diffstat (limited to 'Emby.Server.Implementations')
| -rw-r--r-- | Emby.Server.Implementations/LiveTv/EmbyTV/EncodedRecorder.cs | 6 | ||||
| -rw-r--r-- | Emby.Server.Implementations/LiveTv/TunerHosts/M3uParser.cs | 13 |
2 files changed, 14 insertions, 5 deletions
diff --git a/Emby.Server.Implementations/LiveTv/EmbyTV/EncodedRecorder.cs b/Emby.Server.Implementations/LiveTv/EmbyTV/EncodedRecorder.cs index d5c2ec5d0..7460a9f06 100644 --- a/Emby.Server.Implementations/LiveTv/EmbyTV/EncodedRecorder.cs +++ b/Emby.Server.Implementations/LiveTv/EmbyTV/EncodedRecorder.cs @@ -67,7 +67,11 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV 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) diff --git a/Emby.Server.Implementations/LiveTv/TunerHosts/M3uParser.cs b/Emby.Server.Implementations/LiveTv/TunerHosts/M3uParser.cs index 34d0dd853..073da48a0 100644 --- a/Emby.Server.Implementations/LiveTv/TunerHosts/M3uParser.cs +++ b/Emby.Server.Implementations/LiveTv/TunerHosts/M3uParser.cs @@ -298,15 +298,20 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts private string GetTunerChannelId(Dictionary<string, string> attributes) { + var values = new List<string>(); + string result; - attributes.TryGetValue("tvg-id", out result); + if (attributes.TryGetValue("tvg-id", out result)) + { + values.Add(result); + } - if (string.IsNullOrWhiteSpace(result)) + if (attributes.TryGetValue("channel-id", out result)) { - attributes.TryGetValue("channel-id", out result); + values.Add(result); } - return result; + return values.Count == 0 ? null : string.Join("-", values.ToArray()); } private Dictionary<string, string> ParseExtInf(string line, out string remaining) |