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

add experimental warning for folder rip transcoding

This commit is contained in:
Luke Pulverenti 2017-08-22 01:41:02 -04:00
parent 2e5db767f3
commit 3c1fe6ff83
5 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Emby.Server.Implementations/Data/SqliteItemRepository.cs
View File

@ -114,7 +114,7 @@ namespace Emby.Server.Implementations.Data
{
get
{
return true;
return false;
}
}

2
Emby.Server.Implementations/Data/SqliteUserDataRepository.cs
View File

@ -95,7 +95,7 @@ namespace Emby.Server.Implementations.Data
{
get
{
return true;
return false;
}
}

4
Emby.Server.Implementations/LiveTv/EmbyTV/DirectRecorder.cs
View File

@ -49,8 +49,8 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
_logger.Info("Copying recording stream to file {0}", targetFile);
// The media source if infinite so we need to handle stopping ourselves
//var durationToken = new CancellationTokenSource(duration);
//cancellationToken = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken, durationToken.Token).Token;
var durationToken = new CancellationTokenSource(duration);
cancellationToken = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken, durationToken.Token).Token;
await directStreamProvider.CopyToAsync(output, cancellationToken).ConfigureAwait(false);
}

1
MediaBrowser.Model/Configuration/ServerConfiguration.cs
View File

@ -217,6 +217,7 @@ namespace MediaBrowser.Model.Configuration
EnableHttps = false;
EnableDashboardResponseCaching = true;
EnableAnonymousUsageReporting = true;
EnableCaseSensitiveItemIds = true;
EnableAutomaticRestart = true;

2
SharedVersion.cs
View File

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