mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-09-06 11:34:57 +02:00
commit
64493dbbf4
6 changed files with 16 additions and 0 deletions
|
@ -940,8 +940,10 @@ namespace MediaBrowser.Api.Playback
|
|||
// MUST read both stdout and stderr asynchronously or a deadlock may occurr
|
||||
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
|
||||
process.StandardError.BaseStream.CopyToAsync(state.LogFileStream);
|
||||
#pragma warning restore 4014
|
||||
|
||||
// Wait for the file to exist before proceeeding
|
||||
while (!File.Exists(outputPath))
|
||||
|
|
|
@ -57,6 +57,8 @@ namespace MediaBrowser.Model.Configuration
|
|||
|
||||
public UnratedItem[] BlockUnratedItems { get; set; }
|
||||
|
||||
public bool DisplayMovieFormatRibbons { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Initializes a new instance of the <see cref="UserConfiguration" /> class.
|
||||
/// </summary>
|
||||
|
|
|
@ -886,8 +886,10 @@ namespace MediaBrowser.Server.Implementations.MediaEncoder
|
|||
|
||||
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
|
||||
process.StandardOutput.BaseStream.CopyToAsync(memoryStream);
|
||||
#pragma warning restore 4014
|
||||
|
||||
// MUST read both stdout and stderr asynchronously or a deadlock may occurr
|
||||
process.BeginErrorReadLine();
|
||||
|
|
|
@ -760,7 +760,9 @@ namespace MediaBrowser.ServerApplication
|
|||
#if DEBUG
|
||||
return false;
|
||||
#endif
|
||||
#pragma warning disable 162
|
||||
return NativeApp.CanSelfUpdate;
|
||||
#pragma warning restore 162
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -518,6 +518,9 @@ namespace MediaBrowser.WebDashboard.Api
|
|||
"logpage.js",
|
||||
"medialibrarypage.js",
|
||||
"mediaplayer.js",
|
||||
|
||||
"mediaplayer-video.js",
|
||||
|
||||
"metadataconfigurationpage.js",
|
||||
"metadataimagespage.js",
|
||||
"moviegenres.js",
|
||||
|
|
|
@ -201,6 +201,8 @@
|
|||
<Content Include="dashboard-ui\css\images\items\list\remotesearch.png">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</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">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
|
@ -549,6 +551,9 @@
|
|||
<Content Include="dashboard-ui\scripts\editorsidebar.js">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="dashboard-ui\scripts\mediaplayer-video.js">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="dashboard-ui\scripts\movieslatest.js">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
|
|
Loading…
Reference in a new issue