Merge pull request #316 from quantum5/more-globals

Eliminate all ASan-detected leaks in default configuration

cava.c

@@ -108,10 +108,13 @@ struct config_params p;
 
 double *in_bass_r, *in_bass_l;
 fftw_complex *out_bass_l, *out_bass_r;
+fftw_plan p_bass_l, p_bass_r;
 double *in_mid_r, *in_mid_l;
 fftw_complex *out_mid_l, *out_mid_r;
+fftw_plan p_mid_l, p_mid_r;
 double *in_treble_r, *in_treble_l;
 fftw_complex *out_treble_l, *out_treble_r;
+fftw_plan p_treble_l, p_treble_r;
 
 // general: cleanup
 void cleanup(void) {
@@ -513,9 +516,9 @@ as of 0.4.0 all options are specified in config file, see in '/home/username/.co
         memset(out_bass_l, 0, 2 * (audio.FFTbassbufferSize / 2 + 1) * sizeof(fftw_complex));
         memset(out_bass_r, 0, 2 * (audio.FFTbassbufferSize / 2 + 1) * sizeof(fftw_complex));
 
-        fftw_plan p_bass_l =
+        p_bass_l =
             fftw_plan_dft_r2c_1d(audio.FFTbassbufferSize, in_bass_l, out_bass_l, FFTW_MEASURE);
-        fftw_plan p_bass_r =
+        p_bass_r =
             fftw_plan_dft_r2c_1d(audio.FFTbassbufferSize, in_bass_r, out_bass_r, FFTW_MEASURE);
 
         // MID
@@ -530,10 +533,8 @@ as of 0.4.0 all options are specified in config file, see in '/home/username/.co
         memset(out_mid_l, 0, 2 * (audio.FFTmidbufferSize / 2 + 1) * sizeof(fftw_complex));
         memset(out_mid_r, 0, 2 * (audio.FFTmidbufferSize / 2 + 1) * sizeof(fftw_complex));
 
-        fftw_plan p_mid_l =
-            fftw_plan_dft_r2c_1d(audio.FFTmidbufferSize, in_mid_l, out_mid_l, FFTW_MEASURE);
-        fftw_plan p_mid_r =
-            fftw_plan_dft_r2c_1d(audio.FFTmidbufferSize, in_mid_r, out_mid_r, FFTW_MEASURE);
+        p_mid_l = fftw_plan_dft_r2c_1d(audio.FFTmidbufferSize, in_mid_l, out_mid_l, FFTW_MEASURE);
+        p_mid_r = fftw_plan_dft_r2c_1d(audio.FFTmidbufferSize, in_mid_r, out_mid_r, FFTW_MEASURE);
 
         // TRIEBLE
         // audio.FFTtreblebufferSize =  audio.rate / treble_cut_off; // audio.FFTbassbufferSize;
@@ -547,10 +548,10 @@ as of 0.4.0 all options are specified in config file, see in '/home/username/.co
         memset(out_treble_l, 0, 2 * (audio.FFTtreblebufferSize / 2 + 1) * sizeof(fftw_complex));
         memset(out_treble_r, 0, 2 * (audio.FFTtreblebufferSize / 2 + 1) * sizeof(fftw_complex));
 
-        fftw_plan p_treble_l = fftw_plan_dft_r2c_1d(audio.FFTtreblebufferSize, in_treble_l,
-                                                    out_treble_l, FFTW_MEASURE);
-        fftw_plan p_treble_r = fftw_plan_dft_r2c_1d(audio.FFTtreblebufferSize, in_treble_r,
-                                                    out_treble_r, FFTW_MEASURE);
+        p_treble_l = fftw_plan_dft_r2c_1d(audio.FFTtreblebufferSize, in_treble_l, out_treble_l,
+                                          FFTW_MEASURE);
+        p_treble_r = fftw_plan_dft_r2c_1d(audio.FFTtreblebufferSize, in_treble_r, out_treble_r,
+                                          FFTW_MEASURE);
 
         debug("got buffer size: %d, %d, %d", audio.FFTbassbufferSize, audio.FFTmidbufferSize,
               audio.FFTtreblebufferSize);
@@ -799,6 +800,8 @@ as of 0.4.0 all options are specified in config file, see in '/home/username/.co
                     break;
 
                 case 'q':
+                    if (sourceIsAuto)
+                        free(audio.source);
                     cleanup();
                     return EXIT_SUCCESS;
                 }