WinGui:

- Bunch of work to help OO the UI code a bit better and prepare for the WPF UI.

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

3 files changed, 26 insertions, 19 deletions

diff --git a/win/CS/HandBrake.ApplicationServices/Model/EncodeTask.cs b/win/CS/HandBrake.ApplicationServices/Model/EncodeTask.cs
index d600ba81c..e896960c0 100644
--- a/win/CS/HandBrake.ApplicationServices/Model/EncodeTask.cs
+++ b/win/CS/HandBrake.ApplicationServices/Model/EncodeTask.cs
@@ -52,6 +52,7 @@ namespace HandBrake.ApplicationServices.Model
         /// Gets or sets EndPoint.

         /// </summary>

         public int EndPoint { get; set; }

+

         #endregion

 

         #region Destination

@@ -90,22 +91,22 @@ namespace HandBrake.ApplicationServices.Model
         /// <summary>

         /// Gets or sets Width.

         /// </summary>

-        public int Width { get; set; }

+        public int? Width { get; set; }

 

         /// <summary>

         /// Gets or sets Height.

         /// </summary>

-        public int Height { get; set; }

+        public int? Height { get; set; }

 

         /// <summary>

         /// Gets or sets MaxWidth.

         /// </summary>

-        public int MaxWidth { get; set; }

+        public int? MaxWidth { get; set; }

 

         /// <summary>

         /// Gets or sets MaxHeight.

         /// </summary>

-        public int MaxHeight { get; set; }

+        public int? MaxHeight { get; set; }

 

         /// <summary>

         /// Gets or sets a value indicating whether CustomCropping.

@@ -125,7 +126,7 @@ namespace HandBrake.ApplicationServices.Model
         /// <summary>

         /// Gets or sets DisplayWidth.

         /// </summary>

-        public double DisplayWidth { get; set; }

+        public double? DisplayWidth { get; set; }

 

         /// <summary>

         /// Gets or sets a value indicating whether KeepDisplayAspect.

@@ -145,7 +146,7 @@ namespace HandBrake.ApplicationServices.Model
         /// <summary>

         /// Gets or sets Modulus.

         /// </summary>

-        public int Modulus { get; set; }

+        public int? Modulus { get; set; }

         #endregion

 

         #region Filters

@@ -221,7 +222,7 @@ namespace HandBrake.ApplicationServices.Model
         /// <summary>

         /// Gets or sets Quality.

         /// </summary>

-        public double? Quality { get; set; }

+        public double Quality { get; set; }

 

         /// <summary>

         /// Gets or sets VideoBitrate.

@@ -274,6 +275,11 @@ namespace HandBrake.ApplicationServices.Model
         /// </summary>

         public string ChapterMarkersFilePath { get; set; }

 

+        /// <summary>

+        /// Chapter Names

+        /// </summary>

+        public Dictionary<int, string> ChapterNames { get; set; }

+

         #endregion

 

         #region Advanced

diff --git a/win/CS/HandBrake.ApplicationServices/Model/Encoding/AudioTrack.cs b/win/CS/HandBrake.ApplicationServices/Model/Encoding/AudioTrack.cs
index bcfb27089..440f72226 100644
--- a/win/CS/HandBrake.ApplicationServices/Model/Encoding/AudioTrack.cs
+++ b/win/CS/HandBrake.ApplicationServices/Model/Encoding/AudioTrack.cs
@@ -16,41 +16,41 @@ namespace HandBrake.ApplicationServices.Model.Encoding
         public AudioTrack()

         {

             // Default Values

-            this.Track = "Automatic";

-            this.MixDown = "Automatic";

-            this.SampleRate = "Auto";

-            this.Bitrate = "Auto";

-            this.DRC = "1";

+            this.Track = 1;

+            this.MixDown = Mixdown.DolbyProLogicII;

+            this.SampleRate = 48;

+            this.Bitrate = 160;

+            this.DRC = 1;

         }

 

         /// <summary>

         /// Gets or sets Audio Track Name

         /// </summary>

-        public string Track { get; set; }

+        public int Track { get; set; }

 

         /// <summary>

         /// Gets or sets Audio Mixdown

         /// </summary>

-        public string MixDown { get; set; }

+        public Mixdown MixDown { get; set; }

 

         /// <summary>

         /// Gets or sets Audio Encoder

         /// </summary>

-        public string Encoder { get; set; }

+        public AudioEncoder Encoder { get; set; }

 

         /// <summary>

         /// Gets or sets Audio Bitrate

         /// </summary>

-        public string Bitrate { get; set; }

+        public int Bitrate { get; set; }

 

         /// <summary>

         /// Gets or sets Audio SampleRate

         /// </summary>

-        public string SampleRate { get; set; }

+        public double SampleRate { get; set; }

 

         /// <summary>

         /// Gets or sets Dynamic Range Compression

         /// </summary>

-        public string DRC { get; set; }

+        public double DRC { get; set; }

     }

 }
\ No newline at end of file
diff --git a/win/CS/HandBrake.ApplicationServices/Model/Encoding/PointToPointMode.cs b/win/CS/HandBrake.ApplicationServices/Model/Encoding/PointToPointMode.cs
index dcee4cac4..e4105565e 100644
--- a/win/CS/HandBrake.ApplicationServices/Model/Encoding/PointToPointMode.cs
+++ b/win/CS/HandBrake.ApplicationServices/Model/Encoding/PointToPointMode.cs
@@ -12,6 +12,7 @@ namespace HandBrake.ApplicationServices.Model.Encoding
     {

         Chapters = 0,

         Seconds,

-        Frames

+        Frames,

+        Preview,

     }

 }