diff options
| author | sr55 <[email protected]> | 2012-06-14 19:22:31 +0000 |
|---|---|---|
| committer | sr55 <[email protected]> | 2012-06-14 19:22:31 +0000 |
| commit | c3c5892ff08f931b0043d8c26e41b57f73f26205 (patch) | |
| tree | 81e0ce86b095aa03ca0fd3cf4053e58b2ddccaf8 /win/CS/HandBrakeWPF | |
| parent | a53a05ae0921b38cc1c9d3dd3dd5bab09a6c7f5f (diff) | |
WinGui: Fix build and further clean out some legacy code.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4735 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'win/CS/HandBrakeWPF')
6 files changed, 6 insertions, 13 deletions
diff --git a/win/CS/HandBrakeWPF/Installer/Installer.nsi b/win/CS/HandBrakeWPF/Installer/Installer.nsi index 9cee83635..c19c0e2ab 100644 --- a/win/CS/HandBrakeWPF/Installer/Installer.nsi +++ b/win/CS/HandBrakeWPF/Installer/Installer.nsi @@ -132,7 +132,6 @@ Section "Handbrake" SEC01 File "*.config"
File "*.xml"
File "*.pdb"
- File "*.html"
; Copy the standard doc set into the doc folder
SetOutPath "$INSTDIR\doc"
diff --git a/win/CS/HandBrakeWPF/Installer/Installer64.nsi b/win/CS/HandBrakeWPF/Installer/Installer64.nsi index 0413f60de..9e6ff4872 100644 --- a/win/CS/HandBrakeWPF/Installer/Installer64.nsi +++ b/win/CS/HandBrakeWPF/Installer/Installer64.nsi @@ -133,7 +133,6 @@ Section "Handbrake" SEC01 File "*.config"
File "*.xml"
File "*.pdb"
- File "*.html"
; Copy the standard doc set into the doc folder
SetOutPath "$INSTDIR\doc"
diff --git a/win/CS/HandBrakeWPF/Installer/MakeNightly.nsi.tmpl b/win/CS/HandBrakeWPF/Installer/MakeNightly.nsi.tmpl index 19429202d..07b9d6240 100644 --- a/win/CS/HandBrakeWPF/Installer/MakeNightly.nsi.tmpl +++ b/win/CS/HandBrakeWPF/Installer/MakeNightly.nsi.tmpl @@ -132,7 +132,6 @@ Section "Handbrake" SEC01 File "*.config"
File "*.xml"
File "*.pdb"
- File "*.html"
; Copy the standard doc set into the doc folder
SetOutPath "$INSTDIR\doc"
diff --git a/win/CS/HandBrakeWPF/Installer/MakeNightly64.nsi.tmpl b/win/CS/HandBrakeWPF/Installer/MakeNightly64.nsi.tmpl index 8dc420e38..15c35d248 100644 --- a/win/CS/HandBrakeWPF/Installer/MakeNightly64.nsi.tmpl +++ b/win/CS/HandBrakeWPF/Installer/MakeNightly64.nsi.tmpl @@ -132,7 +132,6 @@ Section "Handbrake" SEC01 File "*.config"
File "*.xml"
File "*.pdb"
- File "*.html"
; Copy the standard doc set into the doc folder
SetOutPath "$INSTDIR\doc"
diff --git a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs index 2e9ec5e64..156fc1dfa 100644 --- a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs +++ b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs @@ -899,11 +899,7 @@ namespace HandBrakeWPF.ViewModels return;
}
- QueueTask task = new QueueTask
- {
- Task = new EncodeTask(this.CurrentTask),
- Query = QueryGeneratorUtility.GenerateQuery(new EncodeTask(this.CurrentTask))
- };
+ QueueTask task = new QueueTask { Task = new EncodeTask(this.CurrentTask) };
this.queueProcessor.QueueManager.Add(task);
if (!this.IsEncoding)
@@ -1049,10 +1045,9 @@ namespace HandBrakeWPF.ViewModels }
// Create the Queue Task and Start Processing
- QueueTask task = new QueueTask(null)
+ QueueTask task = new QueueTask
{
Task = new EncodeTask(this.CurrentTask),
- Query = QueryGeneratorUtility.GenerateQuery(new EncodeTask(this.CurrentTask)),
CustomQuery = false
};
this.queueProcessor.QueueManager.Add(task);
diff --git a/win/CS/HandBrakeWPF/ViewModels/PreviewViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/PreviewViewModel.cs index e2efe673f..81aeb5e40 100644 --- a/win/CS/HandBrakeWPF/ViewModels/PreviewViewModel.cs +++ b/win/CS/HandBrakeWPF/ViewModels/PreviewViewModel.cs @@ -23,7 +23,6 @@ namespace HandBrakeWPF.ViewModels using HandBrake.ApplicationServices.Model;
using HandBrake.ApplicationServices.Model.Encoding;
using HandBrake.ApplicationServices.Services.Interfaces;
- using HandBrake.ApplicationServices.Utilities;
using HandBrakeWPF.Services.Interfaces;
using HandBrakeWPF.ViewModels.Interfaces;
@@ -277,10 +276,13 @@ namespace HandBrakeWPF.ViewModels this.CurrentlyPlaying = encodeTask.Destination.Replace(".m", "_sample.m");
+ // Setup the encode task as a preview encode
+ encodeTask.IsPreviewEncode = true;
+ encodeTask.PreviewEncodeStartAt = this.StartAt.ToString(CultureInfo.InvariantCulture);
+ encodeTask.PreviewEncodeDuration = this.Duration;
QueueTask task = new QueueTask
{
Task = encodeTask,
- Query = QueryGeneratorUtility.GeneratePreviewQuery(encodeTask, this.Duration, this.StartAt.ToString(CultureInfo.InvariantCulture)),
};
ThreadPool.QueueUserWorkItem(this.CreatePreview, task);
|