WinGui: Some Model Re-factoring by RandomEngy

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@7151 b64f7644-9d1e-0410-96f1-a4d463321fa5

8 files changed, 144 insertions, 147 deletions

diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/Audio.cs b/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/Audio.cs
index 2661a8f17..4e4b61d6b 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/Audio.cs
+++ b/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/Audio.cs
@@ -19,7 +19,7 @@ namespace HandBrake.ApplicationServices.Interop.Json.Encode
         /// <summary>

         /// Gets or sets the audio list.

         /// </summary>

-        public List<AudioList> AudioList { get; set; }

+        public List<AudioTrack> AudioList { get; set; }

 

         /// <summary>

         /// Gets or sets the copy mask.

diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/AudioList.cs b/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/AudioTrack.cs
index 2f79ec7e6..0c628fbb0 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/AudioList.cs
+++ b/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/AudioTrack.cs
@@ -1,77 +1,77 @@
 // --------------------------------------------------------------------------------------------------------------------

-// <copyright file="AudioList.cs" company="HandBrake Project (http://handbrake.fr)">

+// <copyright file="AudioTrack.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 audio list.

+//   Represents an audio track to encode.

 // </summary>

-// --------------------------------------------------------------------------------------------------------------------

-

-namespace HandBrake.ApplicationServices.Interop.Json.Encode

-{

-    /// <summary>

-    /// The audio list.

-    /// </summary>

-    public class AudioList

-    {

-        /// <summary>

-        /// Gets or sets the bitrate.

-        /// </summary>

-        public int? Bitrate { get; set; }

-

-        /// <summary>

-        /// Gets or sets the compression level.

-        /// </summary>

-        public double? CompressionLevel { get; set; }

-

-        /// <summary>

-        /// Gets or sets the drc.

-        /// </summary>

-        public double DRC { get; set; }

-

-        /// <summary>

-        /// Gets or sets the encoder.

-        /// </summary>

-        public int Encoder { get; set; }

-

-        /// <summary>

-        /// Gets or sets the gain.

-        /// </summary>

-        public double Gain { get; set; }

-

-        /// <summary>

-        /// Gets or sets the mixdown.

-        /// </summary>

-        public int Mixdown { get; set; }

-

-        /// <summary>

-        /// Gets or sets a value indicating whether normalize mix level.

-        /// </summary>

-        public bool NormalizeMixLevel { get; set; }

-

-        /// <summary>

-        /// Gets or sets the quality.

-        /// </summary>

-        public double? Quality { get; set; }

-

-        /// <summary>

-        /// Gets or sets the samplerate.

-        /// </summary>

-        public int Samplerate { get; set; }

-

-        /// <summary>

-        /// Gets or sets the Name of the audio track.

-        /// </summary>

-        public string Name { get; set; }

-

-        /// <summary>

-        /// Gets or sets the track.

-        /// </summary>

-        public int Track { get; set; }

-

-        /// <summary>

-        /// Gets or sets the dither method.

-        /// </summary>

-        public int DitherMethod { get; set; }

-    }

+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.ApplicationServices.Interop.Json.Encode
+{
+    /// <summary>
+    /// Represents an audio track to encode.
+    /// </summary>
+    public class AudioTrack
+    {
+        /// <summary>
+        /// Gets or sets the bitrate.
+        /// </summary>
+        public int? Bitrate { get; set; }
+
+        /// <summary>
+        /// Gets or sets the compression level.
+        /// </summary>
+        public double? CompressionLevel { get; set; }
+
+        /// <summary>
+        /// Gets or sets the drc.
+        /// </summary>
+        public double DRC { get; set; }
+
+        /// <summary>
+        /// Gets or sets the encoder.
+        /// </summary>
+        public int Encoder { get; set; }
+
+        /// <summary>
+        /// Gets or sets the gain.
+        /// </summary>
+        public double Gain { get; set; }
+
+        /// <summary>
+        /// Gets or sets the mixdown.
+        /// </summary>
+        public int Mixdown { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether normalize mix level.
+        /// </summary>
+        public bool NormalizeMixLevel { get; set; }
+
+        /// <summary>
+        /// Gets or sets the quality.
+        /// </summary>
+        public double? Quality { get; set; }
+
+        /// <summary>
+        /// Gets or sets the samplerate.
+        /// </summary>
+        public int Samplerate { get; set; }
+
+        /// <summary>
+        /// Gets or sets the Name of the audio track.
+        /// </summary>
+        public string Name { get; set; }
+
+        /// <summary>
+        /// Gets or sets the track.
+        /// </summary>
+        public int Track { get; set; }
+
+        /// <summary>
+        /// Gets or sets the dither method.
+        /// </summary>
+        public int DitherMethod { get; set; }
+    }
 }
\ No newline at end of file
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/ChapterList.cs b/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/Chapter.cs
index d58146510..567d0e7a3 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/ChapterList.cs
+++ b/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/Chapter.cs
@@ -1,22 +1,22 @@
 // --------------------------------------------------------------------------------------------------------------------

-// <copyright file="ChapterList.cs" company="HandBrake Project (http://handbrake.fr)">

+// <copyright file="Chapter.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 chapter list.

+//   Represents a chapter to encode.

 // </summary>

-// --------------------------------------------------------------------------------------------------------------------

-

-namespace HandBrake.ApplicationServices.Interop.Json.Encode

-{

-    /// <summary>

-    /// The chapter list.

-    /// </summary>

-    public class ChapterList

-    {

-        /// <summary>

-        /// Gets or sets the name.

-        /// </summary>

-        public string Name { get; set; }

-    }

+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.ApplicationServices.Interop.Json.Encode
+{
+    /// <summary>
+    /// Represents a chapter to encode.
+    /// </summary>
+    public class Chapter
+    {
+        /// <summary>
+        /// Gets or sets the name.
+        /// </summary>
+        public string Name { get; set; }
+    }
 }
\ No newline at end of file
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/Destination.cs b/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/Destination.cs
index 42b3eaa40..9d22fb98a 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/Destination.cs
+++ b/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/Destination.cs
@@ -19,7 +19,7 @@ namespace HandBrake.ApplicationServices.Interop.Json.Encode
         /// <summary>

         /// Gets or sets the chapter list.

         /// </summary>

-        public List<ChapterList> ChapterList { get; set; }

+        public List<Chapter> ChapterList { get; set; }

 

         /// <summary>

         /// Gets or sets a value indicating whether chapter markers.

diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/JsonEncodeObject.cs b/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/JsonEncodeObject.cs
index 9de1b8341..68baffcb4 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/JsonEncodeObject.cs
+++ b/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/JsonEncodeObject.cs
@@ -39,7 +39,7 @@ namespace HandBrake.ApplicationServices.Interop.Json.Encode
         /// <summary>

         /// Gets or sets the meta data.

         /// </summary>

-        public MetaData Metadata { get; set; }

+        public Metadata Metadata { get; set; }

 

         /// <summary>

         /// Gets or sets the sequence id.

diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/MetaData.cs b/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/MetaData.cs
index 86f06b8cb..d840d5d7f 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/MetaData.cs
+++ b/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/MetaData.cs
@@ -12,7 +12,7 @@ namespace HandBrake.ApplicationServices.Interop.Json.Encode
     /// <summary>

     ///     The meta data.

     /// </summary>

-    public class MetaData

+    public class Metadata

     {

         /// <summary>

         ///     Gets or sets the album artist.

diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/SubtitleList.cs b/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/SubtitleTrack.cs
index 71814c9e1..3a8aedec7 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/SubtitleList.cs
+++ b/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/SubtitleTrack.cs
@@ -1,52 +1,49 @@
-// --------------------------------------------------------------------------------------------------------------------

-// <copyright file="SubtitleList.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 subtitle list.

-// </summary>

-// --------------------------------------------------------------------------------------------------------------------

-

-namespace HandBrake.ApplicationServices.Interop.Json.Encode

-{

-    /// <summary>

-    /// The subtitle list.

-    /// </summary>

-    public class SubtitleList

-    {

-        /// <summary>

-        /// Gets or sets a value indicating whether burn.

-        /// </summary>

-        public bool Burn { get; set; }

-

-        /// <summary>

-        /// Gets or sets a value indicating whether default.

-        /// </summary>

-        public bool Default { get; set; }

-

-        /// <summary>

-        /// Gets or sets a value indicating whether force.

-        /// </summary>

-        public bool Forced { get; set; }

-

-        /// <summary>

-        /// Gets or sets the id.

-        /// </summary>

-        public int ID { get; set; }

-

-        /// <summary>

-        /// Gets or sets the offset.

-        /// </summary>

-        public int Offset { get; set; }

-

-        /// <summary>

-        /// Gets or sets the track.

-        /// </summary>

-        public int Track { get; set; }

-

-        /// <summary>

-        /// Gets or sets the srt.

-        /// </summary>

-        public SRT SRT { get; set; }

-    }

+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="SubtitleTrack.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>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.ApplicationServices.Interop.Json.Encode
+{
+    /// <summary>
+    /// Represents a subtitle track to encode.
+    /// </summary>
+    public class SubtitleTrack
+    {
+        /// <summary>
+        /// Gets or sets a value indicating whether burn.
+        /// </summary>
+        public bool Burn { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether default.
+        /// </summary>
+        public bool Default { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether force.
+        /// </summary>
+        public bool Forced { get; set; }
+
+        /// <summary>
+        /// Gets or sets the id.
+        /// </summary>
+        public int ID { get; set; }
+
+        /// <summary>
+        /// Gets or sets the offset.
+        /// </summary>
+        public int Offset { get; set; }
+
+        /// <summary>
+        /// Gets or sets the track.
+        /// </summary>
+        public int Track { get; set; }
+
+        /// <summary>
+        /// Gets or sets the srt.
+        /// </summary>
+        public SRT SRT { get; set; }
+    }
 }
\ No newline at end of file
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/Subtitles.cs b/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/Subtitles.cs
index 5d38ba51d..13439eaa7 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/Subtitles.cs
+++ b/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/Subtitles.cs
@@ -21,9 +21,9 @@ namespace HandBrake.ApplicationServices.Interop.Json.Encode
         /// </summary>

         public SubtitleSearch Search { get; set; }

 

-        /// <summary>

-        /// Gets or sets the subtitle list.

-        /// </summary>

-        public List<SubtitleList> SubtitleList { get; set; }

-    }

+        /// <summary>
+        /// Gets or sets the subtitle list.
+        /// </summary>
+        public List<SubtitleTrack> SubtitleList { get; set; }
+    }
 }
\ No newline at end of file