WinGui: Change the "For Additional Tracks" dropdown. Remove the "None" option....

diff --git a/win/CS/HandBrakeWPF/Model/Audio/AudioBehaviours.cs b/win/CS/HandBrakeWPF/Model/Audio/AudioBehaviours.cs
index aa448d69033a0b16e7f8c3e8525835707087882e..438117ce38c6ffcaa8c602bd31d63380f5656983 100644 (file)
--- a/win/CS/HandBrakeWPF/Model/Audio/AudioBehaviours.cs
+++ b/win/CS/HandBrakeWPF/Model/Audio/AudioBehaviours.cs
@@ -29,7 +29,7 @@ namespace HandBrakeWPF.Model.Audio
         public AudioBehaviours()\r
         {\r
             this.SelectedBehaviour = AudioBehaviourModes.None;\r
-            this.SelectedTrackDefaultBehaviour = AudioTrackDefaultsMode.None;\r
+            this.SelectedTrackDefaultBehaviour = AudioTrackDefaultsMode.FirstTrack;\r
             this.SelectedLangauges = new BindingList<string>();\r
             this.BehaviourTracks = new BindingList<AudioBehaviourTrack>();\r
         }\r

diff --git a/win/CS/HandBrakeWPF/Model/Audio/AudioTrackDefaultsMode.cs b/win/CS/HandBrakeWPF/Model/Audio/AudioTrackDefaultsMode.cs
index 475c39e94296f6093bde63560ad53e3457ac1a3f..ffb03fc8a019ffb4e04c215b492b2ba794a2040c 100644 (file)
--- a/win/CS/HandBrakeWPF/Model/Audio/AudioTrackDefaultsMode.cs
+++ b/win/CS/HandBrakeWPF/Model/Audio/AudioTrackDefaultsMode.cs
@@ -16,11 +16,8 @@ namespace HandBrakeWPF.Model.Audio
     /// </summary>\r
     public enum AudioTrackDefaultsMode\r
     {\r
-        [DisplayName("Default")]\r
-        None = 0,\r
-\r
         [DisplayName("Use First Track as template")]\r
-        FirstTrack,\r
+        FirstTrack = 0,\r
 \r
         [DisplayName("Use All Tracks as templates")]\r
         AllTracks,\r

diff --git a/win/CS/HandBrakeWPF/Services/Presets/Factories/JsonPresetFactory.cs b/win/CS/HandBrakeWPF/Services/Presets/Factories/JsonPresetFactory.cs
index 59307e5edde810a5745acd69a6453540e0022889..a1b2b30a5174892d8614894505dce69615b83bc2 100644 (file)
--- a/win/CS/HandBrakeWPF/Services/Presets/Factories/JsonPresetFactory.cs
+++ b/win/CS/HandBrakeWPF/Services/Presets/Factories/JsonPresetFactory.cs
@@ -339,15 +339,7 @@ namespace HandBrakeWPF.Services.Presets.Factories
                                                                      ? AudioBehaviourModes.AllMatching\r
                                                                      : AudioBehaviourModes.FirstMatch;\r
 \r
-            // TODO - The other GUI's don't support All Tracks yet. So for now we can only load / Save first track.\r
-            if (importedPreset.AudioSecondaryEncoderMode)\r
-            {\r
-                preset.AudioTrackBehaviours.SelectedTrackDefaultBehaviour = AudioTrackDefaultsMode.FirstTrack;\r
-            }\r
-            else\r
-            {\r
-                preset.AudioTrackBehaviours.SelectedTrackDefaultBehaviour = AudioTrackDefaultsMode.None;\r
-            }\r
+            preset.AudioTrackBehaviours.SelectedTrackDefaultBehaviour = importedPreset.AudioSecondaryEncoderMode ? AudioTrackDefaultsMode.FirstTrack : AudioTrackDefaultsMode.AllTracks;\r
 \r
             if (importedPreset.AudioCopyMask != null)\r
             {\r
@@ -537,7 +529,7 @@ namespace HandBrakeWPF.Services.Presets.Factories
             preset.AudioEncoderFallback = EnumHelper<AudioEncoder>.GetShortName(export.Task.AllowedPassthruOptions.AudioEncoderFallback);\r
             preset.AudioLanguageList = LanguageUtilities.GetLanguageCodes(export.AudioTrackBehaviours.SelectedLangauges);\r
             preset.AudioTrackSelectionBehavior = EnumHelper<AudioBehaviourModes>.GetShortName(export.AudioTrackBehaviours.SelectedBehaviour);\r
-            preset.AudioSecondaryEncoderMode = export.AudioTrackBehaviours.SelectedTrackDefaultBehaviour == AudioTrackDefaultsMode.FirstTrack; // TODO -> We don't support AllTracks yet in other GUIs.\r
+            preset.AudioSecondaryEncoderMode = export.AudioTrackBehaviours.SelectedTrackDefaultBehaviour == AudioTrackDefaultsMode.FirstTrack; // 1 = First Track, 0 = All\r
             preset.AudioList = new List<AudioList>();\r
             foreach (var item in export.AudioTrackBehaviours.BehaviourTracks)\r
             {\r

diff --git a/win/CS/HandBrakeWPF/ViewModels/AudioViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/AudioViewModel.cs
index ffea2554ee3ae688697913af7411e2f263009608..ff7a8376fea5fb060ea2f36bb0624f55ac838a2f 100644 (file)
--- a/win/CS/HandBrakeWPF/ViewModels/AudioViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/AudioViewModel.cs
@@ -351,9 +351,6 @@ namespace HandBrakeWPF.ViewModels
 \r
                     switch (this.AudioBehaviours.SelectedTrackDefaultBehaviour)\r
                     {\r
-                        case AudioTrackDefaultsMode.None:\r
-                            this.Task.AudioTracks.Add(new AudioTrack { ScannedTrack = track });\r
-                            break;\r
                         case AudioTrackDefaultsMode.FirstTrack:\r
                             AudioBehaviourTrack template = this.AudioBehaviours.BehaviourTracks.FirstOrDefault();\r
                             this.Task.AudioTracks.Add(template != null ? new AudioTrack(template, track, this.Task.AllowedPassthruOptions.AudioEncoderFallback) : new AudioTrack { ScannedTrack = track });\r