summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Nielsen Feltzing <linus@haxx.se>2003-03-15 12:09:09 +0000
committerLinus Nielsen Feltzing <linus@haxx.se>2003-03-15 12:09:09 +0000
commit001226c7e1c20508466f77567607e623ee629389 (patch)
tree68bf4ed37af2d0ddf4aaec7b755b34ce10abdaed
parent7105b28bbad6a4d830d3d6b6c44ecdc68c7d98b3 (diff)
downloadrockbox-001226c7e1c20508466f77567607e623ee629389.tar.gz
rockbox-001226c7e1c20508466f77567607e623ee629389.zip
patch #702874 by Craig Sather, fixes a pause bug in WPS
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@3447 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/wps.c6
-rw-r--r--firmware/mpeg.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/apps/wps.c b/apps/wps.c
index 1904387759..b0b3976e21 100644
--- a/apps/wps.c
+++ b/apps/wps.c
@@ -739,6 +739,12 @@ int wps_show(void)
restore = true;
}
+ if (mpeg_status() & MPEG_STATUS_PAUSE) {
+ paused = true;
+ } else {
+ paused = false;
+ }
+
while ( 1 )
{
diff --git a/firmware/mpeg.c b/firmware/mpeg.c
index 9528ede0ec..e1312c7399 100644
--- a/firmware/mpeg.c
+++ b/firmware/mpeg.c
@@ -1300,6 +1300,7 @@ static void mpeg_thread(void)
/* Stop the current stream */
play_pending = false;
playing = false;
+ paused = false;
stop_dma();
reset_mp3_buffer();
@@ -1339,7 +1340,6 @@ static void mpeg_thread(void)
/* Tell the file loading code that we want to start playing
as soon as we have some data */
play_pending = true;
- paused = false;
update_playlist();
current_track_counter++;