[vlc-devel] [PATCH 23/23] macosx: don't save audio filters options to config

Victorien Le Couviour--Tuffet victorien.lecouviour.tuffet at gmail.com
Thu Jun 29 14:24:30 CEST 2017


Filter option are now only saved to current profile
---
 .../gui/macosx/VLCAudioEffectsWindowController.m   | 56 ++++------------------
 1 file changed, 8 insertions(+), 48 deletions(-)

diff --git a/modules/gui/macosx/VLCAudioEffectsWindowController.m b/modules/gui/macosx/VLCAudioEffectsWindowController.m
index 18ce61e357..fdeb26f3b0 100644
--- a/modules/gui/macosx/VLCAudioEffectsWindowController.m
+++ b/modules/gui/macosx/VLCAudioEffectsWindowController.m
@@ -578,14 +578,10 @@ static bool GetEqualizerStatus(intf_thread_t *p_custom_intf,
         var_SetString(p_aout, "equalizer-bands", psz_preset_values);
         vlc_object_release(p_aout);
     }
-
-    /* save changed to config */
-    config_PutPsz(getIntf(), "equalizer-bands", psz_preset_values);
 }
 
 - (IBAction)equalizerChangePreset:(id)sender
 {
-    intf_thread_t *p_intf = getIntf();
     NSInteger numberOfChosenPreset = [sender indexOfSelectedItem];
     NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
 
@@ -604,11 +600,7 @@ static bool GetEqualizerStatus(intf_thread_t *p_custom_intf,
     [_equalizerPreampSlider setFloatValue: f_eq_preamp];
     [self setBandSliderValuesForPreset:numberOfChosenPreset];
 
-    /* save changed to config */
-    config_PutPsz(p_intf, "equalizer-bands", psz_eq_bands);
-    config_PutFloat(p_intf, "equalizer-preamp", f_eq_preamp);
-    config_PutPsz(p_intf, "equalizer-preset", psz_eq_preset);
-    var_SetString(pl_Get(p_intf), "equalizer-preset", psz_eq_preset);
+    var_SetString(pl_Get(getIntf()), "equalizer-preset", psz_eq_preset);
 }
 
 - (IBAction)equalizerPreAmpSliderUpdated:(id)sender
@@ -620,25 +612,19 @@ static bool GetEqualizerStatus(intf_thread_t *p_custom_intf,
         var_SetFloat(p_aout, "equalizer-preamp", fPreamp);
         vlc_object_release(p_aout);
     }
-
-    /* save changed to config */
-    config_PutFloat(getIntf(), "equalizer-preamp", fPreamp);
 }
 
 - (IBAction)equalizerTwoPass:(id)sender
 {
     bool b_2p = [sender state] ? true : false;
 
-    intf_thread_t *p_intf = getIntf();
     audio_output_t *p_aout = getAout();
     if (p_aout) {
         var_SetBool(p_aout, "equalizer-2pass", b_2p);
         vlc_object_release(p_aout);
     }
 
-    /* save changed to config */
-    config_PutInt(p_intf, "equalizer-2pass", (int)b_2p);
-    var_SetBool(pl_Get(p_intf), "equalizer-2pass", b_2p);
+    var_SetBool(pl_Get(getIntf()), "equalizer-2pass", b_2p);
 }
 
 - (IBAction)addPresetAction:(id)sender
@@ -674,15 +660,13 @@ static bool GetEqualizerStatus(intf_thread_t *p_custom_intf,
 
         /* update VLC internals */
         char const *psz_eq_preset = [decomposedStringWithCanonicalMapping UTF8String];
-        intf_thread_t *p_intf = getIntf();
         audio_output_t *p_aout = getAout();
         if (p_aout) {
             var_SetString(p_aout, "equalizer-preset", psz_eq_preset);
             vlc_object_release(p_aout);
         }
 
-        config_PutPsz(p_intf, "equalizer-preset", psz_eq_preset);
-        var_SetString(pl_Get(p_intf), "equalizer-preset", psz_eq_preset);
+        var_SetString(pl_Get(getIntf()), "equalizer-preset", psz_eq_preset);
 
         /* update UI */
         [_self updatePresetSelector];
@@ -760,17 +744,7 @@ static bool GetEqualizerStatus(intf_thread_t *p_custom_intf,
 
 - (IBAction)resetCompressorValues:(id)sender
 {
-    intf_thread_t *p_intf = getIntf();
-    playlist_t *p_playlist = pl_Get(p_intf);
-
-    config_PutFloat(p_intf, "compressor-rms-peak", 0.000000);
-    config_PutFloat(p_intf, "compressor-attack", 25.000000);
-    config_PutFloat(p_intf, "compressor-release", 100.000000);
-    config_PutFloat(p_intf, "compressor-threshold", -11.000000);
-    config_PutFloat(p_intf, "compressor-ratio", 8.000000);
-    config_PutFloat(p_intf, "compressor-knee", 2.500000);
-    config_PutFloat(p_intf, "compressor-makeup-gain", 7.000000);
-
+    playlist_t *p_playlist = pl_Get(getIntf());
     var_SetFloat(p_playlist, "compressor-rms-peak", 0.000000);
     var_SetFloat(p_playlist, "compressor-attack", 25.000000);
     var_SetFloat(p_playlist, "compressor-release", 100.000000);
@@ -801,7 +775,6 @@ static bool GetEqualizerStatus(intf_thread_t *p_custom_intf,
 
 - (IBAction)compressorSliderUpdated:(id)sender
 {
-    intf_thread_t *p_intf = getIntf();
     audio_output_t *p_aout = getAout();
     char *psz_property;
     float f_value = [sender floatValue];
@@ -825,8 +798,7 @@ static bool GetEqualizerStatus(intf_thread_t *p_custom_intf,
         var_SetFloat(p_aout, psz_property, f_value);
         vlc_object_release(p_aout);
     }
-    config_PutFloat(p_intf, psz_property, f_value);
-    var_SetFloat(pl_Get(p_intf), psz_property, f_value);
+    var_SetFloat(pl_Get(getIntf()), psz_property, f_value);
 
     if (sender == _compressorBand1Slider)
         [_compressorBand1TextField setStringValue:[NSString localizedStringWithFormat:@"%1.1f", f_value]];
@@ -876,15 +848,7 @@ static bool GetEqualizerStatus(intf_thread_t *p_custom_intf,
 
 - (IBAction)resetSpatializerValues:(id)sender
 {
-    intf_thread_t *p_intf = getIntf();
-    playlist_t *p_playlist = pl_Get(p_intf);
-
-    config_PutFloat(p_intf, "spatializer-roomsize", .85);
-    config_PutFloat(p_intf, "spatializer-width", 1.);
-    config_PutFloat(p_intf, "spatializer-wet", .4);
-    config_PutFloat(p_intf, "spatializer-dry", .5);
-    config_PutFloat(p_intf, "spatializer-damp", .5);
-
+    playlist_t *p_playlist = pl_Get(getIntf());
     var_SetFloat(p_playlist, "spatializer-roomsize", .85);
     var_SetFloat(p_playlist, "spatializer-width", 1.);
     var_SetFloat(p_playlist, "spatializer-wet", .4);
@@ -911,7 +875,6 @@ static bool GetEqualizerStatus(intf_thread_t *p_custom_intf,
 
 - (IBAction)spatializerSliderUpdated:(id)sender
 {
-    intf_thread_t *p_intf = getIntf();
     audio_output_t *p_aout = getAout();
     char *psz_property = NULL;
     float f_value = [sender floatValue];
@@ -931,8 +894,7 @@ static bool GetEqualizerStatus(intf_thread_t *p_custom_intf,
         var_SetFloat(p_aout, psz_property, f_value / 10.f);
         vlc_object_release(p_aout);
     }
-    config_PutFloat(p_intf, psz_property, f_value / 10.f);
-    var_SetFloat(pl_Get(p_intf), psz_property, f_value / 10.f);
+    var_SetFloat(pl_Get(getIntf()), psz_property, f_value / 10.f);
 
     if (sender == _spatializerBand1Slider)
         [_spatializerBand1TextField setStringValue:[NSString localizedStringWithFormat:@"%1.1f", f_value]];
@@ -985,7 +947,6 @@ static bool GetEqualizerStatus(intf_thread_t *p_custom_intf,
 
 - (IBAction)filterVolumeNormSliderUpdated:(id)sender
 {
-    intf_thread_t *p_intf = getIntf();
     audio_output_t *p_aout = getAout();
     float f_value = [_filterNormLevelSlider floatValue];
 
@@ -994,8 +955,7 @@ static bool GetEqualizerStatus(intf_thread_t *p_custom_intf,
         vlc_object_release(p_aout);
     }
 
-    config_PutFloat(p_intf, "norm-max-level", f_value);
-    var_SetFloat(pl_Get(p_intf), "norm-max-level", f_value);
+    var_SetFloat(pl_Get(getIntf()), "norm-max-level", f_value);
 }
 
 - (IBAction)filterEnableKaraoke:(id)sender
-- 
2.13.1



More information about the vlc-devel mailing list