pt
/
jellyfin
mirror of https://github.com/jellyfin/jellyfin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

update live streams

This commit is contained in:
Luke Pulverenti 2017-05-20 12:42:47 -04:00
parent a0755bdffb
commit 5137e3abf6
4 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -477,7 +477,8 @@ namespace Emby.Server.Implementations.LiveTv
if (!(service is EmbyTV.EmbyTV)) 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 // 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.SupportsDirectStream = false;
mediaSource.SupportsTranscoding = true; mediaSource.SupportsTranscoding = true;
foreach (var stream in mediaSource.MediaStreams) 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, SetDeviceSpecificData(item, result.MediaSource, profile, authInfo, request.MaxStreamingBitrate,
request.StartTimeTicks ?? 0, result.MediaSource.Id, request.AudioStreamIndex, 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 else
{ {

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

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

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

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