Skip to content

Commit cb05e46

Browse files
committed
WinGui:
- Remove built-in quicktime based video preview support. - Resigned the Preview window as a result. Currently only supports VLC launching, but will later add an option to use the systems default player for the format produced. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@3882 b64f7644-9d1e-0410-96f1-a4d463321fa5
1 parent 3dbaa1f commit cb05e46

File tree

9 files changed

+136
-476
lines changed

9 files changed

+136
-476
lines changed

win/CS/HandBrake.ApplicationServices/Services/QueueManager.cs

-7
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,6 @@ public class QueueManager : IQueueManager
5252
/// </summary>
5353
private int lastJobId;
5454

55-
/// <summary>
56-
/// The instance Id of this HandBrake instance.
57-
/// </summary>
58-
private int instanceId;
59-
6055
#endregion
6156

6257
/// <summary>
@@ -67,8 +62,6 @@ public class QueueManager : IQueueManager
6762
/// </param>
6863
public QueueManager(int instanceId)
6964
{
70-
this.instanceId = instanceId;
71-
7265
// If this is the first instance, just use the main queue file, otherwise add the instance id to the filename.
7366
this.queueFile = instanceId == 0 ? "hb_queue_recovery.xml" : string.Format("hb_queue_recovery{0}.xml", instanceId);
7467
}

win/CS/HandBrake.sln

-66
This file was deleted.

win/CS/HandBrakeCS.csproj

+5-24
Original file line numberDiff line numberDiff line change
@@ -145,9 +145,6 @@
145145
<Optimize>true</Optimize>
146146
</PropertyGroup>
147147
<ItemGroup>
148-
<Reference Include="AxInterop.QTOControlLib">
149-
<HintPath>libraries\AxInterop.QTOControlLib.dll</HintPath>
150-
</Reference>
151148
<Reference Include="Growl.Connector, Version=2.0.0.0, Culture=neutral, PublicKeyToken=980c2339411be384, processorArchitecture=x86">
152149
<SpecificVersion>False</SpecificVersion>
153150
<HintPath>libraries\Growl.Connector.dll</HintPath>
@@ -213,17 +210,17 @@
213210
<Compile Include="Controls\x264Panel.Designer.cs">
214211
<DependentUpon>x264Panel.cs</DependentUpon>
215212
</Compile>
216-
<Compile Include="Functions\ToolStripRenderOverride.cs" />
217-
<Compile Include="Model\ActivityLogMode.cs" />
218-
<Compile Include="Model\QueryPictureSettingsMode.cs" />
219-
<Compile Include="Model\QueryEncodeMode.cs" />
220-
<Compile Include="Properties\AssemblyInfo.cs" />
221213
<Compile Include="frmPreview.cs">
222214
<SubType>Form</SubType>
223215
</Compile>
224216
<Compile Include="frmPreview.Designer.cs">
225217
<DependentUpon>frmPreview.cs</DependentUpon>
226218
</Compile>
219+
<Compile Include="Functions\ToolStripRenderOverride.cs" />
220+
<Compile Include="Model\ActivityLogMode.cs" />
221+
<Compile Include="Model\QueryPictureSettingsMode.cs" />
222+
<Compile Include="Model\QueryEncodeMode.cs" />
223+
<Compile Include="Properties\AssemblyInfo.cs" />
227224
<Compile Include="frmAbout.cs">
228225
<SubType>Form</SubType>
229226
</Compile>
@@ -466,22 +463,6 @@
466463
</BootstrapperPackage>
467464
</ItemGroup>
468465
<ItemGroup>
469-
<COMReference Include="QTOControlLib">
470-
<Guid>{7B92F833-027D-402B-BFF9-A67697366F4E}</Guid>
471-
<VersionMajor>1</VersionMajor>
472-
<VersionMinor>0</VersionMinor>
473-
<Lcid>0</Lcid>
474-
<WrapperTool>tlbimp</WrapperTool>
475-
<Isolated>False</Isolated>
476-
</COMReference>
477-
<COMReference Include="QTOLibrary">
478-
<Guid>{29866AED-1E14-417D-BA0F-1A2BE6F5A19E}</Guid>
479-
<VersionMajor>1</VersionMajor>
480-
<VersionMinor>0</VersionMinor>
481-
<Lcid>0</Lcid>
482-
<WrapperTool>tlbimp</WrapperTool>
483-
<Isolated>False</Isolated>
484-
</COMReference>
485466
<COMReference Include="stdole">
486467
<Guid>{00020430-0000-0000-C000-000000000046}</Guid>
487468
<VersionMajor>2</VersionMajor>

win/CS/Installer/Installer.nsi

-3
Original file line numberDiff line numberDiff line change
@@ -126,9 +126,6 @@ Section "Handbrake" SEC01
126126
CreateDirectory "$SMPROGRAMS\Handbrake"
127127
CreateShortCut "$SMPROGRAMS\Handbrake\Handbrake.lnk" "$INSTDIR\Handbrake.exe"
128128
CreateShortCut "$DESKTOP\Handbrake.lnk" "$INSTDIR\Handbrake.exe"
129-
File "Interop.QTOLibrary.dll"
130-
File "Interop.QTOControlLib.dll"
131-
File "AxInterop.QTOControlLib.dll"
132129
File "Growl.Connector.dll"
133130
File "Growl.CoreLibrary.dll"
134131
File "Handbrake.exe.config"

win/CS/Installer/MakeNightly.nsi.tmpl

-3
Original file line numberDiff line numberDiff line change
@@ -126,9 +126,6 @@ Section "Handbrake" SEC01
126126
CreateDirectory "$SMPROGRAMS\Handbrake"
127127
CreateShortCut "$SMPROGRAMS\Handbrake\Handbrake.lnk" "$INSTDIR\Handbrake.exe"
128128
CreateShortCut "$DESKTOP\Handbrake.lnk" "$INSTDIR\Handbrake.exe"
129-
File "Interop.QTOLibrary.dll"
130-
File "Interop.QTOControlLib.dll"
131-
File "AxInterop.QTOControlLib.dll"
132129
File "Growl.Connector.dll"
133130
File "Growl.CoreLibrary.dll"
134131
File "Handbrake.exe.config"

0 commit comments

Comments
 (0)