diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-04-07 16:55:05 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-04-07 16:55:05 -0400 |
| commit | cb39f8e7b5f71dcf0de2681d953b016e29adbc54 (patch) | |
| tree | fd2ef9a2a8b284a8810ece7b6ead4df0da3d133d /MediaBrowser.ServerApplication | |
| parent | d14c3b31ff5665b03fee07aab46532fcf3069c1a (diff) | |
extracted a media encoding interface to keep ffmpeg out of nuget packages
Diffstat (limited to 'MediaBrowser.ServerApplication')
| -rw-r--r-- | MediaBrowser.ServerApplication/ApplicationHost.cs | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/MediaBrowser.ServerApplication/ApplicationHost.cs b/MediaBrowser.ServerApplication/ApplicationHost.cs index 90de11976..9bac7b9f2 100644 --- a/MediaBrowser.ServerApplication/ApplicationHost.cs +++ b/MediaBrowser.ServerApplication/ApplicationHost.cs @@ -6,6 +6,7 @@ using MediaBrowser.Common.Extensions; using MediaBrowser.Common.Implementations; using MediaBrowser.Common.Implementations.ScheduledTasks; using MediaBrowser.Common.IO; +using MediaBrowser.Common.MediaInfo; using MediaBrowser.Common.Net; using MediaBrowser.Controller; using MediaBrowser.Controller.Configuration; @@ -33,6 +34,7 @@ using MediaBrowser.Server.Implementations.Configuration; using MediaBrowser.Server.Implementations.HttpServer; using MediaBrowser.Server.Implementations.IO; using MediaBrowser.Server.Implementations.Library; +using MediaBrowser.Server.Implementations.MediaEncoder; using MediaBrowser.Server.Implementations.Providers; using MediaBrowser.Server.Implementations.ServerManager; using MediaBrowser.Server.Implementations.Udp; @@ -144,6 +146,8 @@ namespace MediaBrowser.ServerApplication /// <value>The display preferences manager.</value> internal IDisplayPreferencesManager DisplayPreferencesManager { get; set; } + private IMediaEncoder MediaEncoder { get; set; } + /// <summary> /// The full path to our startmenu shortcut /// </summary> @@ -220,6 +224,9 @@ namespace MediaBrowser.ServerApplication RegisterSingleInstance<ILibrarySearchEngine>(() => new LuceneSearchEngine()); + MediaEncoder = new MediaEncoder(LogManager.GetLogger("MediaEncoder"), ZipClient, ApplicationPaths, JsonSerializer); + RegisterSingleInstance(MediaEncoder); + await ConfigureRepositories().ConfigureAwait(false); SetKernelProperties(); SetStaticProperties(); @@ -230,7 +237,7 @@ namespace MediaBrowser.ServerApplication /// </summary> private void SetKernelProperties() { - ServerKernel.FFMpegManager = new FFMpegManager(ServerKernel, ZipClient, JsonSerializer, ProtobufSerializer, LogManager, ApplicationPaths); + ServerKernel.FFMpegManager = new FFMpegManager(ServerKernel, ApplicationPaths, MediaEncoder); ServerKernel.ImageManager = new ImageManager(ServerKernel, ProtobufSerializer, LogManager.GetLogger("ImageManager"), ApplicationPaths); Parallel.Invoke( |