WinGui: Fix audio track selection on JSON LibHB API.

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

diff --git a/win/CS/HandBrake.ApplicationServices/Utilities/InteropModelCreator.cs b/win/CS/HandBrake.ApplicationServices/Utilities/InteropModelCreator.cs
index 37d9499cd4dd8752794117df150022480f9fba68..0f2fa868834bd44a3a9af5c068d7b88ce6a2ca71 100644 (file)
--- a/win/CS/HandBrake.ApplicationServices/Utilities/InteropModelCreator.cs
+++ b/win/CS/HandBrake.ApplicationServices/Utilities/InteropModelCreator.cs
@@ -76,13 +76,13 @@ namespace HandBrake.ApplicationServices.Utilities
                                                  Drc = track.DRC, \r
                                                  Gain = track.Gain, \r
                                                  Encoder = Converters.GetCliAudioEncoder(track.Encoder), \r
-                                                 InputNumber = track.Track.HasValue ? track.Track.Value : 0, \r
+                                                 InputNumber = track.Track.HasValue ? track.Track.Value - 1 : 0, // It's 0 based index \r
                                                  Mixdown = Converters.GetCliMixDown(track.MixDown), \r
                                                  SampleRateRaw = GetSampleRateRaw(track.SampleRate), \r
                                                  EncodeRateType = AudioEncodeRateType.Bitrate, \r
                                                  Name = track.TrackName, \r
-                                                 IsPassthru = track.IsPassthru\r
-                                             };\r
+                                                 IsPassthru = track.IsPassthru,\r
+                                              };\r
 \r
                 job.AudioEncodings.Add(newTrack);\r
             }\r

diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/Json/Factories/EncodeFactory.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/Json/Factories/EncodeFactory.cs
index 327e5ce9f9374aa3bc47e69e02f54ef92af4a252..2ddc5a6fcb7141199dd04edb22589e41945dc118 100644 (file)
--- a/win/CS/HandBrake.Interop/HandBrakeInterop/Json/Factories/EncodeFactory.cs
+++ b/win/CS/HandBrake.Interop/HandBrakeInterop/Json/Factories/EncodeFactory.cs
@@ -286,7 +286,6 @@ namespace HandBrake.Interop.Json.Factories
             audio.CopyMask = (int)NativeConstants.HB_ACODEC_ANY;\r
 \r
             audio.AudioList = new List<AudioList>();\r
-            int numTracks = 0;\r
             foreach (AudioEncoding item in job.AudioEncodings)\r
             {\r
                 HBAudioEncoder encoder = HandBrakeEncoderHelpers.GetAudioEncoder(item.Encoder);\r
@@ -297,7 +296,7 @@ namespace HandBrake.Interop.Json.Factories
 \r
                 AudioList audioTrack = new AudioList\r
                     {\r
-                        Track = numTracks++, \r
+                        Track = item.InputNumber, \r
                         DRC = item.Drc, \r
                         Encoder = encoder.Id, \r
                         Gain = item.Gain, \r