From 6847cac829b34963467cfed6c9cb39c84d1582fb Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Wed, 22 Feb 2017 15:58:02 -0500 Subject: update recording conversion --- Emby.Server.Implementations/LiveTv/EmbyTV/EncodedRecorder.cs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'Emby.Server.Implementations') 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) -- cgit v1.2.3 From 34171a7507d393d2afbe0f4dd2719f9067441e8a Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Wed, 22 Feb 2017 16:13:27 -0500 Subject: if (string.IsNullOrWhiteSpace(result)) { attributes.TryGetValue("channel-id", out result); } --- Emby.Server.Implementations/LiveTv/TunerHosts/M3uParser.cs | 13 +++++++++---- SharedVersion.cs | 2 +- 2 files changed, 10 insertions(+), 5 deletions(-) (limited to 'Emby.Server.Implementations') 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 attributes) { + var values = new List(); + 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 ParseExtInf(string line, out string remaining) diff --git a/SharedVersion.cs b/SharedVersion.cs index 68d9dc4d4..76ebc0852 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,3 +1,3 @@ using System.Reflection; -[assembly: AssemblyVersion("3.2.1.114")] +[assembly: AssemblyVersion("3.2.1.115")] -- cgit v1.2.3