WinGui:

- Added an implementation of IWindsorInstaller to the class libraries.

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@3634 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/win/C#/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj b/win/C#/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj
index ba0e3a64e880c591a840c68200a658dcbd741508..31cc44f7a3e743324a1bbe6ce022a74430afdc27 100644 (file)
--- a/win/C#/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj
+++ b/win/C#/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj
@@ -44,6 +44,9 @@
     <ErrorReport>prompt</ErrorReport>\r
   </PropertyGroup>\r
   <ItemGroup>\r
+    <Reference Include="Castle.Core, Version=1.2.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL" />\r
+    <Reference Include="Castle.MicroKernel, Version=2.1.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL" />\r
+    <Reference Include="Castle.Windsor, Version=2.1.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL" />\r
     <Reference Include="Growl.Connector, Version=2.0.0.0, Culture=neutral, PublicKeyToken=980c2339411be384, processorArchitecture=MSIL">\r
       <SpecificVersion>False</SpecificVersion>\r
       <HintPath>..\libraries\Growl.Connector.dll</HintPath>\r
@@ -105,6 +108,7 @@
     <Compile Include="Services\Interfaces\IScan.cs" />\r
     <Compile Include="Services\Queue.cs" />\r
     <Compile Include="Services\Scan.cs" />\r
+    <Compile Include="WindsorInstaller.cs" />\r
   </ItemGroup>\r
   <ItemGroup>\r
     <None Include="app.config" />\r

diff --git a/win/C#/HandBrake.ApplicationServices/WindsorInstaller.cs b/win/C#/HandBrake.ApplicationServices/WindsorInstaller.cs
new file mode 100644 (file)
index 0000000..a9bc473
--- /dev/null
+++ b/win/C#/HandBrake.ApplicationServices/WindsorInstaller.cs
@@ -0,0 +1,35 @@
+/*  WindsorInstaller.cs $\r
+    This file is part of the HandBrake source code.\r
+    Homepage: <http://handbrake.fr>.\r
+    It may be used under the terms of the GNU General Public License. */\r
+\r
+namespace HandBrake.ApplicationServices\r
+{\r
+    using Castle.MicroKernel;\r
+    using Castle.Windsor;\r
+\r
+    using HandBrake.ApplicationServices.Services;\r
+    using HandBrake.ApplicationServices.Services.Interfaces;\r
+\r
+    /// <summary>\r
+    /// This is the Windsor Installer class.\r
+    /// </summary>\r
+    public class WindsorInstaller : IWindsorInstaller\r
+    {\r
+        /// <summary>\r
+        /// Setup the Services for this Library\r
+        /// </summary>\r
+        /// <param name="container">\r
+        /// The container.\r
+        /// </param>\r
+        /// <param name="store">\r
+        /// The store.\r
+        /// </param>\r
+        public void Install(IWindsorContainer container, IConfigurationStore store)\r
+        {\r
+            container.AddComponent<IScan, ScanService>();\r
+            container.AddComponent<IQueue, Queue>();\r
+            container.AddComponent<IEncode, Encode>();\r
+        }\r
+    }\r
+}\r

diff --git a/win/C#/HandBrake.Framework/HandBrake.Framework.csproj b/win/C#/HandBrake.Framework/HandBrake.Framework.csproj
index ef4246d6a1e9f8262b572e7743b221b3deb08386..18f20ab133e9554c58873f5371bed8b03b2a1e5a 100644 (file)
--- a/win/C#/HandBrake.Framework/HandBrake.Framework.csproj
+++ b/win/C#/HandBrake.Framework/HandBrake.Framework.csproj
@@ -44,6 +44,9 @@
     <ErrorReport>prompt</ErrorReport>\r
   </PropertyGroup>\r
   <ItemGroup>\r
+    <Reference Include="Castle.Core, Version=1.2.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL" />\r
+    <Reference Include="Castle.MicroKernel, Version=2.1.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL" />\r
+    <Reference Include="Castle.Windsor, Version=2.1.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL" />\r
     <Reference Include="System" />\r
     <Reference Include="System.Core" />\r
     <Reference Include="System.Drawing" />\r
@@ -85,6 +88,7 @@
     <Compile Include="Views\UpdateInfo.Designer.cs">\r
       <DependentUpon>UpdateInfo.cs</DependentUpon>\r
     </Compile>\r
+    <Compile Include="WindsorInstaller.cs" />\r
   </ItemGroup>\r
   <ItemGroup>\r
     <EmbeddedResource Include="Properties\Resources.resx">\r

diff --git a/win/C#/HandBrake.Framework/WindsorInstaller.cs b/win/C#/HandBrake.Framework/WindsorInstaller.cs
new file mode 100644 (file)
index 0000000..0362c7f
--- /dev/null
+++ b/win/C#/HandBrake.Framework/WindsorInstaller.cs
@@ -0,0 +1,33 @@
+/*  WindsorInstaller.cs $\r
+    This file is part of the HandBrake source code.\r
+    Homepage: <http://handbrake.fr>.\r
+    It may be used under the terms of the GNU General Public License. */\r
+\r
+namespace HandBrake.Framework\r
+{\r
+    using Castle.MicroKernel;\r
+    using Castle.Windsor;\r
+\r
+    using HandBrake.Framework.Services;\r
+    using HandBrake.Framework.Services.Interfaces;\r
+\r
+    /// <summary>\r
+    /// This is the Windsor Installer class.\r
+    /// </summary>\r
+    public class WindsorInstaller : IWindsorInstaller\r
+    {\r
+        /// <summary>\r
+        /// Setup the Services for this Library\r
+        /// </summary>\r
+        /// <param name="container">\r
+        /// The container.\r
+        /// </param>\r
+        /// <param name="store">\r
+        /// The store.\r
+        /// </param>\r
+        public void Install(IWindsorContainer container, IConfigurationStore store)\r
+        {\r
+            container.AddComponent<IErrorService, ErrorService>();\r
+        }\r
+    }\r
+}\r

diff --git a/win/C#/Program.cs b/win/C#/Program.cs
index e702265d9c5dfe00fb2d44cb179b876dd8ad6d9f..e81ffd66c5ff026422587a01fcffef4f78a988c1 100644 (file)
--- a/win/C#/Program.cs
+++ b/win/C#/Program.cs
@@ -8,15 +8,17 @@ namespace Handbrake
     using System;\r
     using System.Diagnostics;\r
     using System.IO;\r
+    using System.Reflection;\r
     using System.Windows.Forms;\r
 \r
     using Caliburn.Castle;\r
 \r
-    using Castle.Core.Resource;\r
+    using Castle.MicroKernel;\r
     using Castle.Windsor;\r
-    using Castle.Windsor.Configuration.Interpreters;\r
 \r
     using HandBrake.ApplicationServices;\r
+    using HandBrake.Framework.Services;\r
+    using HandBrake.Framework.Services.Interfaces;\r
 \r
     using Handbrake.Presets;\r
     using Handbrake.Properties;\r
@@ -37,7 +39,12 @@ namespace Handbrake
         [STAThread]\r
         public static void Main(string[] args)\r
         {\r
-            WindsorContainer container = new WindsorContainer(new XmlInterpreter(new ConfigResource("castle")));\r
+            // WindsorContainer container = new WindsorContainer(new XmlInterpreter(new ConfigResource("castle")));\r
+            WindsorContainer container = new WindsorContainer();\r
+            // TODO Would be nice to find a way to do this automatically without having to reference the libraries specifically.\r
+            container.Install(new HandBrake.Framework.WindsorInstaller());\r
+            container.Install(new HandBrake.ApplicationServices.WindsorInstaller());\r
+\r
             ServiceLocator.SetLocatorProvider(() => new WindsorAdapter(container));\r
 \r
             InstanceId = Process.GetProcessesByName("HandBrake").Length;\r

diff --git a/win/C#/app.config b/win/C#/app.config
index 313c90e7a4386b8c2146c0de7abb4016db91c422..f3baa7e724eec77797415d8bf5a3054a59713861 100644 (file)
--- a/win/C#/app.config
+++ b/win/C#/app.config
@@ -145,12 +145,12 @@
   \r
   <startup />\r
   \r
-  <castle>\r
+  <!--<castle>\r
     <components>\r
       <component id="IErrorService"\r
                  service="HandBrake.Framework.Services.Interfaces.IErrorService, HandBrake.Framework"\r
                  type="HandBrake.Framework.Services.ErrorService, HandBrake.Framework"/>\r
     </components>\r
-  </castle>\r
+  </castle>-->\r
   \r
 </configuration>
\ No newline at end of file