summaryrefslogtreecommitdiff
path: root/firmware
diff options
context:
space:
mode:
authorLinus Nielsen Feltzing <linus@haxx.se>2002-06-10 10:42:40 +0000
committerLinus Nielsen Feltzing <linus@haxx.se>2002-06-10 10:42:40 +0000
commitec2ab7e85a52ae4aaa38387a47fec8966540ad2e (patch)
treeb84d2c22c595576e9dccb75aaf2b01e3194ca2ff /firmware
parent604cce76cffcad3e890084f90b1199a0ce46e176 (diff)
downloadrockbox-ec2ab7e85a52ae4aaa38387a47fec8966540ad2e.tar.gz
rockbox-ec2ab7e85a52ae4aaa38387a47fec8966540ad2e.zip
Now stops loading from disk when mpeg_stop is called
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@929 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware')
-rw-r--r--firmware/mpeg.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/firmware/mpeg.c b/firmware/mpeg.c
index 73eec560a6..00486e6706 100644
--- a/firmware/mpeg.c
+++ b/firmware/mpeg.c
@@ -338,6 +338,9 @@ static void mpeg_thread(void)
338 DEBUGF("MPEG_STOP\n"); 338 DEBUGF("MPEG_STOP\n");
339 /* Stop the current stream */ 339 /* Stop the current stream */
340 playing = false; 340 playing = false;
341 filling = false;
342 close(mpeg_file);
343 mpeg_file = -1;
341 stop_dma(); 344 stop_dma();
342 break; 345 break;
343 346
@@ -485,6 +488,7 @@ static void setup_sci0(void)
485void mpeg_play(char* trackname) 488void mpeg_play(char* trackname)
486{ 489{
487#ifdef ARCHOS_RECORDER 490#ifdef ARCHOS_RECORDER
491 DEBUGF("mpeg_play(%s)\n", trackname);
488 return; 492 return;
489#endif 493#endif
490 494
@@ -494,6 +498,7 @@ void mpeg_play(char* trackname)
494void mpeg_stop(void) 498void mpeg_stop(void)
495{ 499{
496#ifdef ARCHOS_RECORDER 500#ifdef ARCHOS_RECORDER
501 DEBUGF("mpeg_stop()\n");
497 return; 502 return;
498#endif 503#endif
499 504