WinGui:

- Remove the Caliburn / Service Locator references. Not going to put this in the upcoming release. No need to bloat the installer with the dlls when they are not currently used.

git-svn-id: svn://localhost/HandBrake/trunk@3652 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/win/C#/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj b/win/C#/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj
index 81c1eb0..ba0e3a6 100644 (file)
--- a/win/C#/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj
+++ b/win/C#/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj
@@ -44,18 +44,6 @@
     <ErrorReport>prompt</ErrorReport>\r
   </PropertyGroup>\r
   <ItemGroup>\r
-    <Reference Include="Castle.Core, Version=1.2.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">\r
-      <SpecificVersion>False</SpecificVersion>\r
-      <HintPath>..\libraries\caliburn\Castle.Core.dll</HintPath>\r
-    </Reference>\r
-    <Reference Include="Castle.MicroKernel, Version=2.1.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">\r
-      <SpecificVersion>False</SpecificVersion>\r
-      <HintPath>..\libraries\caliburn\Castle.MicroKernel.dll</HintPath>\r
-    </Reference>\r
-    <Reference Include="Castle.Windsor, Version=2.1.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">\r
-      <SpecificVersion>False</SpecificVersion>\r
-      <HintPath>..\libraries\caliburn\Castle.Windsor.dll</HintPath>\r
-    </Reference>\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
@@ -117,7 +105,6 @@
     <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/Services/Encode.cs b/win/C#/HandBrake.ApplicationServices/Services/Encode.cs
index a0340c6..11e8967 100644 (file)
--- a/win/C#/HandBrake.ApplicationServices/Services/Encode.cs
+++ b/win/C#/HandBrake.ApplicationServices/Services/Encode.cs
@@ -330,6 +330,11 @@ namespace HandBrake.ApplicationServices.Services
         /// </param>\r
         private void HbProcess_Exited(object sender, EventArgs e)\r
         {\r
+            if (HbProcess != null && HbProcess.ExitCode != 0)\r
+            {\r
+                errorService.ShowError("It appears that HandBrakeCLI has crashed. You can check the Activity Log for further information.", string.Format("Exit Code was: {0}", HbProcess.ExitCode));\r
+            }\r
+\r
             IsEncoding = false;\r
             if (this.EncodeEnded != null)\r
                 this.EncodeEnded(this, new EventArgs());\r

diff --git a/win/C#/HandBrake.ApplicationServices/WindsorInstaller.cs b/win/C#/HandBrake.ApplicationServices/WindsorInstaller.cs
deleted file mode 100644 (file)
index a9bc473..0000000
--- a/win/C#/HandBrake.ApplicationServices/WindsorInstaller.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-/*  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 b050abc..30c5ea6 100644 (file)
--- a/win/C#/HandBrake.Framework/HandBrake.Framework.csproj
+++ b/win/C#/HandBrake.Framework/HandBrake.Framework.csproj
@@ -44,18 +44,6 @@
     <ErrorReport>prompt</ErrorReport>\r
   </PropertyGroup>\r
   <ItemGroup>\r
-    <Reference Include="Castle.Core, Version=1.2.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">\r
-      <SpecificVersion>False</SpecificVersion>\r
-      <HintPath>..\libraries\caliburn\Castle.Core.dll</HintPath>\r
-    </Reference>\r
-    <Reference Include="Castle.MicroKernel, Version=2.1.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">\r
-      <SpecificVersion>False</SpecificVersion>\r
-      <HintPath>..\libraries\caliburn\Castle.MicroKernel.dll</HintPath>\r
-    </Reference>\r
-    <Reference Include="Castle.Windsor, Version=2.1.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">\r
-      <SpecificVersion>False</SpecificVersion>\r
-      <HintPath>..\libraries\caliburn\Castle.Windsor.dll</HintPath>\r
-    </Reference>\r
     <Reference Include="System" />\r
     <Reference Include="System.Core" />\r
     <Reference Include="System.Drawing" />\r
@@ -98,7 +86,6 @@
     <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
deleted file mode 100644 (file)
index 87bdbf0..0000000
--- a/win/C#/HandBrake.Framework/WindsorInstaller.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-/*  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
-            container.AddComponent<IAppcastReader, AppcastReader>();\r
-        }\r
-    }\r
-}\r

diff --git a/win/C#/HandBrakeCS.csproj b/win/C#/HandBrakeCS.csproj
index f4fd4fb..1d2a139 100644 (file)
--- a/win/C#/HandBrakeCS.csproj
+++ b/win/C#/HandBrakeCS.csproj
@@ -144,29 +144,6 @@
     <Optimize>true</Optimize>\r
   </PropertyGroup>\r
   <ItemGroup>\r
-    <Reference Include="Caliburn.Castle, Version=1.1.0.49753, Culture=neutral, PublicKeyToken=8e5891231f2ed21f, processorArchitecture=MSIL">\r
-      <SpecificVersion>False</SpecificVersion>\r
-      <HintPath>libraries\caliburn\Caliburn.Castle.dll</HintPath>\r
-    </Reference>\r
-    <Reference Include="Caliburn.Core, Version=1.1.0.49753, Culture=neutral, PublicKeyToken=8e5891231f2ed21f, processorArchitecture=MSIL">\r
-      <SpecificVersion>False</SpecificVersion>\r
-      <HintPath>libraries\caliburn\Caliburn.Core.dll</HintPath>\r
-    </Reference>\r
-    <Reference Include="Castle.Core, Version=1.2.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">\r
-      <SpecificVersion>False</SpecificVersion>\r
-      <HintPath>libraries\caliburn\Castle.Core.dll</HintPath>\r
-      <Private>True</Private>\r
-    </Reference>\r
-    <Reference Include="Castle.MicroKernel, Version=2.1.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">\r
-      <SpecificVersion>False</SpecificVersion>\r
-      <HintPath>libraries\caliburn\Castle.MicroKernel.dll</HintPath>\r
-      <Private>True</Private>\r
-    </Reference>\r
-    <Reference Include="Castle.Windsor, Version=2.1.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">\r
-      <SpecificVersion>False</SpecificVersion>\r
-      <HintPath>libraries\caliburn\Castle.Windsor.dll</HintPath>\r
-      <Private>True</Private>\r
-    </Reference>\r
     <Reference Include="Growl.Connector, Version=2.0.0.0, Culture=neutral, PublicKeyToken=980c2339411be384, processorArchitecture=x86">\r
       <SpecificVersion>False</SpecificVersion>\r
       <HintPath>libraries\Growl.Connector.dll</HintPath>\r
@@ -177,10 +154,6 @@
       <HintPath>libraries\Growl.CoreLibrary.dll</HintPath>\r
       <Private>True</Private>\r
     </Reference>\r
-    <Reference Include="Microsoft.Practices.ServiceLocation, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">\r
-      <SpecificVersion>False</SpecificVersion>\r
-      <HintPath>libraries\caliburn\Microsoft.Practices.ServiceLocation.dll</HintPath>\r
-    </Reference>\r
     <Reference Include="PresentationCore">\r
       <RequiredTargetFramework>3.0</RequiredTargetFramework>\r
     </Reference>\r
@@ -204,7 +177,6 @@
     <Reference Include="WindowsBase, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">\r
       <RequiredTargetFramework>3.0</RequiredTargetFramework>\r
     </Reference>\r
-    <Reference Include="WindowsFormsIntegration, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />\r
   </ItemGroup>\r
   <ItemGroup>\r
     <Compile Include="Controls\AudioPanel.cs">\r

diff --git a/win/C#/Installer/Installer.nsi b/win/C#/Installer/Installer.nsi
index 1b8320e..0ea0cb9 100644 (file)
--- a/win/C#/Installer/Installer.nsi
+++ b/win/C#/Installer/Installer.nsi
@@ -139,13 +139,13 @@ Section "Handbrake" SEC01
   File "Microsoft.WindowsAPICodePack.Shell.dll"\r
   File "Microsoft.WindowsAPICodePack.dll"\r
 \r
-  File "Caliburn.Castle.dll"\r
-  File "Caliburn.Core.dll"\r
-  File "Castle.Core.dll"\r
-  File "Castle.DynamicProxy2.dll"\r
-  File "Castle.MicroKernel.dll"\r
-  File "Castle.Windsor.dll"\r
-  File "Microsoft.Practices.ServiceLocation.dll"\r
+  ;File "Caliburn.Castle.dll"\r
+  ;File "Caliburn.Core.dll"\r
+  ;File "Castle.Core.dll"\r
+  ;File "Castle.DynamicProxy2.dll"\r
+  ;File "Castle.MicroKernel.dll"\r
+  ;File "Castle.Windsor.dll"\r
+  ;File "Microsoft.Practices.ServiceLocation.dll"\r
  \r
   SetOutPath "$INSTDIR\doc"\r
   SetOverwrite ifnewer\r

diff --git a/win/C#/Installer/MakeNightly.nsi.tmpl b/win/C#/Installer/MakeNightly.nsi.tmpl
index ef9f666..55db341 100644 (file)
--- a/win/C#/Installer/MakeNightly.nsi.tmpl
+++ b/win/C#/Installer/MakeNightly.nsi.tmpl
@@ -137,13 +137,13 @@ Section "Handbrake" SEC01
   File "Microsoft.WindowsAPICodePack.Shell.dll"\r
   File "Microsoft.WindowsAPICodePack.dll"\r
 \r
-  File "Caliburn.Castle.dll"\r
-  File "Caliburn.Core.dll"\r
-  File "Castle.Core.dll"\r
-  File "Castle.DynamicProxy2.dll"\r
-  File "Castle.MicroKernel.dll"\r
-  File "Castle.Windsor.dll"\r
-  File "Microsoft.Practices.ServiceLocation.dll"\r
+  ;File "Caliburn.Castle.dll"\r
+  ;File "Caliburn.Core.dll"\r
+  ;File "Castle.Core.dll"\r
+  ;File "Castle.DynamicProxy2.dll"\r
+  ;File "Castle.MicroKernel.dll"\r
+  ;File "Castle.Windsor.dll"\r
+  ;File "Microsoft.Practices.ServiceLocation.dll"\r
 \r
   ; Copy the standard doc set into the doc folder\r
   SetOutPath "$INSTDIR\doc"\r

diff --git a/win/C#/Program.cs b/win/C#/Program.cs
index e81ffd6..24d1507 100644 (file)
--- a/win/C#/Program.cs
+++ b/win/C#/Program.cs
@@ -8,23 +8,13 @@ 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.MicroKernel;\r
-    using Castle.Windsor;\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
 \r
-    using Microsoft.Practices.ServiceLocation;\r
-\r
     /// <summary>\r
     /// HandBrake Starts Here\r
     /// </summary>\r
@@ -39,14 +29,6 @@ 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();\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
 \r
             // Handle any unhandled exceptions\r