michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Merge pull request #2838 from MediaBrowser/dev

Browse Source 
Dev
This commit is contained in:
Luke 2017-08-22 01:41:46 -04:00 committed by GitHub
commit 325ec18b1d
6 changed files with 9 additions and 8 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 get
{ {
return true; return false;
} }
} }

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

@ -95,7 +95,7 @@ namespace Emby.Server.Implementations.Data
{ {
get 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); _logger.Info("Copying recording stream to file {0}", targetFile);
// The media source if infinite so we need to handle stopping ourselves // The media source if infinite so we need to handle stopping ourselves
//var durationToken = new CancellationTokenSource(duration); var durationToken = new CancellationTokenSource(duration);
//cancellationToken = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken, durationToken.Token).Token; cancellationToken = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken, durationToken.Token).Token;
await directStreamProvider.CopyToAsync(output, cancellationToken).ConfigureAwait(false); await directStreamProvider.CopyToAsync(output, cancellationToken).ConfigureAwait(false);
} }

6
MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
View File

@ -1664,15 +1664,15 @@ namespace MediaBrowser.Controller.MediaEncoding
if (mediaSource.VideoType.Value == VideoType.BluRay || mediaSource.VideoType.Value == VideoType.Dvd) if (mediaSource.VideoType.Value == VideoType.BluRay || mediaSource.VideoType.Value == VideoType.Dvd)
{ {
state.PlayableStreamFileNames = Video.QueryPlayableStreamFiles(state.MediaPath, mediaSource.VideoType.Value); state.PlayableStreamFileNames = Video.QueryPlayableStreamFiles(state.MediaPath, mediaSource.VideoType.Value).Select(Path.GetFileName).ToArray();
} }
else if (mediaSource.VideoType.Value == VideoType.Iso && state.IsoType == IsoType.BluRay) else if (mediaSource.VideoType.Value == VideoType.Iso && state.IsoType == IsoType.BluRay)
{ {
state.PlayableStreamFileNames = Video.QueryPlayableStreamFiles(state.MediaPath, VideoType.BluRay); state.PlayableStreamFileNames = Video.QueryPlayableStreamFiles(state.MediaPath, VideoType.BluRay).Select(Path.GetFileName).ToArray();
} }
else if (mediaSource.VideoType.Value == VideoType.Iso && state.IsoType == IsoType.Dvd) else if (mediaSource.VideoType.Value == VideoType.Iso && state.IsoType == IsoType.Dvd)
{ {
state.PlayableStreamFileNames = Video.QueryPlayableStreamFiles(state.MediaPath, VideoType.Dvd); state.PlayableStreamFileNames = Video.QueryPlayableStreamFiles(state.MediaPath, VideoType.Dvd).Select(Path.GetFileName).ToArray();
} }
else else
{ {

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

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

2
SharedVersion.cs
View File

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