diff options
author | Daniel Stenberg <daniel@haxx.se> | 2002-06-19 14:58:35 +0000 |
---|---|---|
committer | Daniel Stenberg <daniel@haxx.se> | 2002-06-19 14:58:35 +0000 |
commit | 6cd60cc3e33e731d4bd2bbd98653fbc629f77cfb (patch) | |
tree | 67f1634a4607e661febb2361b60bb2988b9cde5d /firmware | |
parent | 258919cc554ed76a742fb0a03f368756a254a675 (diff) | |
download | rockbox-6cd60cc3e33e731d4bd2bbd98653fbc629f77cfb.tar.gz rockbox-6cd60cc3e33e731d4bd2bbd98653fbc629f77cfb.zip |
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.h | 13 | ||||
-rw-r--r-- | firmware/mpeg.c | 1 | ||||
-rw-r--r-- | firmware/settings.h | 13 |
3 files changed, 14 insertions, 13 deletions
diff --git a/firmware/config.h b/firmware/config.h index 860016c6d8..d79f061088 100644 --- a/firmware/config.h +++ b/firmware/config.h | |||
@@ -30,17 +30,4 @@ | |||
30 | /* no known platform */ | 30 | /* no known platform */ |
31 | #endif | 31 | #endif |
32 | 32 | ||
33 | /* system defines */ | ||
34 | |||
35 | #define DEFAULT_VOLUME_SETTING 70 | ||
36 | #define DEFAULT_BALANCE_SETTING 50 | ||
37 | #define DEFAULT_BASS_SETTING 50 | ||
38 | #define DEFAULT_TREBLE_SETTING 50 | ||
39 | #define DEFAULT_LOUDNESS_SETTING 0 | ||
40 | #define DEFAULT_BASS_BOOST_SETTING 0 | ||
41 | #define DEFAULT_CONTRAST_SETTING 0 | ||
42 | #define DEFAULT_POWEROFF_SETTING 0 | ||
43 | #define DEFAULT_BACKLIGHT_SETTING 1 | ||
44 | |||
45 | |||
46 | #endif | 33 | #endif |
diff --git a/firmware/mpeg.c b/firmware/mpeg.c index 955d598c54..11f4ba6c0c 100644 --- a/firmware/mpeg.c +++ b/firmware/mpeg.c | |||
@@ -28,6 +28,7 @@ | |||
28 | #include "thread.h" | 28 | #include "thread.h" |
29 | #include "panic.h" | 29 | #include "panic.h" |
30 | #include "file.h" | 30 | #include "file.h" |
31 | #include "settings.h" | ||
31 | 32 | ||
32 | #define MPEG_STACK_SIZE 0x2000 | 33 | #define MPEG_STACK_SIZE 0x2000 |
33 | #define MPEG_CHUNKSIZE 0x20000 | 34 | #define MPEG_CHUNKSIZE 0x20000 |
diff --git a/firmware/settings.h b/firmware/settings.h index 29c87d0468..935c611161 100644 --- a/firmware/settings.h +++ b/firmware/settings.h | |||
@@ -64,6 +64,19 @@ void reload_all_settings( user_settings_t *settings ); | |||
64 | void reset_settings( user_settings_t *settings ); | 64 | void reset_settings( user_settings_t *settings ); |
65 | void display_current_settings( user_settings_t *settings ); | 65 | void display_current_settings( user_settings_t *settings ); |
66 | 66 | ||
67 | /* system defines */ | ||
68 | |||
69 | #define DEFAULT_VOLUME_SETTING 70 | ||
70 | #define DEFAULT_BALANCE_SETTING 50 | ||
71 | #define DEFAULT_BASS_SETTING 50 | ||
72 | #define DEFAULT_TREBLE_SETTING 50 | ||
73 | #define DEFAULT_LOUDNESS_SETTING 0 | ||
74 | #define DEFAULT_BASS_BOOST_SETTING 0 | ||
75 | #define DEFAULT_CONTRAST_SETTING 0 | ||
76 | #define DEFAULT_POWEROFF_SETTING 0 | ||
77 | #define DEFAULT_BACKLIGHT_SETTING 1 | ||
78 | |||
79 | |||
67 | #endif /* __SETTINGS_H__ */ | 80 | #endif /* __SETTINGS_H__ */ |
68 | 81 | ||
69 | 82 | ||