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

1 files changed, 7 insertions, 6 deletions

diff --git a/apps/main.c b/apps/main.c
index 38851a5c7d..ad61a27e02 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