Switched to MEF as a means to locate plugins and resolvers

3 files changed, 8 insertions, 5 deletions

diff --git a/MediaBrowser.Controller/Resolvers/AudioResolver.cs b/MediaBrowser.Controller/Resolvers/AudioResolver.cs
index 2ca54e71d4..956af95f05 100644
--- a/MediaBrowser.Controller/Resolvers/AudioResolver.cs
+++ b/MediaBrowser.Controller/Resolvers/AudioResolver.cs
@@ -1,9 +1,11 @@
-using System.IO;

+using System.ComponentModel.Composition;

+using System.IO;

 using MediaBrowser.Controller.Events;

 using MediaBrowser.Model.Entities;

 

 namespace MediaBrowser.Controller.Resolvers

 {

+    [Export(typeof(IBaseItemResolver))]

     public class AudioResolver : BaseItemResolver<Audio>

     {

         protected override Audio Resolve(ItemResolveEventArgs args)

diff --git a/MediaBrowser.Controller/Resolvers/FolderResolver.cs b/MediaBrowser.Controller/Resolvers/FolderResolver.cs
index 6101a45fd8..bd91ec2bac 100644
--- a/MediaBrowser.Controller/Resolvers/FolderResolver.cs
+++ b/MediaBrowser.Controller/Resolvers/FolderResolver.cs
@@ -1,12 +1,11 @@
-using System.Collections.Generic;

-using System.IO;

-using System.Linq;

+using System.ComponentModel.Composition;

 using MediaBrowser.Controller.Events;

-using MediaBrowser.Model.Entities;

 using MediaBrowser.Controller.Xml;

+using MediaBrowser.Model.Entities;

 

 namespace MediaBrowser.Controller.Resolvers

 {

+    [Export(typeof(IBaseItemResolver))]

     public class FolderResolver : BaseFolderResolver<Folder>

     {

         protected override Folder Resolve(ItemResolveEventArgs args)

diff --git a/MediaBrowser.Controller/Resolvers/VideoResolver.cs b/MediaBrowser.Controller/Resolvers/VideoResolver.cs
index df304c3290..c91f39a9b4 100644
--- a/MediaBrowser.Controller/Resolvers/VideoResolver.cs
+++ b/MediaBrowser.Controller/Resolvers/VideoResolver.cs
@@ -1,4 +1,5 @@
 using System.Collections.Generic;

+using System.ComponentModel.Composition;

 using System.IO;

 using MediaBrowser.Controller.Events;

 using MediaBrowser.Model.Entities;

@@ -8,6 +9,7 @@ namespace MediaBrowser.Controller.Resolvers
     /// <summary>

     /// Resolves a Path into a Video

     /// </summary>

+    [Export(typeof(IBaseItemResolver))]

     public class VideoResolver : BaseVideoResolver<Video>

     {

     }