Backupppert/jellyfin
0
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2024-07-11 00:01:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

switch to shared image editor

Browse source
This commit is contained in:
Luke Pulverenti 2016-08-30 02:06:24 -04:00
parent f5c4fd7690
commit 6b3e1951e2
3 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
MediaBrowser.Server.Implementations/MediaEncoder/EncodingManager.cs
View file

@ -30,12 +30,13 @@ namespace MediaBrowser.Server.Implementations.MediaEncoder
public EncodingManager(IFileSystem fileSystem, public EncodingManager(IFileSystem fileSystem,
ILogger logger, ILogger logger,
IMediaEncoder encoder, IMediaEncoder encoder,
IChapterManager chapterManager) IChapterManager chapterManager, ILibraryManager libraryManager)
{ {
_fileSystem = fileSystem; _fileSystem = fileSystem;
_logger = logger; _logger = logger;
_encoder = encoder; _encoder = encoder;
_chapterManager = chapterManager; _chapterManager = chapterManager;
_libraryManager = libraryManager;
} }
/// <summary> /// <summary>

2
MediaBrowser.Server.Startup.Common/ApplicationHost.cs
View file

@ -547,7 +547,7 @@ namespace MediaBrowser.Server.Startup.Common
await RegisterMediaEncoder(innerProgress).ConfigureAwait(false); await RegisterMediaEncoder(innerProgress).ConfigureAwait(false);
progress.Report(90); progress.Report(90);
EncodingManager = new EncodingManager(FileSystemManager, Logger, MediaEncoder, ChapterManager); EncodingManager = new EncodingManager(FileSystemManager, Logger, MediaEncoder, ChapterManager, LibraryManager);
RegisterSingleInstance(EncodingManager); RegisterSingleInstance(EncodingManager);
RegisterSingleInstance(NativeApp.GetPowerManagement()); RegisterSingleInstance(NativeApp.GetPowerManagement());

6
MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
View file

@ -281,9 +281,6 @@
<Content Include="dashboard-ui\css\nowplayingbar.css"> <Content Include="dashboard-ui\css\nowplayingbar.css">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
<Content Include="dashboard-ui\components\imageeditor\imageeditor.template.html">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="dashboard-ui\favorites.html"> <Content Include="dashboard-ui\favorites.html">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
@ -1086,9 +1083,6 @@
<Content Include="dashboard-ui\music.html"> <Content Include="dashboard-ui\music.html">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
<Content Include="dashboard-ui\components\imageeditor\imageeditor.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="dashboard-ui\scripts\edititemmetadata.js"> <Content Include="dashboard-ui\scripts\edititemmetadata.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>