forked from len0rd/rockbox
Fix lockups people have been having with track skipping during buffer fill, this is a reversion of a previous commit pending more fixes to playback engine
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9250 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
parent
62f5194df2
commit
a9c168834d
1 changed files with 8 additions and 0 deletions
|
@ -401,6 +401,8 @@ void pcmbuf_pause(bool pause) {
|
||||||
/* Force playback. */
|
/* Force playback. */
|
||||||
void pcmbuf_play_start(void)
|
void pcmbuf_play_start(void)
|
||||||
{
|
{
|
||||||
|
mutex_lock(&pcmbuf_mutex);
|
||||||
|
|
||||||
if (!pcm_is_playing() && pcmbuf_unplayed_bytes)
|
if (!pcm_is_playing() && pcmbuf_unplayed_bytes)
|
||||||
{
|
{
|
||||||
/** Prevent a very tiny pop from happening by muting audio
|
/** Prevent a very tiny pop from happening by muting audio
|
||||||
|
@ -415,6 +417,8 @@ void pcmbuf_play_start(void)
|
||||||
/* Now unmute the audio. */
|
/* Now unmute the audio. */
|
||||||
pcm_mute(false);
|
pcm_mute(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
mutex_unlock(&pcmbuf_mutex);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -422,6 +426,8 @@ void pcmbuf_play_start(void)
|
||||||
*/
|
*/
|
||||||
static void pcmbuf_flush_fillpos(void)
|
static void pcmbuf_flush_fillpos(void)
|
||||||
{
|
{
|
||||||
|
mutex_lock(&pcmbuf_mutex);
|
||||||
|
|
||||||
if (audiobuffer_fillpos) {
|
if (audiobuffer_fillpos) {
|
||||||
/* Never use the last buffer descriptor */
|
/* Never use the last buffer descriptor */
|
||||||
while (pcmbuf_write == pcmbuf_write_end) {
|
while (pcmbuf_write == pcmbuf_write_end) {
|
||||||
|
@ -438,6 +444,8 @@ static void pcmbuf_flush_fillpos(void)
|
||||||
}
|
}
|
||||||
pcmbuf_add_chunk();
|
pcmbuf_add_chunk();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
mutex_unlock(&pcmbuf_mutex);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue