summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiika Pekkarinen <miipekk@ihme.org>2006-01-28 12:49:05 +0000
committerMiika Pekkarinen <miipekk@ihme.org>2006-01-28 12:49:05 +0000
commit05411983c74c6056387b92717e573eab7d79bb9e (patch)
treec877bcba8738c9f69579d5f43f0259309f12e7c2
parent745adad22a3803e7d7f3c14ba7ae2f8d3accb75a (diff)
downloadrockbox-05411983c74c6056387b92717e573eab7d79bb9e.tar.gz
rockbox-05411983c74c6056387b92717e573eab7d79bb9e.zip
Codec buffer was initialized too early thus crashing the unit later.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8473 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/playback.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/apps/playback.c b/apps/playback.c
index 3eda695b39..22ee3362c4 100644
--- a/apps/playback.c
+++ b/apps/playback.c
@@ -2541,6 +2541,8 @@ static void playback_init(void)
2541 break ; 2541 break ;
2542 } 2542 }
2543 2543
2544 filebuf = (char *)&audiobuf[MALLOC_BUFSIZE];
2545
2544 /* Apply relevant settings */ 2546 /* Apply relevant settings */
2545 audio_set_buffer_margin(global_settings.buffer_margin); 2547 audio_set_buffer_margin(global_settings.buffer_margin);
2546 audio_set_crossfade(global_settings.crossfade); 2548 audio_set_crossfade(global_settings.crossfade);
@@ -2555,7 +2557,6 @@ void audio_preinit(void)
2555 filebufused = 0; 2557 filebufused = 0;
2556 filling = false; 2558 filling = false;
2557 current_codec = CODEC_IDX_AUDIO; 2559 current_codec = CODEC_IDX_AUDIO;
2558 filebuf = (char *)&audiobuf[MALLOC_BUFSIZE];
2559 playing = false; 2560 playing = false;
2560 audio_codec_loaded = false; 2561 audio_codec_loaded = false;
2561 voice_is_playing = false; 2562 voice_is_playing = false;
@@ -2582,7 +2583,7 @@ void audio_preinit(void)
2582void audio_init(void) 2583void audio_init(void)
2583{ 2584{
2584 logf("playback system post-init"); 2585 logf("playback system post-init");
2585 2586
2586 queue_post(&audio_queue, Q_AUDIO_POSTINIT, 0); 2587 queue_post(&audio_queue, Q_AUDIO_POSTINIT, 0);
2587} 2588}
2588 2589