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

Merged Hardeep's resume fix. Also mpeg_is_playing() now returns true even when paused (broke some other code).

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1798 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Björn Stenberg 2002-08-19 11:00:29 +00:00
parent f210606c8f
commit 34486b7860
1 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
firmware/mpeg.c
View file

@ -544,7 +544,7 @@ void IRQ6(void)
#pragma interrupt #pragma interrupt
void DEI3(void) void DEI3(void)
{ {
if(playing) if(playing && !paused)
{ {
int unplayed_space_left; int unplayed_space_left;
int space_until_end_of_buffer; int space_until_end_of_buffer;
@ -665,13 +665,14 @@ static int new_file(int steps)
} }
else else
{ {
int new_tag_idx = tag_write_idx;
add_track_to_tag_list(trackname); add_track_to_tag_list(trackname);
/* skip past id3v2 tag (to an even byte) */ /* skip past id3v2 tag (to an even byte) */
lseek(mpeg_file, lseek(mpeg_file,
id3tags[tag_read_idx]->id3.id3v2len & ~1, id3tags[new_tag_idx]->id3.id3v2len & ~1,
SEEK_SET); SEEK_SET);
id3tags[tag_read_idx]->id3.index = index; id3tags[new_tag_idx]->id3.index = index;
id3tags[tag_read_idx]->id3.offset = 0; id3tags[new_tag_idx]->id3.offset = 0;
} }
} while ( mpeg_file < 0 ); } while ( mpeg_file < 0 );
@ -784,11 +785,14 @@ static void mpeg_thread(void)
case MPEG_RESUME: case MPEG_RESUME:
DEBUGF("MPEG_RESUME\n"); DEBUGF("MPEG_RESUME\n");
/* Continue the current stream */ /* Continue the current stream */
paused = false;
if (!play_pending)
{
playing = true; playing = true;
last_dma_tick += current_tick - pause_tick; last_dma_tick += current_tick - pause_tick;
pause_tick = 0; pause_tick = 0;
paused = false;
start_dma(); start_dma();
}
break; break;
case MPEG_NEXT: case MPEG_NEXT:
@ -976,6 +980,7 @@ static void mpeg_thread(void)
play_pending = true; play_pending = true;
} }
id3->offset = newpos;
id3->elapsed = newtime; id3->elapsed = newtime;
break; break;
@ -1255,6 +1260,7 @@ void mpeg_pause(void)
queue_post(&mpeg_queue, MPEG_PAUSE, NULL); queue_post(&mpeg_queue, MPEG_PAUSE, NULL);
#else #else
playing = false; playing = false;
paused = true;
#endif #endif
} }
@ -1264,6 +1270,7 @@ void mpeg_resume(void)
queue_post(&mpeg_queue, MPEG_RESUME, NULL); queue_post(&mpeg_queue, MPEG_RESUME, NULL);
#else #else
playing = true; playing = true;
paused = false;
#endif #endif
} }
@ -1302,7 +1309,7 @@ void mpeg_ff_rewind(int change)
bool mpeg_is_playing(void) bool mpeg_is_playing(void)
{ {
return (playing || play_pending) && (!paused) ; return playing || play_pending || paused;
} }
#ifndef SIMULATOR #ifndef SIMULATOR