diff options
Diffstat (limited to 'lib/rbcodec/dsp')
-rw-r--r-- | lib/rbcodec/dsp/dsp_misc.c | 18 | ||||
-rw-r--r-- | lib/rbcodec/dsp/pga.h | 3 |
2 files changed, 0 insertions, 21 deletions
diff --git a/lib/rbcodec/dsp/dsp_misc.c b/lib/rbcodec/dsp/dsp_misc.c index 1083215c17..a8c9423cfb 100644 --- a/lib/rbcodec/dsp/dsp_misc.c +++ b/lib/rbcodec/dsp/dsp_misc.c | |||
@@ -35,11 +35,6 @@ | |||
35 | #endif | 35 | #endif |
36 | #include <string.h> | 36 | #include <string.h> |
37 | 37 | ||
38 | #if defined(HAVE_SW_TONE_CONTROLS) && defined(HAVE_SW_VOLUME_CONTROL) | ||
39 | /* Still need this for volume control */ | ||
40 | #include "settings.h" | ||
41 | #endif | ||
42 | |||
43 | /** Firmware callback interface **/ | 38 | /** Firmware callback interface **/ |
44 | 39 | ||
45 | /* Hook back from firmware/ part of audio, which can't/shouldn't call apps/ | 40 | /* Hook back from firmware/ part of audio, which can't/shouldn't call apps/ |
@@ -58,19 +53,6 @@ int dsp_callback(int msg, intptr_t param) | |||
58 | case DSP_CALLBACK_SET_TREBLE: | 53 | case DSP_CALLBACK_SET_TREBLE: |
59 | tone_set_treble(param); | 54 | tone_set_treble(param); |
60 | break; | 55 | break; |
61 | /* FIXME: This must be done by bottom-level PCM driver so it works with | ||
62 | all PCM, not here and not in mixer. I won't fully support it | ||
63 | here with all streams. -- jethead71 */ | ||
64 | #ifdef HAVE_SW_VOLUME_CONTROL | ||
65 | case DSP_CALLBACK_SET_SW_VOLUME: | ||
66 | if (global_settings.volume < SW_VOLUME_MAX || | ||
67 | global_settings.volume > SW_VOLUME_MIN) | ||
68 | { | ||
69 | int vol_gain = get_replaygain_int(global_settings.volume * 100); | ||
70 | pga_set_gain(PGA_VOLUME, vol_gain); | ||
71 | } | ||
72 | break; | ||
73 | #endif /* HAVE_SW_VOLUME_CONTROL */ | ||
74 | #endif /* HAVE_SW_TONE_CONTROLS */ | 56 | #endif /* HAVE_SW_TONE_CONTROLS */ |
75 | case DSP_CALLBACK_SET_CHANNEL_CONFIG: | 57 | case DSP_CALLBACK_SET_CHANNEL_CONFIG: |
76 | channel_mode_set_config(param); | 58 | channel_mode_set_config(param); |
diff --git a/lib/rbcodec/dsp/pga.h b/lib/rbcodec/dsp/pga.h index f0c4c4717f..c05265873b 100644 --- a/lib/rbcodec/dsp/pga.h +++ b/lib/rbcodec/dsp/pga.h | |||
@@ -28,9 +28,6 @@ enum pga_gain_ids | |||
28 | { | 28 | { |
29 | PGA_EQ_PRECUT = 0, | 29 | PGA_EQ_PRECUT = 0, |
30 | PGA_REPLAYGAIN, | 30 | PGA_REPLAYGAIN, |
31 | #ifdef HAVE_SW_VOLUME_CONTROL | ||
32 | PGA_VOLUME, | ||
33 | #endif | ||
34 | PGA_NUM_GAINS, | 31 | PGA_NUM_GAINS, |
35 | }; | 32 | }; |
36 | 33 | ||