diff options
author | Miika Pekkarinen <miipekk@ihme.org> | 2006-01-27 11:39:46 +0000 |
---|---|---|
committer | Miika Pekkarinen <miipekk@ihme.org> | 2006-01-27 11:39:46 +0000 |
commit | d319116be43db7ed638e5941674e06859fc69aea (patch) | |
tree | 4ae658dbc1a758174fa880512258a07b13c5529a /apps/main.c | |
parent | 553c9e2fcea3854d2d024e851a0b4b37f8265b9e (diff) | |
download | rockbox-d319116be43db7ed638e5941674e06859fc69aea.tar.gz rockbox-d319116be43db7ed638e5941674e06859fc69aea.zip |
iriver: Init audio on background.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8465 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/main.c')
-rw-r--r-- | apps/main.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/apps/main.c b/apps/main.c index 44d92c1198..fcefa00898 100644 --- a/apps/main.c +++ b/apps/main.c | |||
@@ -65,6 +65,7 @@ | |||
65 | #include "splash.h" | 65 | #include "splash.h" |
66 | 66 | ||
67 | #if (CONFIG_CODEC == SWCODEC) | 67 | #if (CONFIG_CODEC == SWCODEC) |
68 | #include "playback.h" | ||
68 | #include "pcmbuf.h" | 69 | #include "pcmbuf.h" |
69 | #else | 70 | #else |
70 | #define pcmbuf_init() | 71 | #define pcmbuf_init() |
@@ -178,6 +179,9 @@ void init(void) | |||
178 | global_settings.mdb_shape, | 179 | global_settings.mdb_shape, |
179 | global_settings.mdb_enable, | 180 | global_settings.mdb_enable, |
180 | global_settings.superbass); | 181 | global_settings.superbass); |
182 | #if CONFIG_CODEC == SWCODEC | ||
183 | audio_preinit(); | ||
184 | #endif | ||
181 | audio_init(); | 185 | audio_init(); |
182 | button_clear_queue(); /* Empty the keyboard buffer */ | 186 | button_clear_queue(); /* Empty the keyboard buffer */ |
183 | #if CONFIG_CODEC == SWCODEC | 187 | #if CONFIG_CODEC == SWCODEC |
@@ -200,6 +204,7 @@ void init(void) | |||
200 | 204 | ||
201 | #ifdef HAVE_ADJUSTABLE_CPU_FREQ | 205 | #ifdef HAVE_ADJUSTABLE_CPU_FREQ |
202 | set_cpu_frequency(CPUFREQ_NORMAL); | 206 | set_cpu_frequency(CPUFREQ_NORMAL); |
207 | cpu_boost(true); | ||
203 | #endif | 208 | #endif |
204 | 209 | ||
205 | buffer_init(); | 210 | buffer_init(); |
@@ -244,6 +249,10 @@ void init(void) | |||
244 | button_init(); | 249 | button_init(); |
245 | 250 | ||
246 | powermgmt_init(); | 251 | powermgmt_init(); |
252 | |||
253 | #if CONFIG_CODEC == SWCODEC | ||
254 | audio_preinit(); | ||
255 | #endif | ||
247 | 256 | ||
248 | #ifdef CONFIG_TUNER | 257 | #ifdef CONFIG_TUNER |
249 | radio_init(); | 258 | radio_init(); |
@@ -360,16 +369,13 @@ void init(void) | |||
360 | global_settings.mdb_enable, | 369 | global_settings.mdb_enable, |
361 | global_settings.superbass); | 370 | global_settings.superbass); |
362 | audio_init(); | 371 | audio_init(); |
363 | #if (CONFIG_CODEC == SWCODEC) | ||
364 | sound_settings_apply(); | ||
365 | #endif | ||
366 | #if (defined(IRIVER_H100_SERIES) || defined(IRIVER_H300_SERIES)) && !defined(SIMULATOR) | 372 | #if (defined(IRIVER_H100_SERIES) || defined(IRIVER_H300_SERIES)) && !defined(SIMULATOR) |
367 | pcm_rec_init(); | 373 | pcm_rec_init(); |
368 | #endif | 374 | #endif |
369 | talk_init(); | 375 | talk_init(); |
370 | /* runtime database has to be initialized after audio_init() */ | 376 | /* runtime database has to be initialized after audio_init() */ |
371 | rundb_init(); | 377 | rundb_init(); |
372 | 378 | cpu_boost(false); | |
373 | 379 | ||
374 | #ifdef AUTOROCK | 380 | #ifdef AUTOROCK |
375 | { | 381 | { |