Backupppert/jellyfin
0
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2024-07-11 08:10:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

3.2.20.7

Browse source
This commit is contained in:
Luke Pulverenti 2017-06-20 15:38:42 -04:00
parent 018df6d4c6
commit 905f02e6d9
4 changed files with 21 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Emby.Common.Implementations/TextEncoding/TextEncoding.cs
View file

@ -214,7 +214,10 @@ namespace Emby.Common.Implementations.TextEncoding
case "ota": case "ota":
case "tur": case "tur":
return "windows-1254"; return "windows-1254";
// bulgarian
case "bul":
case "bgr": case "bgr":
return "windows-1251";
case "rus": case "rus":
return "windows-1251"; return "windows-1251";
case "vie": case "vie":

2
Emby.Server.Implementations/LiveTv/LiveStreamHelper.cs
View file

@ -17,7 +17,7 @@ namespace Emby.Server.Implementations.LiveTv
private readonly ILogger _logger; private readonly ILogger _logger;
const int ProbeAnalyzeDurationMs = 2000; const int ProbeAnalyzeDurationMs = 2000;
const int PlaybackAnalyzeDurationMs = 1000; const int PlaybackAnalyzeDurationMs = 2000;
public LiveStreamHelper(IMediaEncoder mediaEncoder, ILogger logger) public LiveStreamHelper(IMediaEncoder mediaEncoder, ILogger logger)
{ {

31
Emby.Server.Implementations/Session/HttpSessionController.cs
View file

@ -159,24 +159,25 @@ namespace Emby.Server.Implementations.Session
public Task SendMessage<T>(string name, T data, CancellationToken cancellationToken) public Task SendMessage<T>(string name, T data, CancellationToken cancellationToken)
{ {
var url = PostUrl + "/" + name; return Task.FromResult(true);
//var url = PostUrl + "/" + name;
var options = new HttpRequestOptions //var options = new HttpRequestOptions
{ //{
Url = url, // Url = url,
CancellationToken = cancellationToken, // CancellationToken = cancellationToken,
BufferContent = false // BufferContent = false
}; //};
options.RequestContent = _json.SerializeToString(data); //options.RequestContent = _json.SerializeToString(data);
options.RequestContentType = "application/json"; //options.RequestContentType = "application/json";
return _httpClient.Post(new HttpRequestOptions //return _httpClient.Post(new HttpRequestOptions
{ //{
Url = url, // Url = url,
CancellationToken = cancellationToken, // CancellationToken = cancellationToken,
BufferContent = false // BufferContent = false
}); //});
} }
private string ToQueryString(Dictionary<string, string> nvc) private string ToQueryString(Dictionary<string, string> nvc)

2
SharedVersion.cs
View file

@ -1,3 +1,3 @@
using System.Reflection; using System.Reflection;
[assembly: AssemblyVersion("3.2.20.6")] [assembly: AssemblyVersion("3.2.20.7")]