[vlc-devel] [PATCH v2 8/9] macosx: Adapt to new equalizer code with extra sets of ISO bands

[Ronald Wright]

Note:  This patch cannot be applied without patch 4, which depends on patches 1
and 2.  Patch 3 is also required so that all the new symbol definitions from
patches 1 and 2 are included in VLC.  Patches 4 through 9 must be applied all
together.
---
 modules/gui/macosx/AudioEffects.m | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/modules/gui/macosx/AudioEffects.m b/modules/gui/macosx/AudioEffects.m
index c0dde23..04e507f 100644
--- a/modules/gui/macosx/AudioEffects.m
+++ b/modules/gui/macosx/AudioEffects.m
@@ -61,19 +61,20 @@
     NSMutableArray *workNames = [[NSMutableArray alloc] initWithCapacity:NB_PRESETS];
 
     for (int i = 0 ; i < NB_PRESETS ; i++) {
-        workString = [NSString stringWithFormat:@"%.1f %.1f %.1f %.1f %.1f %.1f %.1f %.1f %.1f %.1f",
-                      eqz_preset_10b[i].f_amp[0],
-                      eqz_preset_10b[i].f_amp[1],
-                      eqz_preset_10b[i].f_amp[2],
-                      eqz_preset_10b[i].f_amp[3],
-                      eqz_preset_10b[i].f_amp[4],
-                      eqz_preset_10b[i].f_amp[5],
-                      eqz_preset_10b[i].f_amp[6],
-                      eqz_preset_10b[i].f_amp[7],
-                      eqz_preset_10b[i].f_amp[8],
-                      eqz_preset_10b[i].f_amp[9]];
+
+        workString = [NSString stringWithFormat:@"%.1f %.1f %.1f %.1f %.1f %.1f %.1f %.1f %.1f %.1f v",
+                      eqz_preset_vlc_10b[i].f_amp[0],
+                      eqz_preset_vlc_10b[i].f_amp[1],
+                      eqz_preset_vlc_10b[i].f_amp[2],
+                      eqz_preset_vlc_10b[i].f_amp[3],
+                      eqz_preset_vlc_10b[i].f_amp[4],
+                      eqz_preset_vlc_10b[i].f_amp[5],
+                      eqz_preset_vlc_10b[i].f_amp[6],
+                      eqz_preset_vlc_10b[i].f_amp[7],
+                      eqz_preset_vlc_10b[i].f_amp[8],
+                      eqz_preset_vlc_10b[i].f_amp[9]];
         [workValues addObject:workString];
-        [workPreamp addObject:[NSString stringWithFormat:@"%1.f", eqz_preset_10b[i].f_preamp]];
+        [workPreamp addObject:[NSString stringWithFormat:@"%1.f", eqz_preset_vlc_10b[i].f_preamp]];
         [workTitles addObject:toNSStr(preset_list_text[i])];
         [workNames addObject:toNSStr(preset_list[i])];
     }
@@ -564,7 +565,7 @@ static bool GetEqualizerStatus(intf_thread_t *p_custom_intf,
 
 - (NSString *)generatePresetString
 {
-    return [NSString stringWithFormat:@"%.1f %.1f %.1f %.1f %.1f %.1f %.1f %.1f %.1f %.1f",
+    return [NSString stringWithFormat:@"%.1f %.1f %.1f %.1f %.1f %.1f %.1f %.1f %.1f %.1f v",
             [_equalizerBand1Slider floatValue],
             [_equalizerBand2Slider floatValue],
             [_equalizerBand3Slider floatValue],
-- 
1.9.1