forked from len0rd/rockbox
iriver: audio_init really needs to be called after playlist and tree init; delay initial application of buffer margin and crossfade to solve the settings dependency. This should fix the problem with large values in 'Max files in dir browser'.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7633 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
parent
eb04a53830
commit
62634a323e
2 changed files with 12 additions and 8 deletions
10
apps/main.c
10
apps/main.c
|
|
@ -135,7 +135,6 @@ void init(void)
|
|||
font_init();
|
||||
show_logo();
|
||||
lang_init();
|
||||
audio_init();
|
||||
settings_reset();
|
||||
settings_calc_config_sector();
|
||||
settings_load(SETTINGS_ALL);
|
||||
|
|
@ -158,6 +157,7 @@ void init(void)
|
|||
global_settings.mdb_shape,
|
||||
global_settings.mdb_enable,
|
||||
global_settings.superbass);
|
||||
audio_init();
|
||||
button_clear_queue(); /* Empty the keyboard buffer */
|
||||
#if CONFIG_CODEC == SWCODEC
|
||||
talk_init();
|
||||
|
|
@ -296,11 +296,6 @@ void init(void)
|
|||
settings_load(SETTINGS_ALL);
|
||||
init_dircache();
|
||||
|
||||
/* On software codec platforms we have to init audio before
|
||||
calling audio_set_buffer_margin(). */
|
||||
#if (CONFIG_CODEC == SWCODEC)
|
||||
audio_init();
|
||||
#endif
|
||||
settings_apply();
|
||||
|
||||
status_init();
|
||||
|
|
@ -323,10 +318,9 @@ void init(void)
|
|||
global_settings.mdb_shape,
|
||||
global_settings.mdb_enable,
|
||||
global_settings.superbass);
|
||||
audio_init();
|
||||
#if (CONFIG_CODEC == SWCODEC)
|
||||
sound_settings_apply();
|
||||
#else
|
||||
audio_init();
|
||||
#endif
|
||||
#if defined(IRIVER_H100_SERIES) && !defined(SIMULATOR)
|
||||
pcm_init_recording();
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue