diff options
author | Jens Arnold <amiconn@rockbox.org> | 2005-06-20 10:04:16 +0000 |
---|---|---|
committer | Jens Arnold <amiconn@rockbox.org> | 2005-06-20 10:04:16 +0000 |
commit | 6514435d3b504d1294effad6c100c84201219700 (patch) | |
tree | 9485454bdd92d547649cccf9456cf908aa0b0bfa | |
parent | ad839aec7932eecfafa684f36e4c0b628aa9866c (diff) | |
download | rockbox-6514435d3b504d1294effad6c100c84201219700.tar.gz rockbox-6514435d3b504d1294effad6c100c84201219700.zip |
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.c | 13 |
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) | |||
276 | global_settings.mdb_enable, | 276 | global_settings.mdb_enable, |
277 | global_settings.superbass); | 277 | global_settings.superbass); |
278 | audio_init(); | 278 | audio_init(); |
279 | #if (CONFIG_HWCODEC == MASNONE) | ||
280 | pcm_init(); | ||
281 | sound_settings_apply(); | ||
282 | #endif | ||
283 | #if defined(IRIVER_H100) && !defined(SIMULATOR) | ||
284 | pcm_init_recording(); | ||
285 | #endif | ||
279 | talk_init(); | 286 | talk_init(); |
280 | 287 | ||
281 | #ifdef AUTOROCK | 288 | #ifdef AUTOROCK |
@@ -293,12 +300,6 @@ void init(void) | |||
293 | } | 300 | } |
294 | #endif /* #ifdef AUTOROCK */ | 301 | #endif /* #ifdef AUTOROCK */ |
295 | 302 | ||
296 | #if (CONFIG_HWCODEC == MASNONE) | ||
297 | pcm_init(); | ||
298 | #endif | ||
299 | #if defined(IRIVER_H100) && !defined(SIMULATOR) | ||
300 | pcm_init_recording(); | ||
301 | #endif | ||
302 | #ifdef HAVE_CHARGING | 303 | #ifdef HAVE_CHARGING |
303 | car_adapter_mode_init(); | 304 | car_adapter_mode_init(); |
304 | #endif | 305 | #endif |