summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiika Pekkarinen <miipekk@ihme.org>2005-07-10 17:31:12 +0000
committerMiika Pekkarinen <miipekk@ihme.org>2005-07-10 17:31:12 +0000
commit1ed292ca5e61b90ac00775900aa12b22489050c4 (patch)
treed051418e9835f2fc7c80ebea5a2da3636e21e63b
parent645a2e16ed645c30858e3b494ba2ff7d00b7a09b (diff)
downloadrockbox-1ed292ca5e61b90ac00775900aa12b22489050c4.tar.gz
rockbox-1ed292ca5e61b90ac00775900aa12b22489050c4.tar.bz2
rockbox-1ed292ca5e61b90ac00775900aa12b22489050c4.zip
Fixed an audio burst coming out when pausing a track with fading
enabled. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7095 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/playback.c4
-rw-r--r--firmware/pcm_playback.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/apps/playback.c b/apps/playback.c
index e7c1040378..3cdfed96cd 100644
--- a/apps/playback.c
+++ b/apps/playback.c
@@ -1648,11 +1648,15 @@ void audio_stop(void)
void audio_pause(void)
{
queue_post(&audio_queue, AUDIO_PAUSE, 0);
+ while (!paused && playing)
+ yield();
}
void audio_resume(void)
{
queue_post(&audio_queue, AUDIO_RESUME, 0);
+ while (paused && playing)
+ yield();
}
void audio_next(void)
diff --git a/firmware/pcm_playback.c b/firmware/pcm_playback.c
index b63b12f197..b582cf8c65 100644
--- a/firmware/pcm_playback.c
+++ b/firmware/pcm_playback.c
@@ -287,7 +287,7 @@ void pcm_play_pause(bool play)
IIS2CONFIG = (pcm_freq << 12) | 0x300 | 4 << 2;
EBU1CONFIG = 7 << 12 | 3 << 8 | 5 << 2;
DCR0 |= DMA_EEXT | DMA_START;
- sleep(HZ/8);
+
uda1380_mute(false);
}
else if(!pcm_paused && !play)