WinGui: Fixes to new JSON API Code, Audio and Chapter settings.

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

diff --git a/win/CS/HandBrake.ApplicationServices/Utilities/InteropModelCreator.cs b/win/CS/HandBrake.ApplicationServices/Utilities/InteropModelCreator.cs
index 17a8ba00035285fceb04354cfa9cee751a5c7997..a7dac9fcdee6724b3d6443a13817971e5af951f4 100644 (file)
--- a/win/CS/HandBrake.ApplicationServices/Utilities/InteropModelCreator.cs
+++ b/win/CS/HandBrake.ApplicationServices/Utilities/InteropModelCreator.cs
@@ -80,6 +80,8 @@ namespace HandBrake.ApplicationServices.Utilities
                         InputNumber = track.Track.HasValue ? track.Track.Value : 0,\r
                         Mixdown = Converters.GetCliMixDown(track.MixDown),\r
                         SampleRateRaw = GetSampleRateRaw(track.SampleRate),\r
+                        EncodeRateType = AudioEncodeRateType.Bitrate,\r
+                        Name = track.TrackName\r
                     };\r
 \r
                 profile.AudioEncodings.Add(newTrack);\r

diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/Json/Factories/EncodeFactory.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/Json/Factories/EncodeFactory.cs
index ebfee5c213401097271a5f1b51658c782a14aa50..060821341deffd1ac73cf4568d5bdb47468440b9 100644 (file)
--- a/win/CS/HandBrake.Interop/HandBrakeInterop/Json/Factories/EncodeFactory.cs
+++ b/win/CS/HandBrake.Interop/HandBrakeInterop/Json/Factories/EncodeFactory.cs
@@ -114,7 +114,7 @@ namespace HandBrake.Interop.Json.Factories
                 ChapterList = new List<ChapterList>()\r
             };\r
 \r
-            if (!job.UseDefaultChapterNames)\r
+            if (job.UseDefaultChapterNames)\r
             {\r
                 foreach (string item in job.CustomChapterNames)\r
                 {\r
@@ -278,17 +278,30 @@ namespace HandBrake.Interop.Json.Factories
                 AudioList audioTrack = new AudioList\r
                     {\r
                         Track = numTracks++, \r
-                        Bitrate = item.Bitrate, \r
-                        CompressionLevel = item.Compression, \r
                         DRC = item.Drc, \r
                         Encoder = encoder.Id, \r
                         Gain = item.Gain, \r
                         Mixdown = mixdown.Id, \r
                         NormalizeMixLevel = false, \r
-                        Quality = item.Quality, \r
-                        Samplerate = item.SampleRateRaw\r
+                        Samplerate = item.SampleRateRaw,\r
+                        Name = item.Name,\r
                     };\r
 \r
+                if (item.EncodeRateType == AudioEncodeRateType.Quality)\r
+                {\r
+                    audioTrack.Quality = item.Quality;\r
+                }\r
+\r
+                if (item.EncodeRateType == AudioEncodeRateType.Compression)\r
+                {\r
+                    audioTrack.CompressionLevel = item.Compression;\r
+                }\r
+\r
+                if (item.EncodeRateType == AudioEncodeRateType.Bitrate)\r
+                {\r
+                    audioTrack.Bitrate = item.Bitrate;\r
+                }\r
+\r
                 audio.AudioList.Add(audioTrack);\r
             }\r
 \r

diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/AudioEncodeRateType.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/AudioEncodeRateType.cs
index dbd62560458cb554d88e73c335307d0333c57a79..ec04805df7e0c7a3dbc37ef6683cbf22c84fbf43 100644 (file)
--- a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/AudioEncodeRateType.cs
+++ b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/AudioEncodeRateType.cs
@@ -15,6 +15,7 @@ namespace HandBrake.Interop.Model.Encoding
     public enum AudioEncodeRateType\r
        {\r
                Bitrate,\r
-               Quality\r
+               Quality,\r
+        Compression\r
        }\r
 }\r

diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/AudioEncoding.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/AudioEncoding.cs
index 7aa211c8d95070ae3f9124cb2608e4341be283bf..5d76a9f5dcf41188501989213df82f0f289c8109 100644 (file)
--- a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/AudioEncoding.cs
+++ b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/AudioEncoding.cs
@@ -36,11 +36,6 @@ namespace HandBrake.Interop.Model.Encoding
                /// </summary>\r
                public string Encoder { get; set; }\r
 \r
-               /// <summary>\r
-               /// Will pass through the track if it maches the codec type.\r
-               /// </summary>\r
-               public bool PassthroughIfPossible { get; set; }\r
-\r
                /// <summary>\r
                /// Gets or sets the encode rate type (bitrate or quality).\r
                /// </summary>\r
@@ -66,12 +61,6 @@ namespace HandBrake.Interop.Model.Encoding
                /// </summary>\r
                public string Mixdown { get; set; }\r
 \r
-               /// <summary>\r
-               /// Gets or sets the sample rate. Obsolete. Use SampleRateRaw instead.\r
-               /// </summary>\r
-               [Obsolete("This property is ignored and only exists for backwards compatibility. Use SampleRateRaw instead.")]\r
-               public string SampleRate { get; set; }\r
-\r
                /// <summary>\r
                /// Gets or sets the sample rate in Hz.\r
                /// </summary>\r