diff options
| author | sr55 <[email protected]> | 2015-01-20 11:36:33 +0000 |
|---|---|---|
| committer | sr55 <[email protected]> | 2015-01-20 11:36:33 +0000 |
| commit | 26e7efb9e7ab8a319a4912ae2287b69f02251006 (patch) | |
| tree | f0663c1352e51282cd470d8f785895ac1f52f089 /win/CS/HandBrake.ApplicationServices/Services | |
| parent | 7fda02b9bba6ca1f6858780e584d89ba72afe73f (diff) | |
WinGui: Improve the preset load failure error message. Remove some duplicate keys in the encode task model. Change some of the preview properties to nullable.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6781 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'win/CS/HandBrake.ApplicationServices/Services')
| -rw-r--r-- | win/CS/HandBrake.ApplicationServices/Services/Encode/EncodeService.cs | 4 | ||||
| -rw-r--r-- | win/CS/HandBrake.ApplicationServices/Services/Encode/Model/EncodeTask.cs | 31 |
2 files changed, 11 insertions, 24 deletions
diff --git a/win/CS/HandBrake.ApplicationServices/Services/Encode/EncodeService.cs b/win/CS/HandBrake.ApplicationServices/Services/Encode/EncodeService.cs index 2253d96e8..1aaa0d301 100644 --- a/win/CS/HandBrake.ApplicationServices/Services/Encode/EncodeService.cs +++ b/win/CS/HandBrake.ApplicationServices/Services/Encode/EncodeService.cs @@ -116,8 +116,8 @@ namespace HandBrake.ApplicationServices.Services.Encode ? QueryGeneratorUtility.GeneratePreviewQuery(
new EncodeTask(this.currentTask.Task),
encodeQueueTask.Configuration,
- this.currentTask.Task.PreviewEncodeDuration,
- this.currentTask.Task.PreviewEncodeStartAt)
+ this.currentTask.Task.PreviewEncodeDuration.HasValue ? this.currentTask.Task.PreviewEncodeDuration.Value : 0,
+ this.currentTask.Task.PreviewEncodeStartAt.HasValue ? this.currentTask.Task.PreviewEncodeStartAt.Value : 0)
: QueryGeneratorUtility.GenerateQuery(new EncodeTask(this.currentTask.Task), encodeQueueTask.Configuration);
ProcessStartInfo cliStart = new ProcessStartInfo(handbrakeCLIPath, query)
diff --git a/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/EncodeTask.cs b/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/EncodeTask.cs index 86b0d06ec..86735482a 100644 --- a/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/EncodeTask.cs +++ b/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/EncodeTask.cs @@ -146,9 +146,6 @@ namespace HandBrake.ApplicationServices.Services.Encode.Model this.FastDecode = task.FastDecode;
this.ExtraAdvancedArguments = task.ExtraAdvancedArguments;
- this.PreviewStartAt = task.PreviewStartAt;
- this.PreviewDuration = task.PreviewDuration;
-
this.ShowAdvancedTab = task.ShowAdvancedTab;
this.X265Preset = task.X265Preset;
@@ -505,14 +502,19 @@ namespace HandBrake.ApplicationServices.Services.Encode.Model #region Preview
/// <summary>
- /// Gets or sets StartAt.
+ /// Gets or sets a value indicating whether IsPreviewEncode.
/// </summary>
- public int? PreviewStartAt { get; set; }
+ public bool IsPreviewEncode { get; set; }
/// <summary>
- /// Gets or sets Duration.
+ /// Gets or sets PreviewEncodeDuration.
/// </summary>
- public int? PreviewDuration { get; set; }
+ public int? PreviewEncodeDuration { get; set; }
+
+ /// <summary>
+ /// Gets or sets PreviewEncodeStartAt.
+ /// </summary>
+ public int? PreviewEncodeStartAt { get; set; }
#endregion
@@ -543,21 +545,6 @@ namespace HandBrake.ApplicationServices.Services.Encode.Model }
/// <summary>
- /// Gets or sets a value indicating whether IsPreviewEncode.
- /// </summary>
- public bool IsPreviewEncode { get; set; }
-
- /// <summary>
- /// Gets or sets PreviewEncodeDuration.
- /// </summary>
- public int PreviewEncodeDuration { get; set; }
-
- /// <summary>
- /// Gets or sets PreviewEncodeStartAt.
- /// </summary>
- public int PreviewEncodeStartAt { get; set; }
-
- /// <summary>
/// Gets or sets a value indicating whether advanced panel enabled.
/// </summary>
public bool ShowAdvancedTab
|