WinGui: Fix subtitle track index. Made both Audio and Subtitle tracks 0 based.

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

diff --git a/win/CS/HandBrake.ApplicationServices/Utilities/InteropModelCreator.cs b/win/CS/HandBrake.ApplicationServices/Utilities/InteropModelCreator.cs
index 8cd9588b800b76cf2fd2dbf1fa70435e71914177..09fa4b98f545f44f6fd38dfa4dd746eeede2b27d 100644 (file)
--- a/win/CS/HandBrake.ApplicationServices/Utilities/InteropModelCreator.cs
+++ b/win/CS/HandBrake.ApplicationServices/Utilities/InteropModelCreator.cs
@@ -74,7 +74,7 @@ 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 - 1 : 0, // It's 0 based index \r
+                                                 InputNumber = track.Track.HasValue ? track.Track.Value : 0,\r
                                                  Mixdown = Converters.GetCliMixDown(track.MixDown), \r
                                                  SampleRateRaw = GetSampleRateRaw(track.SampleRate), \r
                                                  EncodeRateType = AudioEncodeRateType.Bitrate, \r

diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/Json/Factories/EncodeFactory.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/Json/Factories/EncodeFactory.cs
index 2ddc5a6fcb7141199dd04edb22589e41945dc118..3be6387ee2e52eb5e8c8d03eb8ce1fdc16c10500 100644 (file)
--- a/win/CS/HandBrake.Interop/HandBrakeInterop/Json/Factories/EncodeFactory.cs
+++ b/win/CS/HandBrake.Interop/HandBrakeInterop/Json/Factories/EncodeFactory.cs
@@ -200,7 +200,8 @@ namespace HandBrake.Interop.Json.Factories
                 }\r
                 else\r
                 {\r
-                    SubtitleList track = new SubtitleList { Burn = item.BurnedIn, Default = item.Default, Force = item.Forced, ID = item.TrackNumber, Track = item.TrackNumber };\r
+                    // Note, Subtitle tracks are a 0 based index. So Subtitle 1 == index 0\r
+                    SubtitleList track = new SubtitleList { Burn = item.BurnedIn, Default = item.Default, Force = item.Forced, ID = item.TrackNumber, Track = (item.TrackNumber) };\r
                     subtitle.SubtitleList.Add(track);\r
                 }\r
             }\r

diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/Json/Factories/ScanFactory.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/Json/Factories/ScanFactory.cs
index df2e4918caa5e4747b68a8e1ed43f61313773245..2cee8252be2e521037fe25cbbc07bfb8389de50e 100644 (file)
--- a/win/CS/HandBrake.Interop/HandBrakeInterop/Json/Factories/ScanFactory.cs
+++ b/win/CS/HandBrake.Interop/HandBrakeInterop/Json/Factories/ScanFactory.cs
@@ -133,7 +133,7 @@ namespace HandBrake.Interop.Json.Factories
         {\r
             List<Subtitle> subtiles = new List<Subtitle>();\r
 \r
-            int currentSubtitleTrack = 1;\r
+            int currentSubtitleTrack = 0;\r
             foreach (SubtitleList subtitle in subtitles)\r
             {\r
                 Subtitle newSubtitle = new Subtitle\r
@@ -166,7 +166,7 @@ namespace HandBrake.Interop.Json.Factories
         {\r
             List<AudioTrack> tracks = new List<AudioTrack>();\r
 \r
-            int currentAudioTrack = 1;\r
+            int currentAudioTrack = 0;\r
             foreach (AudioList track in audioTracks)\r
             {\r
                 AudioTrack newAudio = new AudioTrack\r