diff options
author | Jens Arnold <amiconn@rockbox.org> | 2005-05-13 00:53:33 +0000 |
---|---|---|
committer | Jens Arnold <amiconn@rockbox.org> | 2005-05-13 00:53:33 +0000 |
commit | 6b16d0e817e3aa3e21b004591b79c3d1bca15c69 (patch) | |
tree | db51e3ac2ce2f4e710ccc57043590a7b51a381ea | |
parent | 03d08ecc250ee095f46a77848bde28f162493276 (diff) | |
download | rockbox-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.c | 2 | ||||
-rw-r--r-- | firmware/mp3_playback.c | 5 |
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) | |||
414 | sound_set(SOUND_VOLUME, fp_volume >> 8); | 414 | sound_set(SOUND_VOLUME, fp_volume >> 8); |
415 | } | 415 | } |
416 | audio_pause(); | 416 | audio_pause(); |
417 | #ifndef SIMULATOR | ||
417 | /* let audio thread run and wait for the mas to run out of data */ | 418 | /* let audio thread run and wait for the mas to run out of data */ |
418 | while (!mp3_pause_done()) | 419 | while (!mp3_pause_done()) |
420 | #endif | ||
419 | sleep(HZ/10); | 421 | sleep(HZ/10); |
420 | 422 | ||
421 | /* reset volume to what it was before the fade */ | 423 | /* 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) | |||
653 | (void)play; | 653 | (void)play; |
654 | } | 654 | } |
655 | 655 | ||
656 | bool mp3_pause_done(void) | ||
657 | { | ||
658 | return true; | ||
659 | } | ||
660 | |||
656 | unsigned char* mp3_get_pos(void) | 661 | unsigned char* mp3_get_pos(void) |
657 | { | 662 | { |
658 | /* a dummy */ | 663 | /* a dummy */ |