aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.ServerApplication/ApplicationHost.cs
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2013-06-18 15:16:27 -0400
committerLuke Pulverenti <luke.pulverenti@gmail.com>2013-06-18 15:16:27 -0400
commit13f6da1bf43e592264afbf48f0c99015435b8c7e (patch)
tree519343b21a721a5728c967a12fda71f2d1389aca /MediaBrowser.ServerApplication/ApplicationHost.cs
parent6de9e2491f2180d36c07e19b19e8b9e8de8f7ab0 (diff)
removed chapters from baseitem
Diffstat (limited to 'MediaBrowser.ServerApplication/ApplicationHost.cs')
-rw-r--r--MediaBrowser.ServerApplication/ApplicationHost.cs19
1 files changed, 4 insertions, 15 deletions
diff --git a/MediaBrowser.ServerApplication/ApplicationHost.cs b/MediaBrowser.ServerApplication/ApplicationHost.cs
index 24093a181..0df0d36f9 100644
--- a/MediaBrowser.ServerApplication/ApplicationHost.cs
+++ b/MediaBrowser.ServerApplication/ApplicationHost.cs
@@ -161,12 +161,6 @@ namespace MediaBrowser.ServerApplication
private IHttpServer HttpServer { get; set; }
/// <summary>
- /// Gets or sets the display preferences manager.
- /// </summary>
- /// <value>The display preferences manager.</value>
- internal IDisplayPreferencesManager DisplayPreferencesManager { get; set; }
-
- /// <summary>
/// Gets or sets the media encoder.
/// </summary>
/// <value>The media encoder.</value>
@@ -180,7 +174,7 @@ namespace MediaBrowser.ServerApplication
/// <value>The user data repository.</value>
private IUserDataRepository UserDataRepository { get; set; }
private IUserRepository UserRepository { get; set; }
- private IDisplayPreferencesRepository DisplayPreferencesRepository { get; set; }
+ internal IDisplayPreferencesRepository DisplayPreferencesRepository { get; set; }
private IItemRepository ItemRepository { get; set; }
/// <summary>
@@ -271,9 +265,6 @@ namespace MediaBrowser.ServerApplication
ProviderManager = new ProviderManager(HttpClient, ServerConfigurationManager, DirectoryWatchers, LogManager);
RegisterSingleInstance(ProviderManager);
- DisplayPreferencesManager = new DisplayPreferencesManager(LogManager.GetLogger("DisplayPreferencesManager"));
- RegisterSingleInstance(DisplayPreferencesManager);
-
RegisterSingleInstance<ILibrarySearchEngine>(() => new LuceneSearchEngine(ApplicationPaths, LogManager, LibraryManager));
MediaEncoder = new MediaEncoder(LogManager.GetLogger("MediaEncoder"), ZipClient, ApplicationPaths, JsonSerializer);
@@ -306,10 +297,10 @@ namespace MediaBrowser.ServerApplication
/// </summary>
private void SetKernelProperties()
{
- ServerKernel.ImageManager = new ImageManager(ServerKernel, LogManager.GetLogger("ImageManager"),
- ApplicationPaths);
+ ServerKernel.ImageManager = new ImageManager(LogManager.GetLogger("ImageManager"),
+ ApplicationPaths, ItemRepository);
Parallel.Invoke(
- () => ServerKernel.FFMpegManager = new FFMpegManager(ApplicationPaths, MediaEncoder, LibraryManager, Logger),
+ () => ServerKernel.FFMpegManager = new FFMpegManager(ApplicationPaths, MediaEncoder, LibraryManager, Logger, ItemRepository),
() => ServerKernel.WeatherProviders = GetExports<IWeatherProvider>(),
() => ServerKernel.ImageManager.ImageEnhancers = GetExports<IImageEnhancer>().OrderBy(e => e.Priority).ToArray(),
() => LocalizedStrings.StringFiles = GetExports<LocalizedStringData>(),
@@ -324,8 +315,6 @@ namespace MediaBrowser.ServerApplication
private async Task ConfigureDisplayPreferencesRepositories()
{
await DisplayPreferencesRepository.Initialize().ConfigureAwait(false);
-
- ((DisplayPreferencesManager)DisplayPreferencesManager).Repository = DisplayPreferencesRepository;
}
/// <summary>