summaryrefslogtreecommitdiffstats
path: root/apps/main.c
diff options
context:
space:
mode:
authorMiika Pekkarinen <miipekk@ihme.org>2005-07-21 11:44:00 +0000
committerMiika Pekkarinen <miipekk@ihme.org>2005-07-21 11:44:00 +0000
commitf090dc382974f7d6163c2b8969440335d79845a0 (patch)
tree3562699a0ed5f41d0250417bca874bc507c65a43 /apps/main.c
parent4bee5075020aecfa7a30ba196bac0603b3be11cd (diff)
downloadrockbox-f090dc382974f7d6163c2b8969440335d79845a0.tar.gz
rockbox-f090dc382974f7d6163c2b8969440335d79845a0.zip
Crossfade (and pcm buffer size) length is now configurable.
Implemented anti-skip buffer setting for iriver also. Settings block bumped up, PLEASE SAVE YOUR SETTINGS BEFORE UPGRADING. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7210 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/main.c')
-rw-r--r--apps/main.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/apps/main.c b/apps/main.c
index 182d464649..90be703c6b 100644
--- a/apps/main.c
+++ b/apps/main.c
@@ -106,6 +106,7 @@ void init(void)
font_init();
show_logo();
lang_init();
+ audio_init();
settings_reset();
settings_calc_config_sector();
settings_load(SETTINGS_ALL);
@@ -127,8 +128,6 @@ void init(void)
global_settings.mdb_shape,
global_settings.mdb_enable,
global_settings.superbass);
- audio_init();
- pcmbuf_init();
button_clear_queue(); /* Empty the keyboard buffer */
}
@@ -260,6 +259,11 @@ void init(void)
}
}
+ /* On software codec platforms we have to init audio before
+ calling audio_set_buffer_margin(). */
+#if (CONFIG_HWCODEC == MASNONE)
+ audio_init();
+#endif
settings_calc_config_sector();
settings_load(SETTINGS_ALL);
settings_apply();
@@ -284,10 +288,10 @@ void init(void)
global_settings.mdb_shape,
global_settings.mdb_enable,
global_settings.superbass);
- audio_init();
#if (CONFIG_HWCODEC == MASNONE)
- pcmbuf_init();
sound_settings_apply();
+#else
+ audio_init();
#endif
#if defined(IRIVER_H100_SERIES) && !defined(SIMULATOR)
pcm_init_recording();