aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Emby.Common.Implementations/TextEncoding/TextEncoding.cs3
-rw-r--r--Emby.Server.Implementations/LiveTv/LiveStreamHelper.cs2
-rw-r--r--Emby.Server.Implementations/Session/HttpSessionController.cs37
-rw-r--r--SharedVersion.cs2
4 files changed, 24 insertions, 20 deletions
diff --git a/Emby.Common.Implementations/TextEncoding/TextEncoding.cs b/Emby.Common.Implementations/TextEncoding/TextEncoding.cs
index 021caec75..54c47d62c 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 75f423181..428b6202b 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 92fa6c424..dbac76bb4 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<T>(string name, T data, CancellationToken cancellationToken)
{
- var url = PostUrl + "/" + name;
-
- var options = new HttpRequestOptions
- {
- Url = url,
- CancellationToken = cancellationToken,
- BufferContent = false
- };
-
- options.RequestContent = _json.SerializeToString(data);
- options.RequestContentType = "application/json";
-
- return _httpClient.Post(new HttpRequestOptions
- {
- Url = url,
- CancellationToken = cancellationToken,
- BufferContent = false
- });
+ return Task.FromResult(true);
+ //var url = PostUrl + "/" + name;
+
+ //var options = new HttpRequestOptions
+ //{
+ // Url = url,
+ // CancellationToken = cancellationToken,
+ // BufferContent = false
+ //};
+
+ //options.RequestContent = _json.SerializeToString(data);
+ //options.RequestContentType = "application/json";
+
+ //return _httpClient.Post(new HttpRequestOptions
+ //{
+ // Url = url,
+ // CancellationToken = cancellationToken,
+ // BufferContent = false
+ //});
}
private string ToQueryString(Dictionary<string, string> nvc)
diff --git a/SharedVersion.cs b/SharedVersion.cs
index b7341d9eb..38f901e92 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")]