summaryrefslogtreecommitdiff
path: root/firmware
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2002-06-19 14:58:35 +0000
committerDaniel Stenberg <daniel@haxx.se>2002-06-19 14:58:35 +0000
commit6cd60cc3e33e731d4bd2bbd98653fbc629f77cfb (patch)
tree67f1634a4607e661febb2361b60bb2988b9cde5d /firmware
parent258919cc554ed76a742fb0a03f368756a254a675 (diff)
downloadrockbox-6cd60cc3e33e731d4bd2bbd98653fbc629f77cfb.zip
rockbox-6cd60cc3e33e731d4bd2bbd98653fbc629f77cfb.tar.gz
rockbox-6cd60cc3e33e731d4bd2bbd98653fbc629f77cfb.tar.bz2
rockbox-6cd60cc3e33e731d4bd2bbd98653fbc629f77cfb.tar.xz
moved sounds settings to settings.h, config.h is only for including the
correct sub-config.h filea git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1086 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware')
-rw-r--r--firmware/config.h13
-rw-r--r--firmware/mpeg.c1
-rw-r--r--firmware/settings.h13
3 files changed, 14 insertions, 13 deletions
diff --git a/firmware/config.h b/firmware/config.h
index 860016c..d79f061 100644
--- a/firmware/config.h
+++ b/firmware/config.h
@@ -30,17 +30,4 @@
/* no known platform */
#endif
-/* system defines */
-
-#define DEFAULT_VOLUME_SETTING 70
-#define DEFAULT_BALANCE_SETTING 50
-#define DEFAULT_BASS_SETTING 50
-#define DEFAULT_TREBLE_SETTING 50
-#define DEFAULT_LOUDNESS_SETTING 0
-#define DEFAULT_BASS_BOOST_SETTING 0
-#define DEFAULT_CONTRAST_SETTING 0
-#define DEFAULT_POWEROFF_SETTING 0
-#define DEFAULT_BACKLIGHT_SETTING 1
-
-
#endif
diff --git a/firmware/mpeg.c b/firmware/mpeg.c
index 955d598..11f4ba6 100644
--- a/firmware/mpeg.c
+++ b/firmware/mpeg.c
@@ -28,6 +28,7 @@
#include "thread.h"
#include "panic.h"
#include "file.h"
+#include "settings.h"
#define MPEG_STACK_SIZE 0x2000
#define MPEG_CHUNKSIZE 0x20000
diff --git a/firmware/settings.h b/firmware/settings.h
index 29c87d0..935c611 100644
--- a/firmware/settings.h
+++ b/firmware/settings.h
@@ -64,6 +64,19 @@ void reload_all_settings( user_settings_t *settings );
void reset_settings( user_settings_t *settings );
void display_current_settings( user_settings_t *settings );
+/* system defines */
+
+#define DEFAULT_VOLUME_SETTING 70
+#define DEFAULT_BALANCE_SETTING 50
+#define DEFAULT_BASS_SETTING 50
+#define DEFAULT_TREBLE_SETTING 50
+#define DEFAULT_LOUDNESS_SETTING 0
+#define DEFAULT_BASS_BOOST_SETTING 0
+#define DEFAULT_CONTRAST_SETTING 0
+#define DEFAULT_POWEROFF_SETTING 0
+#define DEFAULT_BACKLIGHT_SETTING 1
+
+
#endif /* __SETTINGS_H__ */