mirror of
https://github.com/Rockbox/rockbox.git
synced 2025-12-09 13:15:18 -05:00
Temporary fix for FS#7257 and FS#7261 - playback resumes while paused when seeking
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13795 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
parent
391e944b8e
commit
7785d6949e
4 changed files with 8 additions and 4 deletions
|
|
@ -78,7 +78,8 @@ void pcm_play_dma_start(const void *addr, size_t size)
|
||||||
void pcm_play_dma_stop(void)
|
void pcm_play_dma_stop(void)
|
||||||
{
|
{
|
||||||
pcm_playing = false;
|
pcm_playing = false;
|
||||||
pcm_paused = false;
|
if (!audio_status())
|
||||||
|
pcm_paused = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
void pcm_play_pause_pause(void)
|
void pcm_play_pause_pause(void)
|
||||||
|
|
|
||||||
|
|
@ -254,7 +254,8 @@ void pcm_play_dma_start(const void *addr, size_t size)
|
||||||
void pcm_play_dma_stop(void)
|
void pcm_play_dma_stop(void)
|
||||||
{
|
{
|
||||||
pcm_playing = false;
|
pcm_playing = false;
|
||||||
pcm_paused = false;
|
if (!audio_status())
|
||||||
|
pcm_paused = false;
|
||||||
|
|
||||||
#ifdef CPU_PP502x
|
#ifdef CPU_PP502x
|
||||||
/* Disable playback FIFO and interrupt */
|
/* Disable playback FIFO and interrupt */
|
||||||
|
|
|
||||||
|
|
@ -168,7 +168,8 @@ static void pcm_play_dma_stop_fiq(void)
|
||||||
while (IISCON & (1<<7)) ;
|
while (IISCON & (1<<7)) ;
|
||||||
|
|
||||||
pcm_playing = false;
|
pcm_playing = false;
|
||||||
pcm_paused = false;
|
if (!audio_status())
|
||||||
|
pcm_paused = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Disconnect the IIS clock */
|
/* Disconnect the IIS clock */
|
||||||
|
|
|
||||||
|
|
@ -216,7 +216,8 @@ void pcm_play_dma_start(const void *addr, size_t size)
|
||||||
static void pcm_play_dma_stop_irq(void)
|
static void pcm_play_dma_stop_irq(void)
|
||||||
{
|
{
|
||||||
pcm_playing = false;
|
pcm_playing = false;
|
||||||
pcm_paused = false;
|
if (!audio_status())
|
||||||
|
pcm_paused = false;
|
||||||
|
|
||||||
DSR0 = 1;
|
DSR0 = 1;
|
||||||
DCR0 = 0;
|
DCR0 = 0;
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue