lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2653 from MediaBrowser/dev

Browse Source 
Dev
This commit is contained in:
Luke 2017-05-20 12:43:51 -04:00 committed by GitHub
commit fe7e8fb5f8
5 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Emby.Server.Implementations/LiveTv/LiveTvManager.cs
View File

@ -478,6 +478,7 @@ namespace Emby.Server.Implementations.LiveTv
if (!(service is EmbyTV.EmbyTV))
{
// We can't trust that we'll be able to direct stream it through emby server, no matter what the provider says
mediaSource.SupportsDirectPlay = false;
mediaSource.SupportsDirectStream = false;
mediaSource.SupportsTranscoding = true;
foreach (var stream in mediaSource.MediaStreams)

2
MediaBrowser.Api/Playback/MediaInfoService.cs
View File

@ -127,7 +127,7 @@ namespace MediaBrowser.Api.Playback
SetDeviceSpecificData(item, result.MediaSource, profile, authInfo, request.MaxStreamingBitrate,
request.StartTimeTicks ?? 0, result.MediaSource.Id, request.AudioStreamIndex,
request.SubtitleStreamIndex, request.MaxAudioChannels, request.PlaySessionId, request.UserId, true, true, true, true, true, true);
request.SubtitleStreamIndex, request.MaxAudioChannels, request.PlaySessionId, request.UserId, request.EnableDirectPlay, request.ForceDirectPlayRemoteMediaSource, request.EnableDirectStream, true, true, true);
}
else
{

8
MediaBrowser.Model/MediaInfo/LiveStreamRequest.cs
View File

@ -15,9 +15,15 @@ namespace MediaBrowser.Model.MediaInfo
public string ItemId { get; set; }
public DeviceProfile DeviceProfile { get; set; }
public bool EnableDirectPlay { get; set; }
public bool EnableDirectStream { get; set; }
public bool ForceDirectPlayRemoteMediaSource { get; set; }
public LiveStreamRequest()
{
ForceDirectPlayRemoteMediaSource = true;
EnableDirectPlay = true;
EnableDirectStream = true;
}
public LiveStreamRequest(AudioOptions options)

5
MediaBrowser.Providers/Manager/ImageSaver.cs
View File

@ -226,7 +226,6 @@ namespace MediaBrowser.Providers.Manager
return retryPath;
}
private SemaphoreSlim _imageSaveSemaphore = new SemaphoreSlim(1, 1);
/// <summary>
/// Saves the image to location.
/// </summary>
@ -240,8 +239,6 @@ namespace MediaBrowser.Providers.Manager
var parentFolder = _fileSystem.GetDirectoryName(path);
await _imageSaveSemaphore.WaitAsync(cancellationToken).ConfigureAwait(false);
try
{
_libraryMonitor.ReportFileSystemChangeBeginning(path);
@ -263,8 +260,6 @@ namespace MediaBrowser.Providers.Manager
}
finally
{
_imageSaveSemaphore.Release();
_libraryMonitor.ReportFileSystemChangeComplete(path, false);
_libraryMonitor.ReportFileSystemChangeComplete(parentFolder, false);
}

2
SharedVersion.cs
View File

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