changeset 4523:b3e4f5c31546

Conditional USE_SRC was changed to USE_SAMPLERATE earlier.

--- a/src/audacious/audconfig.c	Wed Apr 30 03:41:47 2008 +0300
+++ b/src/audacious/audconfig.c	Wed Apr 30 03:43:15 2008 +0300
@@ -27,7 +27,7 @@
 #  include "config.h"
 #endif
 
-#ifdef USE_SRC
+#ifdef USE_SAMPLERATE
 #  include <samplerate.h>
 #endif
 
@@ -171,7 +171,7 @@
     .replay_gain_preamp = 0.0,
     .default_gain = -9.0,
     .saved_volume = 0x6464,            /* for both channels; 0x64=100 */
-#ifdef USE_SRC
+#ifdef USE_SAMPLERATE
     .enable_src = FALSE,               /* enable resampling */
     .src_rate = 48000,                 /* samplerate */
     .src_type = SRC_SINC_BEST_QUALITY, /* default interpolation method */
@@ -279,7 +279,7 @@
     {"replay_gain_track", &cfg.replay_gain_track, TRUE},
     {"replay_gain_album", &cfg.replay_gain_album, TRUE},
     {"enable_adaptive_scaler", &cfg.enable_adaptive_scaler, TRUE},
-#ifdef USE_SRC
+#ifdef USE_SAMPLERATE
     {"enable_src", &cfg.enable_src, TRUE},
 #endif
     {"bypass_dsp", &cfg.bypass_dsp, TRUE},
@@ -322,7 +322,7 @@
     {"colorize_b", &cfg.colorize_b, TRUE},
     {"output_bit_depth", &cfg.output_bit_depth, TRUE},
     {"saved_volume", &cfg.saved_volume, TRUE},
-#ifdef USE_SRC
+#ifdef USE_SAMPLERATE
     {"src_rate", &cfg.src_rate, TRUE},
     {"src_type", &cfg.src_type, TRUE},
 #endif

--- a/src/audacious/audconfig.h	Wed Apr 30 03:41:47 2008 +0300
+++ b/src/audacious/audconfig.h	Wed Apr 30 03:43:15 2008 +0300
@@ -126,7 +126,7 @@
     gfloat replay_gain_preamp;
     gfloat default_gain;
     gint saved_volume;
-#ifdef USE_SRC
+#ifdef USE_SAMPLERATE
     gboolean enable_src;
     gint src_rate;
     gint src_type;

--- a/src/audacious/main.c	Wed Apr 30 03:41:47 2008 +0300
+++ b/src/audacious/main.c	Wed Apr 30 03:43:15 2008 +0300
@@ -45,7 +45,7 @@
 #include <sys/stat.h>
 #include <signal.h>
 
-#ifdef USE_SRC
+#ifdef USE_SAMPLERATE
 #  include <samplerate.h>
 #endif
 

--- a/src/audacious/output.c	Wed Apr 30 03:41:47 2008 +0300
+++ b/src/audacious/output.c	Wed Apr 30 03:43:15 2008 +0300
@@ -51,7 +51,7 @@
 
 #include <math.h>
 
-#ifdef USE_SRC
+#ifdef USE_SAMPLERATE
 # include "src_flow.h"
 #endif
 
@@ -333,7 +333,7 @@
     if (bypass_dsp) {
         return TRUE;
     } else {
-#ifdef USE_SRC
+#ifdef USE_SAMPLERATE
         rate = src_flow_init(rate, nch); /* returns sample rate unchanged if resampling switched off */
 #endif
     
@@ -427,7 +427,7 @@
     replay_gain_info.album_gain = 0.0;
     replay_gain_info.album_peak = 0.0;
 
-#ifdef USE_SRC
+#ifdef USE_SAMPLERATE
     src_flow_free();
 #endif
     /* Do not close if there are still songs to play and the user has 
@@ -542,7 +542,7 @@
         if (postproc_flow == NULL)
         {
             postproc_flow = flow_new();
-#ifdef USE_SRC
+#ifdef USE_SAMPLERATE
             flow_link_element(postproc_flow, src_flow);
 #endif
             flow_link_element(postproc_flow, equalizer_flow);

--- a/src/audacious/src_flow.c	Wed Apr 30 03:41:47 2008 +0300
+++ b/src/audacious/src_flow.c	Wed Apr 30 03:43:15 2008 +0300
@@ -23,7 +23,7 @@
 #  include "config.h"
 #endif
 
-#ifdef USE_SRC
+#ifdef USE_SAMPLERATE
 
 #include <stdlib.h>
 #include <stdio.h>
@@ -129,5 +129,5 @@
     }
 }
 
-#endif /* USE_SRC */
+#endif /* USE_SAMPLERATE */
 

--- a/src/audacious/ui_preferences.c	Wed Apr 30 03:41:47 2008 +0300
+++ b/src/audacious/ui_preferences.c	Wed Apr 30 03:43:15 2008 +0300
@@ -891,7 +891,7 @@
 on_enable_src_realize(GtkToggleButton * button,
                       gpointer data)
 {
-#ifdef USE_SRC
+#ifdef USE_SAMPLERATE
     gtk_toggle_button_set_active(button, cfg.enable_src);
 #else
     gtk_toggle_button_set_active(button, FALSE);
@@ -902,7 +902,7 @@
 static void
 on_enable_src_toggled(GtkToggleButton * button, gpointer data)
 {
-#ifdef USE_SRC
+#ifdef USE_SAMPLERATE
     cfg.enable_src = gtk_toggle_button_get_active(button);
 #endif
 }
@@ -911,7 +911,7 @@
 on_src_rate_realize(GtkSpinButton * button,
                     gpointer data)
 {
-#ifdef USE_SRC
+#ifdef USE_SAMPLERATE
     gtk_spin_button_set_value(button, (gdouble)cfg.src_rate);
 #else
     gtk_widget_set_sensitive(GTK_WIDGET(button), FALSE);
@@ -922,7 +922,7 @@
 on_src_rate_value_changed(GtkSpinButton * button,
                           gpointer data)
 {
-#ifdef USE_SRC
+#ifdef USE_SAMPLERATE
     cfg.src_rate = gtk_spin_button_get_value_as_int(button);
 #endif
 }
@@ -931,7 +931,7 @@
 on_src_converter_type_realize(GtkComboBox * box,
                               gpointer data)
 {
-#ifdef USE_SRC
+#ifdef USE_SAMPLERATE
     gtk_combo_box_set_active(box, cfg.src_type);
 #else
     gtk_widget_set_sensitive(GTK_WIDGET(box), FALSE);
@@ -942,7 +942,7 @@
 on_src_converter_type_changed(GtkComboBox * box,
                               gpointer data)
 {
-#ifdef USE_SRC
+#ifdef USE_SAMPLERATE
     cfg.src_type = gtk_combo_box_get_active(box);
 #endif
 }