diff options
| author | sr55 <[email protected]> | 2015-04-01 20:08:46 +0000 |
|---|---|---|
| committer | sr55 <[email protected]> | 2015-04-01 20:08:46 +0000 |
| commit | 459e06e2e6099a882d0eff225fd36ddce02aab70 (patch) | |
| tree | 3dc4e3e8e805012f9b764c777534f01efb8391fd /win/CS/HandBrake.ApplicationServices/Interop/Json | |
| parent | c1fefaee7a3c8d4a35d1224ba19d7a7915e2e075 (diff) | |
WinGui: Some initial re-modelling in the JSON folder. Created a "Shared" folder which contains models that are used by anamorphic, encode and scan calls but are not different. Based on a patch by RandomEngy.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@7033 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'win/CS/HandBrake.ApplicationServices/Interop/Json')
12 files changed, 11 insertions, 173 deletions
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Json/Anamorphic/AnamorphicGeometry.cs b/win/CS/HandBrake.ApplicationServices/Interop/Json/Anamorphic/AnamorphicGeometry.cs index fc7319d70..96e257b57 100644 --- a/win/CS/HandBrake.ApplicationServices/Interop/Json/Anamorphic/AnamorphicGeometry.cs +++ b/win/CS/HandBrake.ApplicationServices/Interop/Json/Anamorphic/AnamorphicGeometry.cs @@ -9,6 +9,8 @@ namespace HandBrake.ApplicationServices.Interop.Json.Anamorphic
{
+ using HandBrake.ApplicationServices.Interop.Json.Shared;
+
/// <summary>
/// The geometry.
/// </summary>
@@ -22,6 +24,6 @@ namespace HandBrake.ApplicationServices.Interop.Json.Anamorphic /// <summary>
/// Gets or sets the source geometry.
/// </summary>
- public SourceGeometry SourceGeometry { get; set; }
+ public Geometry SourceGeometry { get; set; }
}
}
\ No newline at end of file diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Json/Anamorphic/AnamorphicResult.cs b/win/CS/HandBrake.ApplicationServices/Interop/Json/Anamorphic/AnamorphicResult.cs deleted file mode 100644 index d539cb478..000000000 --- a/win/CS/HandBrake.ApplicationServices/Interop/Json/Anamorphic/AnamorphicResult.cs +++ /dev/null @@ -1,32 +0,0 @@ -// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="AnamorphicResult.cs" company="HandBrake Project (http://handbrake.fr)">
-// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-// The anamorphic result.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.ApplicationServices.Interop.Json.Anamorphic
-{
- /// <summary>
- /// The anamorphic result.
- /// </summary>
- public class AnamorphicResult
- {
- /// <summary>
- /// Gets or sets the height.
- /// </summary>
- public int Height { get; set; }
-
- /// <summary>
- /// Gets or sets the par.
- /// </summary>
- public PAR PAR { get; set; }
-
- /// <summary>
- /// Gets or sets the width.
- /// </summary>
- public int Width { get; set; }
- }
-}
\ No newline at end of file diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Json/Anamorphic/DestSettings.cs b/win/CS/HandBrake.ApplicationServices/Interop/Json/Anamorphic/DestSettings.cs index cc9b9c53d..28971308b 100644 --- a/win/CS/HandBrake.ApplicationServices/Interop/Json/Anamorphic/DestSettings.cs +++ b/win/CS/HandBrake.ApplicationServices/Interop/Json/Anamorphic/DestSettings.cs @@ -11,6 +11,8 @@ namespace HandBrake.ApplicationServices.Interop.Json.Anamorphic {
using System.Collections.Generic;
+ using HandBrake.ApplicationServices.Interop.Json.Shared;
+
/// <summary>
/// The dest geometry.
/// </summary>
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Json/Anamorphic/Geometry.cs b/win/CS/HandBrake.ApplicationServices/Interop/Json/Anamorphic/Geometry.cs deleted file mode 100644 index b70b58f6b..000000000 --- a/win/CS/HandBrake.ApplicationServices/Interop/Json/Anamorphic/Geometry.cs +++ /dev/null @@ -1,33 +0,0 @@ -// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="Geometry.cs" company="HandBrake Project (http://handbrake.fr)">
-// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-// The geometry.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.ApplicationServices.Interop.Json.Anamorphic
-{
-
- /// <summary>
- /// The geometry.
- /// </summary>
- public class Geometry
- {
- /// <summary>
- /// Gets or sets the height.
- /// </summary>
- public int Height { get; set; }
-
- /// <summary>
- /// Gets or sets the par.
- /// </summary>
- public PAR PAR { get; set; }
-
- /// <summary>
- /// Gets or sets the width.
- /// </summary>
- public int Width { get; set; }
- }
-}
\ No newline at end of file diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Json/Anamorphic/SourceGeometry.cs b/win/CS/HandBrake.ApplicationServices/Interop/Json/Anamorphic/SourceGeometry.cs deleted file mode 100644 index c4ed79041..000000000 --- a/win/CS/HandBrake.ApplicationServices/Interop/Json/Anamorphic/SourceGeometry.cs +++ /dev/null @@ -1,40 +0,0 @@ -// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="SourceGeometry.cs" company="HandBrake Project (http://handbrake.fr)">
-// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-// The source geometry.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.ApplicationServices.Interop.Json.Anamorphic
-{
- /// <summary>
- /// The source geometry.
- /// </summary>
- public class SourceGeometry
- {
- /// <summary>
- /// Initializes a new instance of the <see cref="SourceGeometry"/> class.
- /// </summary>
- public SourceGeometry()
- {
- this.PAR = new PAR();
- }
-
- /// <summary>
- /// Gets or sets the height.
- /// </summary>
- public int Height { get; set; }
-
- /// <summary>
- /// Gets or sets the par.
- /// </summary>
- public PAR PAR { get; set; }
-
- /// <summary>
- /// Gets or sets the width.
- /// </summary>
- public int Width { get; set; }
- }
-}
\ No newline at end of file diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/JsonEncodeObject.cs b/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/JsonEncodeObject.cs index 0accd19cf..cb9494c0d 100644 --- a/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/JsonEncodeObject.cs +++ b/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/JsonEncodeObject.cs @@ -10,6 +10,7 @@ namespace HandBrake.ApplicationServices.Interop.Json.Encode
{
using HandBrake.ApplicationServices.Interop.Json.Anamorphic;
+ using HandBrake.ApplicationServices.Interop.Json.Shared;
/// <summary>
/// The root object.
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Json/Scan/ChapterList.cs b/win/CS/HandBrake.ApplicationServices/Interop/Json/Scan/ChapterList.cs index 01a0068fc..90ec33cc8 100644 --- a/win/CS/HandBrake.ApplicationServices/Interop/Json/Scan/ChapterList.cs +++ b/win/CS/HandBrake.ApplicationServices/Interop/Json/Scan/ChapterList.cs @@ -17,7 +17,7 @@ namespace HandBrake.ApplicationServices.Interop.Json.Scan /// <summary>
/// Gets or sets the duration.
/// </summary>
- public Duration2 Duration { get; set; }
+ public Duration Duration { get; set; }
/// <summary>
/// Gets or sets the name.
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Json/Scan/Duration2.cs b/win/CS/HandBrake.ApplicationServices/Interop/Json/Scan/Duration2.cs deleted file mode 100644 index 3bf6827f5..000000000 --- a/win/CS/HandBrake.ApplicationServices/Interop/Json/Scan/Duration2.cs +++ /dev/null @@ -1,37 +0,0 @@ -// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="Duration2.cs" company="HandBrake Project (http://handbrake.fr)">
-// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-// The duration 2.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.ApplicationServices.Interop.Json.Scan
-{
- /// <summary>
- /// The duration 2.
- /// </summary>
- public class Duration2
- {
- /// <summary>
- /// Gets or sets the hours.
- /// </summary>
- public int Hours { get; set; }
-
- /// <summary>
- /// Gets or sets the minutes.
- /// </summary>
- public int Minutes { get; set; }
-
- /// <summary>
- /// Gets or sets the seconds.
- /// </summary>
- public int Seconds { get; set; }
-
- /// <summary>
- /// Gets or sets the ticks.
- /// </summary>
- public int Ticks { get; set; }
- }
-}
\ No newline at end of file diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Json/Scan/PAR.cs b/win/CS/HandBrake.ApplicationServices/Interop/Json/Scan/PAR.cs deleted file mode 100644 index 9149604d9..000000000 --- a/win/CS/HandBrake.ApplicationServices/Interop/Json/Scan/PAR.cs +++ /dev/null @@ -1,27 +0,0 @@ -// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="PAR.cs" company="HandBrake Project (http://handbrake.fr)">
-// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-// The par.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.ApplicationServices.Interop.Json.Scan
-{
- /// <summary>
- /// The par.
- /// </summary>
- public class PAR
- {
- /// <summary>
- /// Gets or sets the width.
- /// </summary>
- public int Num { get; set; }
-
- /// <summary>
- /// Gets or sets the height.
- /// </summary>
- public int Den { get; set; }
- }
-}
\ No newline at end of file diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Json/Scan/TitleList.cs b/win/CS/HandBrake.ApplicationServices/Interop/Json/Scan/TitleList.cs index 731d715c2..451275729 100644 --- a/win/CS/HandBrake.ApplicationServices/Interop/Json/Scan/TitleList.cs +++ b/win/CS/HandBrake.ApplicationServices/Interop/Json/Scan/TitleList.cs @@ -11,6 +11,8 @@ namespace HandBrake.ApplicationServices.Interop.Json.Scan {
using System.Collections.Generic;
+ using HandBrake.ApplicationServices.Interop.Json.Shared;
+
/// <summary>
/// The title list.
/// </summary>
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Json/Scan/Geometry.cs b/win/CS/HandBrake.ApplicationServices/Interop/Json/Shared/Geometry.cs index 0f7f35ee8..429deb615 100644 --- a/win/CS/HandBrake.ApplicationServices/Interop/Json/Scan/Geometry.cs +++ b/win/CS/HandBrake.ApplicationServices/Interop/Json/Shared/Geometry.cs @@ -7,7 +7,7 @@ // </summary>
// --------------------------------------------------------------------------------------------------------------------
-namespace HandBrake.ApplicationServices.Interop.Json.Scan
+namespace HandBrake.ApplicationServices.Interop.Json.Shared
{
/// <summary>
/// The geometry.
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Json/Anamorphic/PAR.cs b/win/CS/HandBrake.ApplicationServices/Interop/Json/Shared/PAR.cs index 895666633..503acf2f7 100644 --- a/win/CS/HandBrake.ApplicationServices/Interop/Json/Anamorphic/PAR.cs +++ b/win/CS/HandBrake.ApplicationServices/Interop/Json/Shared/PAR.cs @@ -7,7 +7,7 @@ // </summary>
// --------------------------------------------------------------------------------------------------------------------
-namespace HandBrake.ApplicationServices.Interop.Json.Anamorphic
+namespace HandBrake.ApplicationServices.Interop.Json.Shared
{
/// <summary>
/// The par.
|