diff options
Diffstat (limited to 'apps/sound_menu.c')
-rw-r--r-- | apps/sound_menu.c | 28 |
1 files changed, 19 insertions, 9 deletions
diff --git a/apps/sound_menu.c b/apps/sound_menu.c index 63873ff0f8..24da3f5555 100644 --- a/apps/sound_menu.c +++ b/apps/sound_menu.c | |||
@@ -145,48 +145,56 @@ void set_sound(char* string, | |||
145 | lcd_stop_scroll(); | 145 | lcd_stop_scroll(); |
146 | } | 146 | } |
147 | 147 | ||
148 | static void volume(void) | 148 | static Menu volume(void) |
149 | { | 149 | { |
150 | set_sound("Volume", &global_settings.volume, SOUND_VOLUME); | 150 | set_sound("Volume", &global_settings.volume, SOUND_VOLUME); |
151 | return MENU_OK; | ||
151 | } | 152 | } |
152 | 153 | ||
153 | static void balance(void) | 154 | static Menu balance(void) |
154 | { | 155 | { |
155 | set_sound("Balance", &global_settings.balance, SOUND_BALANCE); | 156 | set_sound("Balance", &global_settings.balance, SOUND_BALANCE); |
157 | return MENU_OK; | ||
156 | } | 158 | } |
157 | 159 | ||
158 | static void bass(void) | 160 | static Menu bass(void) |
159 | { | 161 | { |
160 | set_sound("Bass", &global_settings.bass, SOUND_BASS); | 162 | set_sound("Bass", &global_settings.bass, SOUND_BASS); |
163 | return MENU_OK; | ||
161 | }; | 164 | }; |
162 | 165 | ||
163 | static void treble(void) | 166 | static Menu treble(void) |
164 | { | 167 | { |
165 | set_sound("Treble", &global_settings.treble, SOUND_TREBLE); | 168 | set_sound("Treble", &global_settings.treble, SOUND_TREBLE); |
169 | return MENU_OK; | ||
166 | } | 170 | } |
167 | 171 | ||
168 | #ifdef HAVE_MAS3587F | 172 | #ifdef HAVE_MAS3587F |
169 | static void loudness(void) | 173 | static Menu loudness(void) |
170 | { | 174 | { |
171 | set_sound("Loudness", &global_settings.loudness, SOUND_LOUDNESS); | 175 | set_sound("Loudness", &global_settings.loudness, SOUND_LOUDNESS); |
176 | return MENU_OK; | ||
172 | }; | 177 | }; |
173 | 178 | ||
174 | static void bass_boost(void) | 179 | static Menu bass_boost(void) |
175 | { | 180 | { |
176 | set_sound("Bass boost", &global_settings.bass_boost, SOUND_SUPERBASS); | 181 | set_sound("Bass boost", &global_settings.bass_boost, SOUND_SUPERBASS); |
182 | return MENU_OK; | ||
177 | }; | 183 | }; |
178 | 184 | ||
179 | static void avc(void) | 185 | static Menu avc(void) |
180 | { | 186 | { |
181 | char* names[] = { "off", "2s ", "4s ", "8s " }; | 187 | char* names[] = { "off", "2s ", "4s ", "8s " }; |
182 | set_option("[AV decay time]", &global_settings.avc, names, 4 ); | 188 | set_option("[AV decay time]", &global_settings.avc, names, 4 ); |
183 | mpeg_sound_set(SOUND_AVC, global_settings.avc); | 189 | mpeg_sound_set(SOUND_AVC, global_settings.avc); |
190 | return MENU_OK; | ||
184 | } | 191 | } |
185 | #endif /* ARCHOS_RECORDER */ | 192 | #endif /* ARCHOS_RECORDER */ |
186 | 193 | ||
187 | void sound_menu(void) | 194 | Menu sound_menu(void) |
188 | { | 195 | { |
189 | int m; | 196 | int m; |
197 | Menu result; | ||
190 | struct menu_items items[] = { | 198 | struct menu_items items[] = { |
191 | { "Volume", volume }, | 199 | { "Volume", volume }, |
192 | { "Bass", bass }, | 200 | { "Bass", bass }, |
@@ -200,6 +208,8 @@ void sound_menu(void) | |||
200 | }; | 208 | }; |
201 | 209 | ||
202 | m=menu_init( items, sizeof items / sizeof(struct menu_items) ); | 210 | m=menu_init( items, sizeof items / sizeof(struct menu_items) ); |
203 | menu_run(m); | 211 | result = menu_run(m); |
204 | menu_exit(m); | 212 | menu_exit(m); |
213 | |||
214 | return result; | ||
205 | } | 215 | } |