Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-08-07 09:01:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #731 from timhobbs/master

Browse Source 
Video player updates
This commit is contained in:
Luke 2014-03-13 11:31:59 -04:00
commit 64493dbbf4
6 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -940,8 +940,10 @@ namespace MediaBrowser.Api.Playback
// MUST read both stdout and stderr asynchronously or a deadlock may occurr // MUST read both stdout and stderr asynchronously or a deadlock may occurr
process.BeginOutputReadLine(); process.BeginOutputReadLine();
#pragma warning disable 4014
// Important - don't await the log task or we won't be able to kill ffmpeg when the user stops playback // Important - don't await the log task or we won't be able to kill ffmpeg when the user stops playback
process.StandardError.BaseStream.CopyToAsync(state.LogFileStream); process.StandardError.BaseStream.CopyToAsync(state.LogFileStream);
#pragma warning restore 4014
// Wait for the file to exist before proceeeding // Wait for the file to exist before proceeeding
while (!File.Exists(outputPath)) while (!File.Exists(outputPath))

2
MediaBrowser.Model/Configuration/UserConfiguration.cs
View File

@ -57,6 +57,8 @@ namespace MediaBrowser.Model.Configuration
public UnratedItem[] BlockUnratedItems { get; set; } public UnratedItem[] BlockUnratedItems { get; set; }
public bool DisplayMovieFormatRibbons { get; set; }
/// <summary> /// <summary>
/// Initializes a new instance of the <see cref="UserConfiguration" /> class. /// Initializes a new instance of the <see cref="UserConfiguration" /> class.
/// </summary> /// </summary>

2
MediaBrowser.Server.Implementations/MediaEncoder/MediaEncoder.cs
View File

@ -886,8 +886,10 @@ namespace MediaBrowser.Server.Implementations.MediaEncoder
var memoryStream = new MemoryStream(); var memoryStream = new MemoryStream();
#pragma warning disable 4014
// Important - don't await the log task or we won't be able to kill ffmpeg when the user stops playback // Important - don't await the log task or we won't be able to kill ffmpeg when the user stops playback
process.StandardOutput.BaseStream.CopyToAsync(memoryStream); process.StandardOutput.BaseStream.CopyToAsync(memoryStream);
#pragma warning restore 4014
// MUST read both stdout and stderr asynchronously or a deadlock may occurr // MUST read both stdout and stderr asynchronously or a deadlock may occurr
process.BeginErrorReadLine(); process.BeginErrorReadLine();

2
MediaBrowser.ServerApplication/ApplicationHost.cs
View File

@ -760,7 +760,9 @@ namespace MediaBrowser.ServerApplication
#if DEBUG #if DEBUG
return false; return false;
#endif #endif
#pragma warning disable 162
return NativeApp.CanSelfUpdate; return NativeApp.CanSelfUpdate;
#pragma warning restore 162
} }
} }

3
MediaBrowser.WebDashboard/Api/DashboardService.cs
View File

@ -518,6 +518,9 @@ namespace MediaBrowser.WebDashboard.Api
"logpage.js", "logpage.js",
"medialibrarypage.js", "medialibrarypage.js",
"mediaplayer.js", "mediaplayer.js",
"mediaplayer-video.js",
"metadataconfigurationpage.js", "metadataconfigurationpage.js",
"metadataimagespage.js", "metadataimagespage.js",
"moviegenres.js", "moviegenres.js",

5
MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
View File

@ -201,6 +201,8 @@
<Content Include="dashboard-ui\css\images\items\list\remotesearch.png"> <Content Include="dashboard-ui\css\images\items\list\remotesearch.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
<Content Include="dashboard-ui\css\images\media\pause.png" />
<Content Include="dashboard-ui\css\images\media\play.png" />
<Content Include="dashboard-ui\css\images\media\tvflyout.png"> <Content Include="dashboard-ui\css\images\media\tvflyout.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
@ -549,6 +551,9 @@
<Content Include="dashboard-ui\scripts\editorsidebar.js"> <Content Include="dashboard-ui\scripts\editorsidebar.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
<Content Include="dashboard-ui\scripts\mediaplayer-video.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="dashboard-ui\scripts\movieslatest.js"> <Content Include="dashboard-ui\scripts\movieslatest.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>