summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJens Arnold <amiconn@rockbox.org>2005-05-13 00:53:33 +0000
committerJens Arnold <amiconn@rockbox.org>2005-05-13 00:53:33 +0000
commit6b16d0e817e3aa3e21b004591b79c3d1bca15c69 (patch)
treedb51e3ac2ce2f4e710ccc57043590a7b51a381ea
parent03d08ecc250ee095f46a77848bde28f162493276 (diff)
downloadrockbox-6b16d0e817e3aa3e21b004591b79c3d1bca15c69.tar.gz
rockbox-6b16d0e817e3aa3e21b004591b79c3d1bca15c69.zip
Fix simulator and iriver builds.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@6464 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/wps.c2
-rw-r--r--firmware/mp3_playback.c5
2 files changed, 7 insertions, 0 deletions
diff --git a/apps/wps.c b/apps/wps.c
index 097c908ca8..b44ca53070 100644
--- a/apps/wps.c
+++ b/apps/wps.c
@@ -414,8 +414,10 @@ static void fade(bool fade_in)
sound_set(SOUND_VOLUME, fp_volume >> 8);
}
audio_pause();
+#ifndef SIMULATOR
/* let audio thread run and wait for the mas to run out of data */
while (!mp3_pause_done())
+#endif
sleep(HZ/10);
/* reset volume to what it was before the fade */
diff --git a/firmware/mp3_playback.c b/firmware/mp3_playback.c
index a8d2d698eb..3c6bfdf9b6 100644
--- a/firmware/mp3_playback.c
+++ b/firmware/mp3_playback.c
@@ -653,6 +653,11 @@ void mp3_play_pause(bool play)
(void)play;
}
+bool mp3_pause_done(void)
+{
+ return true;
+}
+
unsigned char* mp3_get_pos(void)
{
/* a dummy */