summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Sevakis <jethead71@rockbox.org>2012-04-30 17:51:05 -0400
committerMichael Sevakis <jethead71@rockbox.org>2012-04-30 17:51:05 -0400
commitf5d9a45e3ffb1326dced431025cc10814ea4b7d8 (patch)
treec9c4a39455729731153eb8013dc0b187ef742057
parent8f9e3b10a52979ad57736c1703f3578d496bf8df (diff)
downloadrockbox-f5d9a45e3ffb1326dced431025cc10814ea4b7d8.tar.gz
rockbox-f5d9a45e3ffb1326dced431025cc10814ea4b7d8.zip
Should've had dsp_replaygain_set_gains as static for now...
...because currently gains are only set through dsp_configure. Change-Id: I2866473a82fdd5f41de4705b45928daa7e43f8eb
-rw-r--r--lib/rbcodec/dsp/dsp_misc.c12
-rw-r--r--lib/rbcodec/dsp/dsp_misc.h1
2 files changed, 6 insertions, 7 deletions
diff --git a/lib/rbcodec/dsp/dsp_misc.c b/lib/rbcodec/dsp/dsp_misc.c
index c871e5bd14..c87a1d528e 100644
--- a/lib/rbcodec/dsp/dsp_misc.c
+++ b/lib/rbcodec/dsp/dsp_misc.c
@@ -138,12 +138,7 @@ static void dsp_replaygain_update(
138 pga_enable_gain(PGA_REPLAYGAIN, gain != PGA_UNITY); 138 pga_enable_gain(PGA_REPLAYGAIN, gain != PGA_UNITY);
139} 139}
140 140
141void dsp_replaygain_set_settings(const struct replaygain_settings *settings) 141static void dsp_replaygain_set_gains(const struct dsp_replay_gains *gains)
142{
143 dsp_replaygain_update(settings, &current_gains);
144}
145
146void dsp_replaygain_set_gains(const struct dsp_replay_gains *gains)
147{ 142{
148 if (gains == NULL) 143 if (gains == NULL)
149 { 144 {
@@ -155,6 +150,11 @@ void dsp_replaygain_set_gains(const struct dsp_replay_gains *gains)
155 dsp_replaygain_update(&current_settings, gains); 150 dsp_replaygain_update(&current_settings, gains);
156} 151}
157 152
153void dsp_replaygain_set_settings(const struct replaygain_settings *settings)
154{
155 dsp_replaygain_update(settings, &current_gains);
156}
157
158 158
159/** Pitch Settings **/ 159/** Pitch Settings **/
160 160
diff --git a/lib/rbcodec/dsp/dsp_misc.h b/lib/rbcodec/dsp/dsp_misc.h
index e0035457f5..1c84fd5a11 100644
--- a/lib/rbcodec/dsp/dsp_misc.h
+++ b/lib/rbcodec/dsp/dsp_misc.h
@@ -53,7 +53,6 @@ struct dsp_replay_gains
53}; 53};
54 54
55void dsp_replaygain_set_settings(const struct replaygain_settings *settings); 55void dsp_replaygain_set_settings(const struct replaygain_settings *settings);
56void dsp_replaygain_set_gains(const struct dsp_replay_gains *gains);
57 56
58#ifdef HAVE_PITCHSCREEN 57#ifdef HAVE_PITCHSCREEN
59void sound_set_pitch(int32_t ratio); 58void sound_set_pitch(int32_t ratio);