summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
authorMark Arigo <markarigo@gmail.com>2006-12-06 16:21:04 +0000
committerMark Arigo <markarigo@gmail.com>2006-12-06 16:21:04 +0000
commit8eaa685e1b60b6fd8a37bc8bb78e9e4ab335e0e0 (patch)
treed606093cf753c26445bb30441db8c419161637d2 /apps
parent998f1c57e25c628ed21dfbc7728dcbe4f55e6bd8 (diff)
downloadrockbox-8eaa685e1b60b6fd8a37bc8bb78e9e4ab335e0e0.tar.gz
rockbox-8eaa685e1b60b6fd8a37bc8bb78e9e4ab335e0e0.zip
Fix an errant #if effecting targets with MEM <= 8
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11677 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r--apps/playback.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/apps/playback.c b/apps/playback.c
index 294bb3d69c..63382c7a42 100644
--- a/apps/playback.c
+++ b/apps/playback.c
@@ -3556,17 +3556,16 @@ static void audio_thread(void)
3556 if (ev.id == SYS_TIMEOUT) 3556 if (ev.id == SYS_TIMEOUT)
3557 ev.id = Q_AUDIO_FILL_BUFFER; 3557 ev.id = Q_AUDIO_FILL_BUFFER;
3558 } 3558 }
3559#if MEM > 8
3560 else 3559 else
3561 { 3560 {
3562 queue_wait_w_tmo(&audio_queue, &ev, HZ/2); 3561 queue_wait_w_tmo(&audio_queue, &ev, HZ/2);
3562#if MEM > 8
3563 if (playing && (ev.id == SYS_TIMEOUT) && 3563 if (playing && (ev.id == SYS_TIMEOUT) &&
3564 (FILEBUFUSED < high_watermark)) 3564 (FILEBUFUSED < high_watermark))
3565 register_ata_idle_func(ata_fillbuffer_callback); 3565 register_ata_idle_func(ata_fillbuffer_callback);
3566 }
3567#else
3568 queue_wait_w_tmo(&audio_queue, &ev, HZ/2);
3569#endif 3566#endif
3567 }
3568
3570 switch (ev.id) { 3569 switch (ev.id) {
3571#if MEM > 8 3570#if MEM > 8
3572 case Q_AUDIO_FILL_BUFFER_IF_ACTIVE_ATA: 3571 case Q_AUDIO_FILL_BUFFER_IF_ACTIVE_ATA: