summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens Arnold <amiconn@rockbox.org>2005-06-20 10:04:16 +0000
committerJens Arnold <amiconn@rockbox.org>2005-06-20 10:04:16 +0000
commit6514435d3b504d1294effad6c100c84201219700 (patch)
tree9485454bdd92d547649cccf9456cf908aa0b0bfa
parentad839aec7932eecfafa684f36e4c0b628aa9866c (diff)
downloadrockbox-6514435d3b504d1294effad6c100c84201219700.zip
rockbox-6514435d3b504d1294effad6c100c84201219700.tar.gz
rockbox-6514435d3b504d1294effad6c100c84201219700.tar.bz2
rockbox-6514435d3b504d1294effad6c100c84201219700.tar.xz
Iriver: Properly apply sound settings on startup. Moved some inits to more appropriate places.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@6774 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/main.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/apps/main.c b/apps/main.c
index 38851a5..ad61a27 100644
--- a/apps/main.c
+++ b/apps/main.c
@@ -276,6 +276,13 @@ void init(void)
global_settings.mdb_enable,
global_settings.superbass);
audio_init();
+#if (CONFIG_HWCODEC == MASNONE)
+ pcm_init();
+ sound_settings_apply();
+#endif
+#if defined(IRIVER_H100) && !defined(SIMULATOR)
+ pcm_init_recording();
+#endif
talk_init();
#ifdef AUTOROCK
@@ -293,12 +300,6 @@ void init(void)
}
#endif /* #ifdef AUTOROCK */
-#if (CONFIG_HWCODEC == MASNONE)
- pcm_init();
-#endif
-#if defined(IRIVER_H100) && !defined(SIMULATOR)
- pcm_init_recording();
-#endif
#ifdef HAVE_CHARGING
car_adapter_mode_init();
#endif