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/HandBrake.ApplicationServices/Interop | |
| 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/HandBrake.ApplicationServices/Interop')
3 files changed, 7 insertions, 20 deletions
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/HandBrakeInstance.cs b/win/CS/HandBrake.ApplicationServices/Interop/HandBrakeInstance.cs index 719119cc0..379e461c3 100644 --- a/win/CS/HandBrake.ApplicationServices/Interop/HandBrakeInstance.cs +++ b/win/CS/HandBrake.ApplicationServices/Interop/HandBrakeInstance.cs @@ -271,7 +271,7 @@ namespace HandBrake.ApplicationServices.Interop };
// Sanatise the input.
- Geometry resultGeometry = AnamorphicFactory.CreateGeometry(job, new SourceVideoInfo(null, null, new Size(title.Geometry.Width, title.Geometry.Height), new Size(title.Geometry.PAR.Num, title.Geometry.PAR.Den)), AnamorphicFactory.KeepSetting.HB_KEEP_WIDTH); // TODO this keep isn't right.
+ Geometry resultGeometry = AnamorphicFactory.CreateGeometry(job, new SourceVideoInfo(new Size(title.Geometry.Width, title.Geometry.Height), new Size(title.Geometry.PAR.Num, title.Geometry.PAR.Den)), AnamorphicFactory.KeepSetting.HB_KEEP_WIDTH); // TODO this keep isn't right.
int width = resultGeometry.Width * resultGeometry.PAR.Num / resultGeometry.PAR.Den;
int height = resultGeometry.Height;
uiGeometry.geometry.height = resultGeometry.Height; // Prased the height now.
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/Source.cs b/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/Source.cs index 7adc228a9..27a746c36 100644 --- a/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/Source.cs +++ b/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/Source.cs @@ -28,5 +28,10 @@ namespace HandBrake.ApplicationServices.Interop.Json.Encode /// Gets or sets the title.
/// </summary>
public int Title { get; set; }
+
+ /// <summary>
+ /// Gets or sets the path.
+ /// </summary>
+ public string Path { get; set; }
}
}
\ No newline at end of file diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Model/SourceVideoInfo.cs b/win/CS/HandBrake.ApplicationServices/Interop/Model/SourceVideoInfo.cs index 0c6340189..31b94ae10 100644 --- a/win/CS/HandBrake.ApplicationServices/Interop/Model/SourceVideoInfo.cs +++ b/win/CS/HandBrake.ApplicationServices/Interop/Model/SourceVideoInfo.cs @@ -17,37 +17,19 @@ namespace HandBrake.ApplicationServices.Interop.Model /// <summary>
/// Initializes a new instance of the <see cref="SourceVideoInfo"/> class.
/// </summary>
- /// <param name="framerateNumerator">
- /// The framerate numerator.
- /// </param>
- /// <param name="framerateDenominator">
- /// The framerate denominator.
- /// </param>
/// <param name="resolution">
/// The resolution.
/// </param>
/// <param name="parVal">
/// The par val.
/// </param>
- public SourceVideoInfo(int? framerateNumerator, int? framerateDenominator, Size resolution, Size parVal)
+ public SourceVideoInfo(Size resolution, Size parVal)
{
- this.FramerateNumerator = framerateNumerator;
- this.FramerateDenominator = framerateDenominator;
this.Resolution = resolution;
this.ParVal = parVal;
}
/// <summary>
- /// Gets the framerate numerator.
- /// </summary>
- public int? FramerateNumerator { get; private set; }
-
- /// <summary>
- /// Gets the framerate denominator.
- /// </summary>
- public int? FramerateDenominator { get; private set; }
-
- /// <summary>
/// Gets or sets the resolution (width/height) of this Title
/// </summary>
public Size Resolution { get; set; }
|