diff options
| author | sr55 <[email protected]> | 2015-03-07 22:54:38 +0000 |
|---|---|---|
| committer | sr55 <[email protected]> | 2015-03-07 22:54:38 +0000 |
| commit | 24f6d27cf9d979ab0743665b37e60fd1295776d1 (patch) | |
| tree | 7181504b621d9dcf6c3e59990c135ec72ed84a3c /win/CS/HandBrakeWPF | |
| parent | 7705413a03a90c16734b40fb7bc492be8b56ab6f (diff) | |
WinGui: Updating the app to handle the latest JSON API change regarding the Automatic title scan on encode. This Simplifies the API in the services library.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6977 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'win/CS/HandBrakeWPF')
| -rw-r--r-- | win/CS/HandBrakeWPF/Services/QueueProcessor.cs | 2 | ||||
| -rw-r--r-- | win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs | 10 | ||||
| -rw-r--r-- | win/CS/HandBrakeWPF/ViewModels/PictureSettingsViewModel.cs | 24 |
3 files changed, 8 insertions, 28 deletions
diff --git a/win/CS/HandBrakeWPF/Services/QueueProcessor.cs b/win/CS/HandBrakeWPF/Services/QueueProcessor.cs index 414113d2f..a6dfe83c4 100644 --- a/win/CS/HandBrakeWPF/Services/QueueProcessor.cs +++ b/win/CS/HandBrakeWPF/Services/QueueProcessor.cs @@ -451,7 +451,7 @@ namespace HandBrakeWPF.Services this.EncodeService.EncodeCompleted -= this.EncodeServiceEncodeCompleted;
this.EncodeService.EncodeCompleted += this.EncodeServiceEncodeCompleted;
- if (this.EncodeService.CanPause && this.EncodeService.IsEncoding)
+ if (this.EncodeService.IsEncoding)
{
this.EncodeService.Resume();
}
diff --git a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs index 9c46008f8..88aa0c9e9 100644 --- a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs +++ b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs @@ -605,7 +605,7 @@ namespace HandBrakeWPF.ViewModels set
{
this.isEncoding = value;
- this.CanPause = value && this.encodeService.CanPause;
+ this.CanPause = value;
this.NotifyOfPropertyChange(() => this.IsEncoding);
}
}
@@ -1435,12 +1435,8 @@ namespace HandBrakeWPF.ViewModels public void PauseEncode()
{
this.queueProcessor.Pause();
-
- if (this.encodeService.CanPause)
- {
- this.encodeService.Pause();
- this.IsEncoding = false;
- }
+ this.encodeService.Pause();
+ this.IsEncoding = false;
}
/// <summary>
diff --git a/win/CS/HandBrakeWPF/ViewModels/PictureSettingsViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/PictureSettingsViewModel.cs index 24bff58e6..1dd0ad93c 100644 --- a/win/CS/HandBrakeWPF/ViewModels/PictureSettingsViewModel.cs +++ b/win/CS/HandBrakeWPF/ViewModels/PictureSettingsViewModel.cs @@ -923,26 +923,10 @@ namespace HandBrakeWPF.ViewModels // Step 2, For the changed field, call hb_set_anamorphic_size and process the results.
PictureSize.AnamorphicResult result = PictureSize.hb_set_anamorphic_size2(this.GetPictureSettings(), this.GetPictureTitleInfo(), setting);
-
- switch (this.SelectedAnamorphicMode)
- {
- case Anamorphic.None:
- this.Task.Width = result.OutputWidth;
- this.Task.Height = result.OutputHeight;
- break;
- case Anamorphic.Strict:
- this.Task.Width = 0;
- this.Task.Height = 0;
- break;
- case Anamorphic.Loose:
- this.Task.Width = result.OutputWidth;
- this.Task.Height = 0;
- break;
- case Anamorphic.Custom:
- this.Task.Width = result.OutputWidth;
- this.Task.Height = result.OutputHeight;
- break;
- }
+ this.Task.Width = result.OutputWidth;
+ this.Task.Height = result.OutputHeight;
+ this.Task.PixelAspectX = (int)Math.Round(result.OutputParWidth, 0);
+ this.Task.PixelAspectY = (int)Math.Round(result.OutputParHeight, 0);
// Step 3, Set the display width label to indicate the output.
double dispWidth = Math.Round((result.OutputWidth * result.OutputParWidth / result.OutputParHeight), 0);
|