summaryrefslogtreecommitdiffstats
path: root/win/C#/HandBrake.ApplicationServices
diff options
context:
space:
mode:
Diffstat (limited to 'win/C#/HandBrake.ApplicationServices')
-rw-r--r--win/C#/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj13
-rw-r--r--win/C#/HandBrake.ApplicationServices/Services/Encode.cs5
-rw-r--r--win/C#/HandBrake.ApplicationServices/WindsorInstaller.cs35
3 files changed, 5 insertions, 48 deletions
diff --git a/win/C#/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj b/win/C#/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj
index 81c1eb040..ba0e3a64e 100644
--- a/win/C#/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj
+++ b/win/C#/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj
@@ -44,18 +44,6 @@
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Castle.Core, Version=1.2.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\libraries\caliburn\Castle.Core.dll</HintPath>
- </Reference>
- <Reference Include="Castle.MicroKernel, Version=2.1.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\libraries\caliburn\Castle.MicroKernel.dll</HintPath>
- </Reference>
- <Reference Include="Castle.Windsor, Version=2.1.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\libraries\caliburn\Castle.Windsor.dll</HintPath>
- </Reference>
<Reference Include="Growl.Connector, Version=2.0.0.0, Culture=neutral, PublicKeyToken=980c2339411be384, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\libraries\Growl.Connector.dll</HintPath>
@@ -117,7 +105,6 @@
<Compile Include="Services\Interfaces\IScan.cs" />
<Compile Include="Services\Queue.cs" />
<Compile Include="Services\Scan.cs" />
- <Compile Include="WindsorInstaller.cs" />
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
diff --git a/win/C#/HandBrake.ApplicationServices/Services/Encode.cs b/win/C#/HandBrake.ApplicationServices/Services/Encode.cs
index a0340c656..11e896768 100644
--- 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>
private void HbProcess_Exited(object sender, EventArgs e)
{
+ if (HbProcess != null && HbProcess.ExitCode != 0)
+ {
+ 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));
+ }
+
IsEncoding = false;
if (this.EncodeEnded != null)
this.EncodeEnded(this, new EventArgs());
diff --git a/win/C#/HandBrake.ApplicationServices/WindsorInstaller.cs b/win/C#/HandBrake.ApplicationServices/WindsorInstaller.cs
deleted file mode 100644
index a9bc473a2..000000000
--- a/win/C#/HandBrake.ApplicationServices/WindsorInstaller.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-/* WindsorInstaller.cs $
- This file is part of the HandBrake source code.
- Homepage: <http://handbrake.fr>.
- It may be used under the terms of the GNU General Public License. */
-
-namespace HandBrake.ApplicationServices
-{
- using Castle.MicroKernel;
- using Castle.Windsor;
-
- using HandBrake.ApplicationServices.Services;
- using HandBrake.ApplicationServices.Services.Interfaces;
-
- /// <summary>
- /// This is the Windsor Installer class.
- /// </summary>
- public class WindsorInstaller : IWindsorInstaller
- {
- /// <summary>
- /// Setup the Services for this Library
- /// </summary>
- /// <param name="container">
- /// The container.
- /// </param>
- /// <param name="store">
- /// The store.
- /// </param>
- public void Install(IWindsorContainer container, IConfigurationStore store)
- {
- container.AddComponent<IScan, ScanService>();
- container.AddComponent<IQueue, Queue>();
- container.AddComponent<IEncode, Encode>();
- }
- }
-}