Moved the mpeg_sound_xxx() functions to sound.c and renamed them to sound_xxx()

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@6240 a1c6a512-1295-4272-9138-f99709370657

2 files changed, 61 insertions, 40 deletions

diff --git a/firmware/export/mp3_playback.h b/firmware/export/mp3_playback.h
index aced6ddc94..4da1ffce6d 100644
--- a/firmware/export/mp3_playback.h
+++ b/firmware/export/mp3_playback.h
@@ -30,19 +30,6 @@ void mp3_init(int volume, int bass, int treble, int balance, int loudness,
               int mdb_strength, int mdb_harmonics,
               int mdb_center, int mdb_shape, bool mdb_enable,
               bool superbass);
-void mpeg_sound_set(int setting, int value);
-int mpeg_sound_min(int setting);
-int mpeg_sound_max(int setting);
-int mpeg_sound_default(int setting);
-void mpeg_sound_channel_config(int configuration);
-int mpeg_val2phys(int setting, int value);
-const char *mpeg_sound_unit(int setting);
-int mpeg_sound_numdecimals(int setting);
-int mpeg_sound_steps(int setting);
-#if (CONFIG_HWCODEC == MAS3587F) || (CONFIG_HWCODEC == MAS3539F) || defined(SIMULATOR)
-void mpeg_set_pitch(int percent);
-#endif
-
 
 /* exported just for mpeg.c, to keep the recording there */
 #if (CONFIG_HWCODEC == MAS3587F) || (CONFIG_HWCODEC == MAS3539F)
@@ -62,31 +49,4 @@ bool mp3_is_playing(void);
 unsigned char* mp3_get_pos(void);
 void mp3_shutdown(void);
 
-
-#define SOUND_VOLUME 0
-#define SOUND_BASS 1
-#define SOUND_TREBLE 2
-#define SOUND_BALANCE 3
-#define SOUND_LOUDNESS 4
-#define SOUND_AVC 5
-#define SOUND_CHANNELS 6
-#define SOUND_STEREO_WIDTH 7
-#define SOUND_LEFT_GAIN 8
-#define SOUND_RIGHT_GAIN 9
-#define SOUND_MIC_GAIN 10
-#define SOUND_MDB_STRENGTH 11
-#define SOUND_MDB_HARMONICS 12
-#define SOUND_MDB_CENTER 13
-#define SOUND_MDB_SHAPE 14
-#define SOUND_MDB_ENABLE 15
-#define SOUND_SUPERBASS 16
-#define SOUND_NUMSETTINGS 17
-
-#define MPEG_SOUND_STEREO 0
-#define MPEG_SOUND_MONO 1
-#define MPEG_SOUND_CUSTOM 2
-#define MPEG_SOUND_MONO_LEFT 3
-#define MPEG_SOUND_MONO_RIGHT 4
-#define MPEG_SOUND_KARAOKE 5
-
 #endif /* #ifndef _MP3_PLAYBACK_H_ */
diff --git a/firmware/export/sound.h b/firmware/export/sound.h
new file mode 100644
index 0000000000..2fa00d88a9
--- /dev/null
+++ b/firmware/export/sound.h
@@ -0,0 +1,61 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ * $Id$
+ *
+ * Copyright (C) 2005 by Linus Nielsen Feltzing
+ *
+ * All files in this archive are subject to the GNU General Public License.
+ * See the file COPYING in the source tree root for full license agreement.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ ****************************************************************************/
+#ifndef SOUND_H
+#define SOUND_H
+
+#define SOUND_VOLUME 0
+#define SOUND_BASS 1
+#define SOUND_TREBLE 2
+#define SOUND_BALANCE 3
+#define SOUND_LOUDNESS 4
+#define SOUND_AVC 5
+#define SOUND_CHANNELS 6
+#define SOUND_STEREO_WIDTH 7
+#define SOUND_LEFT_GAIN 8
+#define SOUND_RIGHT_GAIN 9
+#define SOUND_MIC_GAIN 10
+#define SOUND_MDB_STRENGTH 11
+#define SOUND_MDB_HARMONICS 12
+#define SOUND_MDB_CENTER 13
+#define SOUND_MDB_SHAPE 14
+#define SOUND_MDB_ENABLE 15
+#define SOUND_SUPERBASS 16
+#define SOUND_NUMSETTINGS 17
+
+#define SOUND_CHAN_STEREO 0
+#define SOUND_CHAN_MONO 1
+#define SOUND_CHAN_CUSTOM 2
+#define SOUND_CHAN_MONO_LEFT 3
+#define SOUND_CHAN_MONO_RIGHT 4
+#define SOUND_CHAN_KARAOKE 5
+
+void sound_set(int setting, int value);
+int sound_min(int setting);
+int sound_max(int setting);
+int sound_default(int setting);
+void sound_channel_config(int configuration);
+int sound_val2phys(int setting, int value);
+const char *sound_unit(int setting);
+int sound_numdecimals(int setting);
+int sound_steps(int setting);
+#if (CONFIG_HWCODEC == MAS3587F) || (CONFIG_HWCODEC == MAS3539F) || defined(SIMULATOR)
+void sound_set_pitch(int percent);
+#endif
+
+#endif