diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2014-06-13 10:24:34 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2014-06-13 10:24:34 -0400 |
| commit | ffc4db41282be2d0762cbd198f14bbe0c9bd1540 (patch) | |
| tree | 6267717daada8d8c6f4b84fffc3e23ed516cfd8a /MediaBrowser.ServerApplication/ApplicationHost.cs | |
| parent | 6186618f3ef6739f2cb0ff05f10ec17935b14d99 (diff) | |
| parent | f0d8dbefdbe49361563ec9d56cba5fbae542b015 (diff) | |
Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser
Conflicts:
MediaBrowser.MediaEncoding/Subtitles/VttWriter.cs
Diffstat (limited to 'MediaBrowser.ServerApplication/ApplicationHost.cs')
| -rw-r--r-- | MediaBrowser.ServerApplication/ApplicationHost.cs | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/MediaBrowser.ServerApplication/ApplicationHost.cs b/MediaBrowser.ServerApplication/ApplicationHost.cs index 675e67041..1c1595093 100644 --- a/MediaBrowser.ServerApplication/ApplicationHost.cs +++ b/MediaBrowser.ServerApplication/ApplicationHost.cs @@ -722,10 +722,14 @@ namespace MediaBrowser.ServerApplication GetExports<IBaseItemComparer>(), GetExports<ILibraryPostScanTask>()); - ProviderManager.AddParts(GetExports<IImageProvider>(), GetExports<IMetadataService>(), GetExports<IMetadataProvider>(), - GetExports<IMetadataSaver>(), - GetExports<IImageSaver>(), - GetExports<IExternalId>()); + ProviderManager.AddParts(GetExports<IImageProvider>(), + GetExports<IMetadataService>(), + GetExports<IItemIdentityProvider>(), + GetExports<IItemIdentityConverter>(), + GetExports<IMetadataProvider>(), + GetExports<IMetadataSaver>(), + GetExports<IImageSaver>(), + GetExports<IExternalId>()); SeriesOrderManager.AddParts(GetExports<ISeriesOrderProvider>()); |