diff options
Diffstat (limited to 'apps/main.c')
-rw-r--r-- | apps/main.c | 35 |
1 files changed, 19 insertions, 16 deletions
diff --git a/apps/main.c b/apps/main.c index 04154f54fe..d6be594d07 100644 --- a/apps/main.c +++ b/apps/main.c | |||
@@ -37,6 +37,7 @@ | |||
37 | #include "serial.h" | 37 | #include "serial.h" |
38 | #endif | 38 | #endif |
39 | #include "mpeg.h" | 39 | #include "mpeg.h" |
40 | #include "mp3_playback.h" | ||
40 | #include "main_menu.h" | 41 | #include "main_menu.h" |
41 | #include "thread.h" | 42 | #include "thread.h" |
42 | #include "settings.h" | 43 | #include "settings.h" |
@@ -78,14 +79,15 @@ void init(void) | |||
78 | sleep(HZ/2); | 79 | sleep(HZ/2); |
79 | tree_init(); | 80 | tree_init(); |
80 | playlist_init(); | 81 | playlist_init(); |
81 | mpeg_init( global_settings.volume, | 82 | mp3_init( global_settings.volume, |
82 | global_settings.bass, | 83 | global_settings.bass, |
83 | global_settings.treble, | 84 | global_settings.treble, |
84 | global_settings.balance, | 85 | global_settings.balance, |
85 | global_settings.loudness, | 86 | global_settings.loudness, |
86 | global_settings.bass_boost, | 87 | global_settings.bass_boost, |
87 | global_settings.avc, | 88 | global_settings.avc, |
88 | global_settings.channel_config ); | 89 | global_settings.channel_config ); |
90 | mpeg_init(); | ||
89 | while (button_get(false) != 0) | 91 | while (button_get(false) != 0) |
90 | ; /* Empty the keyboard buffer */ | 92 | ; /* Empty the keyboard buffer */ |
91 | } | 93 | } |
@@ -197,14 +199,15 @@ void init(void) | |||
197 | 199 | ||
198 | /* No buffer allocation (see buffer.c) may take place after the call to | 200 | /* No buffer allocation (see buffer.c) may take place after the call to |
199 | mpeg_init() since the mpeg thread takes the rest of the buffer space */ | 201 | mpeg_init() since the mpeg thread takes the rest of the buffer space */ |
200 | mpeg_init( global_settings.volume, | 202 | mp3_init( global_settings.volume, |
201 | global_settings.bass, | 203 | global_settings.bass, |
202 | global_settings.treble, | 204 | global_settings.treble, |
203 | global_settings.balance, | 205 | global_settings.balance, |
204 | global_settings.loudness, | 206 | global_settings.loudness, |
205 | global_settings.bass_boost, | 207 | global_settings.bass_boost, |
206 | global_settings.avc, | 208 | global_settings.avc, |
207 | global_settings.channel_config ); | 209 | global_settings.channel_config ); |
210 | mpeg_init(); | ||
208 | 211 | ||
209 | /* no auto-rolo on startup any more, but I leave it here for reference */ | 212 | /* no auto-rolo on startup any more, but I leave it here for reference */ |
210 | #if 0 | 213 | #if 0 |