Updated Console project following migration from Ninject to TinyIoC.

Related to issue #356.
ycastonguay · Feb 8, 2013 · 8641ed9 · 8641ed9
1 parent cc02711
commit 8641ed9
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 110 deletions.
diff --git a/MPfm/MPfm.Console/Lib/Ninject.dll b/MPfm/MPfm.Console/Lib/Ninject.dll
diff --git a/MPfm/MPfm.Console/MPfm.Console.csproj b/MPfm/MPfm.Console/MPfm.Console.csproj
@@ -47,16 +47,12 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
-    <Reference Include="Ninject">
-      <HintPath>Lib\Ninject.dll</HintPath>
-    </Reference>
     <Reference Include="Mono.Posix" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Main.cs" />
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="ConsoleHelper.cs" />
-    <Compile Include="PlayerTest.cs" />
     <Compile Include="MonoCurses\binding.cs" />
     <Compile Include="MonoCurses\constants.cs" />
     <Compile Include="MonoCurses\gui.cs" />
@@ -73,6 +69,10 @@
       <Project>{FEB7497C-784C-4380-874F-46FD93C82BA1}</Project>
       <Name>MPfm.Player</Name>
     </ProjectReference>
+    <ProjectReference Include="..\MPfm.Sound\MPfm.Sound.csproj">
+      <Project>{D92F718E-9A24-4B8B-9E40-77F93CF89EAE}</Project>
+      <Name>MPfm.Sound</Name>
+    </ProjectReference>
     <ProjectReference Include="..\MPfm.MVP\MPfm.MVP.csproj">
       <Project>{B6B0613C-FF39-479D-9EF0-31DAF9684A06}</Project>
       <Name>MPfm.MVP</Name>
@@ -81,17 +81,12 @@
       <Project>{2A62D229-D7FC-41DA-B676-BB1371659BFB}</Project>
       <Name>MPfm.Library</Name>
     </ProjectReference>
-    <ProjectReference Include="..\MPfm.Sound\MPfm.Sound.csproj">
-      <Project>{D92F718E-9A24-4B8B-9E40-77F93CF89EAE}</Project>
-      <Name>MPfm.Sound</Name>
-    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Lib\" />
     <Folder Include="MonoCurses\" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="Lib\Ninject.dll" />
     <None Include="Lib\libmono-curses.dylib" />
   </ItemGroup>
   <ProjectExtensions>

diff --git a/MPfm/MPfm.Console/Main.cs b/MPfm/MPfm.Console/Main.cs
@@ -26,12 +26,13 @@
 using System.Threading.Tasks;
 using Mono;
 using Mono.Terminal;
-using MPfm.MVP;
 using MPfm.Player;
 using MPfm.Sound;
-using MPfm.Sound.BassNetWrapper;
-using Ninject;
 using MPfm.Core;
+using MPfm.MVP.Services.Interfaces;
+using MPfm.Sound.AudioFiles;
+using MPfm.MVP.Bootstrapper;
+using MPfm.Sound.Bass.Net;
 
 namespace MPfm.Console
 {
@@ -187,15 +188,15 @@ public static void ExitApp()
         public static void InitializePlayer()
         {           
             // Initialize app
-            IInitializationService initService = Bootstrapper.GetKernel().Get<IInitializationService>();
+            IInitializationService initService = Bootstrapper.GetContainer().Resolve<IInitializationService>();
             initService.Initialize();
 
             // Initialize player
             Device device = new Device(){
                 DriverType = DriverType.DirectSound,
                 Id = -1
             };
-            playerService = Bootstrapper.GetKernel().Get<IPlayerService>();
+            playerService = Bootstrapper.GetContainer().Resolve<IPlayerService>();
             playerService.Initialize(device, 44100, 5000, 100);
             playerService.Player.Volume = 0.9f;
             //playerService.Player.OnPlaylistIndexChanged += HandlePlayerOnPlaylistIndexChanged;

diff --git a/MPfm/MPfm.Console/PlayerTest.cs b/MPfm/MPfm.Console/PlayerTest.cs