devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Added mpeg_is_playing(), now stops counting time when the last song has stopped

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1288 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Linus Nielsen Feltzing 2002-07-01 20:11:46 +00:00
parent ede3827126
commit 958025bfd4
1 changed files with 13 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

19
firmware/mpeg.c
View file

@ -274,6 +274,7 @@ static int last_dma_chunk_size;
static bool dma_on; /* The DMA is active */ static bool dma_on; /* The DMA is active */
static bool playing; /* We are playing an MP3 stream */ static bool playing; /* We are playing an MP3 stream */
static bool play_pending; /* We are about to start playing */
static bool filling; /* We are filling the buffer with data from disk */ static bool filling; /* We are filling the buffer with data from disk */
static int mpeg_file; static int mpeg_file;
@ -346,17 +347,17 @@ static void stop_dma(void)
static void dma_tick(void) static void dma_tick(void)
{ {
/* Start DMA if it isn't running */ if(playing)
if(playing && !dma_on)
{ {
if(PBDR & 0x4000) /* Start DMA if it is disabled and the DEMAND pin is high */
if(!dma_on && (PBDR & 0x4000))
{ {
if(!(SCR0 & 0x80)) if(!(SCR0 & 0x80))
start_dma(); start_dma();
} }
id3tags[0].id3.elapsed += (current_tick - last_dma_tick) * 1000 / HZ;
last_dma_tick = current_tick;
} }
id3tags[0].id3.elapsed += (current_tick - last_dma_tick) * 1000 / HZ;
last_dma_tick = current_tick;
} }
static void bitswap(unsigned short *data, int length) static void bitswap(unsigned short *data, int length)
@ -429,6 +430,7 @@ void DEI3(void)
{ {
DEBUGF("No more MP3 data. Stopping.\n"); DEBUGF("No more MP3 data. Stopping.\n");
CHCR3 = 0; /* Stop DMA interrupt */ CHCR3 = 0; /* Stop DMA interrupt */
playing = false;
} }
} }
@ -486,7 +488,6 @@ static void mpeg_thread(void)
int len; int len;
int free_space_left; int free_space_left;
int amount_to_read; int amount_to_read;
bool play_pending;
play_pending = false; play_pending = false;
playing = false; playing = false;
@ -653,6 +654,7 @@ static void mpeg_thread(void)
play_pending = false; play_pending = false;
playing = true; playing = true;
last_dma_tick = current_tick;
init_dma(); init_dma();
start_dma(); start_dma();
} }
@ -794,6 +796,11 @@ void mpeg_prev(void)
#endif #endif
} }
bool mpeg_is_playing(void)
{
return playing || play_pending;
}
#ifndef SIMULATOR #ifndef SIMULATOR
#ifndef ARCHOS_RECORDER #ifndef ARCHOS_RECORDER
int current_volume=0; /* all values in tenth of dB */ int current_volume=0; /* all values in tenth of dB */