Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Archos: Even more NULL pointer accesses removed

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7433 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Linus Nielsen Feltzing 2005-08-30 22:50:56 +00:00
parent dfb001560a
commit e54aa2ab93
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
firmware/mpeg.c
View file

@ -777,9 +777,13 @@ void rec_tick(void)
void playback_tick(void)
{
struct trackdata *ptd = get_trackdata(0);
ptd->id3.elapsed += (current_tick - last_dma_tick) * 1000 / HZ;
last_dma_tick = current_tick;
audio_dispatch_event(AUDIO_EVENT_POS_REPORT, (unsigned long)ptd->id3.elapsed);
if(ptd)
{
ptd->id3.elapsed += (current_tick - last_dma_tick) * 1000 / HZ;
last_dma_tick = current_tick;
audio_dispatch_event(AUDIO_EVENT_POS_REPORT,
(unsigned long)ptd->id3.elapsed);
}
}
static void reset_mp3_buffer(void)
@ -849,7 +853,9 @@ static void transfer_end(unsigned char** ppbuf, int* psize)
*psize = last_dma_chunk_size & 0xffff;
*ppbuf = audiobuf + audiobuf_read;
get_trackdata(0)->id3.offset += last_dma_chunk_size;
track = get_trackdata(0);
if(track)
track->id3.offset += last_dma_chunk_size;
/* Update the watermark debug level */
if(unplayed_space_left < lowest_watermark_level)