diff options
| author | Michael Sevakis <jethead71@rockbox.org> | 2007-03-09 12:30:14 +0000 |
|---|---|---|
| committer | Michael Sevakis <jethead71@rockbox.org> | 2007-03-09 12:30:14 +0000 |
| commit | 98cd3e8868a54541dce9875dfaf04e2695a97c37 (patch) | |
| tree | 1bd3c9ead8c83baba4e735f437e8c63dc4391449 /apps/main.c | |
| parent | 8e7ab3dfffe3cec8716f0842c0c9dca152402eb7 (diff) | |
| download | rockbox-98cd3e8868a54541dce9875dfaf04e2695a97c37.zip rockbox-98cd3e8868a54541dce9875dfaf04e2695a97c37.tar.gz rockbox-98cd3e8868a54541dce9875dfaf04e2695a97c37.tar.bz2 rockbox-98cd3e8868a54541dce9875dfaf04e2695a97c37.tar.xz | |
Install the single stage synchronous audio initialization I cooked up awhile back.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12693 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/main.c')
| -rw-r--r-- | apps/main.c | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/apps/main.c b/apps/main.c index fe397c7..8ad3244 100644 --- a/apps/main.c +++ b/apps/main.c @@ -244,9 +244,6 @@ static void init(void) button_init(); backlight_init(); lang_init(); -#if CONFIG_CODEC == SWCODEC - audio_preinit(); /* Must be done before settings_apply() */ -#endif /* Must be done before any code uses the multi-screen APi */ screen_access_init(); gui_syncstatusbar_init(&statusbars); @@ -262,6 +259,8 @@ static void init(void) sleep(HZ/2); tree_init(); playlist_init(); + +#if CONFIG_CODEC != SWCODEC mp3_init( global_settings.volume, global_settings.bass, global_settings.treble, @@ -277,13 +276,12 @@ static void init(void) global_settings.mdb_enable, global_settings.superbass); - scrobbler_init(); - cuesheet_init(); - /* audio_init must to know the size of voice buffer so init voice first */ -#if CONFIG_CODEC == SWCODEC talk_init(); -#endif +#endif /* CONFIG_CODEC != SWCODEC */ + + scrobbler_init(); + cuesheet_init(); audio_init(); button_clear_queue(); /* Empty the keyboard buffer */ @@ -365,10 +363,6 @@ static void init(void) powermgmt_init(); -#if CONFIG_CODEC == SWCODEC - audio_preinit(); -#endif - #if CONFIG_TUNER radio_init(); #endif @@ -499,6 +493,7 @@ static void init(void) scrobbler_init(); cuesheet_init(); +#if CONFIG_CODEC != SWCODEC /* No buffer allocation (see buffer.c) may take place after the call to audio_init() since the mpeg thread takes the rest of the buffer space */ mp3_init( global_settings.volume, @@ -518,8 +513,10 @@ static void init(void) /* audio_init must to know the size of voice buffer so init voice first */ talk_init(); +#endif /* CONFIG_CODEC != SWCODEC */ audio_init(); + #if (CONFIG_CODEC == SWCODEC) && defined(HAVE_RECORDING) && !defined(SIMULATOR) pcm_rec_init(); #endif |