summaryrefslogtreecommitdiffstats
path: root/firmware/sound.c
diff options
context:
space:
mode:
authorMichael Sevakis <jethead71@rockbox.org>2013-04-15 13:24:29 -0400
committerMichael Sevakis <jethead71@rockbox.org>2013-04-15 13:24:29 -0400
commitbbd991ad63805533ec4e2558061bbba48bfab1a9 (patch)
tree21986650ba75882d2100597591d4338dc6a14c10 /firmware/sound.c
parent0971f576341cf38c04d2d9735f0a385e62974108 (diff)
downloadrockbox-bbd991ad63805533ec4e2558061bbba48bfab1a9.tar.gz
rockbox-bbd991ad63805533ec4e2558061bbba48bfab1a9.tar.bz2
rockbox-bbd991ad63805533ec4e2558061bbba48bfab1a9.zip
Fix some more errors and warnings from 0c7b787.
Change-Id: Ib67d0ab344e36964cadbcc982dc2afe35733770b
Diffstat (limited to 'firmware/sound.c')
-rw-r--r--firmware/sound.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/firmware/sound.c b/firmware/sound.c
index 4c390f4a5b..e6cfe57cf5 100644
--- a/firmware/sound.c
+++ b/firmware/sound.c
@@ -103,13 +103,6 @@ void sound_set(int setting, int value)
sound_set_val(value);
}
-/* Return the sound value scaled to centibels (tenth-decibels) */
-static int sound_value_to_cb(int setting, int value)
-{
- long e = (1 - sound_numdecimals(setting)) << 16;
- return fp_mul(value, fp_exp10(e, 16), 16);
-}
-
#if !defined(AUDIOHW_HAVE_CLIPPING)
/*
* The prescaler compensates for any kind of boosts, to prevent clipping.
@@ -132,6 +125,13 @@ static int current_bass = 0; /* tenth dB */
static int current_eq_band_gain[AUDIOHW_EQ_BAND_NUM]; /* tenth dB */
#endif
+/* Return the sound value scaled to centibels (tenth-decibels) */
+static int sound_value_to_cb(int setting, int value)
+{
+ long e = (1 - sound_numdecimals(setting)) << 16;
+ return fp_mul(value, fp_exp10(e, 16), 16);
+}
+
static void set_prescaled_volume(void)
{
int prescale = 0;