diff options
author | Linus Nielsen Feltzing <linus@haxx.se> | 2005-04-04 12:06:29 +0000 |
---|---|---|
committer | Linus Nielsen Feltzing <linus@haxx.se> | 2005-04-04 12:06:29 +0000 |
commit | 8a237a829e0f63b61536f315209a6d0ea1477e31 (patch) | |
tree | 1fe54329fe776aa7bc982a37203cb61c13244a48 /apps/main.c | |
parent | ec4e9b8d600c53add3c8bf6eb7fe1975dba141a7 (diff) | |
download | rockbox-8a237a829e0f63b61536f315209a6d0ea1477e31.tar.gz rockbox-8a237a829e0f63b61536f315209a6d0ea1477e31.zip |
More audio code restructuring, mostly renaming functions so far
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@6246 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/main.c')
-rw-r--r-- | apps/main.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/apps/main.c b/apps/main.c index 505022481e..b5c6364080 100644 --- a/apps/main.c +++ b/apps/main.c | |||
@@ -38,7 +38,7 @@ | |||
38 | #ifndef DEBUG | 38 | #ifndef DEBUG |
39 | #include "serial.h" | 39 | #include "serial.h" |
40 | #endif | 40 | #endif |
41 | #include "mpeg.h" | 41 | #include "audio.h" |
42 | #include "mp3_playback.h" | 42 | #include "mp3_playback.h" |
43 | #include "main_menu.h" | 43 | #include "main_menu.h" |
44 | #include "thread.h" | 44 | #include "thread.h" |
@@ -114,7 +114,7 @@ void init(void) | |||
114 | global_settings.mdb_shape, | 114 | global_settings.mdb_shape, |
115 | global_settings.mdb_enable, | 115 | global_settings.mdb_enable, |
116 | global_settings.superbass); | 116 | global_settings.superbass); |
117 | mpeg_init(); | 117 | audio_init(); |
118 | button_clear_queue(); /* Empty the keyboard buffer */ | 118 | button_clear_queue(); /* Empty the keyboard buffer */ |
119 | } | 119 | } |
120 | 120 | ||
@@ -235,7 +235,7 @@ void init(void) | |||
235 | tree_init(); | 235 | tree_init(); |
236 | 236 | ||
237 | /* No buffer allocation (see buffer.c) may take place after the call to | 237 | /* No buffer allocation (see buffer.c) may take place after the call to |
238 | mpeg_init() since the mpeg thread takes the rest of the buffer space */ | 238 | audio_init() since the mpeg thread takes the rest of the buffer space */ |
239 | mp3_init( global_settings.volume, | 239 | mp3_init( global_settings.volume, |
240 | global_settings.bass, | 240 | global_settings.bass, |
241 | global_settings.treble, | 241 | global_settings.treble, |
@@ -250,7 +250,7 @@ void init(void) | |||
250 | global_settings.mdb_shape, | 250 | global_settings.mdb_shape, |
251 | global_settings.mdb_enable, | 251 | global_settings.mdb_enable, |
252 | global_settings.superbass); | 252 | global_settings.superbass); |
253 | mpeg_init(); | 253 | audio_init(); |
254 | talk_init(); | 254 | talk_init(); |
255 | 255 | ||
256 | #ifdef AUTOROCK | 256 | #ifdef AUTOROCK |