From 905f02e6d9dc9785c9a39904a30b5933898e66dd Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Tue, 20 Jun 2017 15:38:42 -0400 Subject: [PATCH] 3.2.20.7 --- .../TextEncoding/TextEncoding.cs | 3 ++ .../LiveTv/LiveStreamHelper.cs | 2 +- .../Session/HttpSessionController.cs | 31 ++++++++++--------- SharedVersion.cs | 2 +- 4 files changed, 21 insertions(+), 17 deletions(-) diff --git a/Emby.Common.Implementations/TextEncoding/TextEncoding.cs b/Emby.Common.Implementations/TextEncoding/TextEncoding.cs index 021caec754..54c47d62c1 100644 --- a/Emby.Common.Implementations/TextEncoding/TextEncoding.cs +++ b/Emby.Common.Implementations/TextEncoding/TextEncoding.cs @@ -214,7 +214,10 @@ namespace Emby.Common.Implementations.TextEncoding case "ota": case "tur": return "windows-1254"; + // bulgarian + case "bul": case "bgr": + return "windows-1251"; case "rus": return "windows-1251"; case "vie": diff --git a/Emby.Server.Implementations/LiveTv/LiveStreamHelper.cs b/Emby.Server.Implementations/LiveTv/LiveStreamHelper.cs index 75f4231816..428b6202b4 100644 --- a/Emby.Server.Implementations/LiveTv/LiveStreamHelper.cs +++ b/Emby.Server.Implementations/LiveTv/LiveStreamHelper.cs @@ -17,7 +17,7 @@ namespace Emby.Server.Implementations.LiveTv private readonly ILogger _logger; const int ProbeAnalyzeDurationMs = 2000; - const int PlaybackAnalyzeDurationMs = 1000; + const int PlaybackAnalyzeDurationMs = 2000; public LiveStreamHelper(IMediaEncoder mediaEncoder, ILogger logger) { diff --git a/Emby.Server.Implementations/Session/HttpSessionController.cs b/Emby.Server.Implementations/Session/HttpSessionController.cs index 92fa6c4242..dbac76bb49 100644 --- a/Emby.Server.Implementations/Session/HttpSessionController.cs +++ b/Emby.Server.Implementations/Session/HttpSessionController.cs @@ -159,24 +159,25 @@ namespace Emby.Server.Implementations.Session public Task SendMessage(string name, T data, CancellationToken cancellationToken) { - var url = PostUrl + "/" + name; + return Task.FromResult(true); + //var url = PostUrl + "/" + name; - var options = new HttpRequestOptions - { - Url = url, - CancellationToken = cancellationToken, - BufferContent = false - }; + //var options = new HttpRequestOptions + //{ + // Url = url, + // CancellationToken = cancellationToken, + // BufferContent = false + //}; - options.RequestContent = _json.SerializeToString(data); - options.RequestContentType = "application/json"; + //options.RequestContent = _json.SerializeToString(data); + //options.RequestContentType = "application/json"; - return _httpClient.Post(new HttpRequestOptions - { - Url = url, - CancellationToken = cancellationToken, - BufferContent = false - }); + //return _httpClient.Post(new HttpRequestOptions + //{ + // Url = url, + // CancellationToken = cancellationToken, + // BufferContent = false + //}); } private string ToQueryString(Dictionary nvc) diff --git a/SharedVersion.cs b/SharedVersion.cs index b7341d9eb2..38f901e92b 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,3 +1,3 @@ using System.Reflection; -[assembly: AssemblyVersion("3.2.20.6")] +[assembly: AssemblyVersion("3.2.20.7")]