summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Nielsen Feltzing <linus@haxx.se>2004-05-21 22:17:23 +0000
committerLinus Nielsen Feltzing <linus@haxx.se>2004-05-21 22:17:23 +0000
commit4b3d553b3b47d650a37b4b9615c4f1ab22e565c8 (patch)
tree929d2061734d7e499fc55d7daa3c81e5923bd46b
parente85acf10c8c12cf388c4a55a9cdd97af4b106882 (diff)
downloadrockbox-4b3d553b3b47d650a37b4b9615c4f1ab22e565c8.tar.gz
rockbox-4b3d553b3b47d650a37b4b9615c4f1ab22e565c8.zip
Now the next-song WPS feature works
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@4686 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/wps-display.c3
-rw-r--r--apps/wps.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/apps/wps-display.c b/apps/wps-display.c
index e11ec8a520..8cbf7db75e 100644
--- a/apps/wps-display.c
+++ b/apps/wps-display.c
@@ -355,6 +355,7 @@ static char* get_tag(struct mp3entry* cid3,
355 { 355 {
356 case 'I': /* ID3 Information */ 356 case 'I': /* ID3 Information */
357 id3 = nid3; /* display next-song data */ 357 id3 = nid3; /* display next-song data */
358 *flags |= WPS_REFRESH_DYNAMIC;
358 if(!id3) 359 if(!id3)
359 return NULL; /* no such info (yet) */ 360 return NULL; /* no such info (yet) */
360 /* fall-through */ 361 /* fall-through */
@@ -422,6 +423,7 @@ static char* get_tag(struct mp3entry* cid3,
422 423
423 case 'F': /* File Information */ 424 case 'F': /* File Information */
424 id3 = nid3; 425 id3 = nid3;
426 *flags |= WPS_REFRESH_DYNAMIC;
425 if(!id3) 427 if(!id3)
426 return NULL; /* no such info (yet) */ 428 return NULL; /* no such info (yet) */
427 /* fall-through */ 429 /* fall-through */
@@ -581,6 +583,7 @@ static char* get_tag(struct mp3entry* cid3,
581 583
582 case 'D': /* Directory path information */ 584 case 'D': /* Directory path information */
583 id3 = nid3; /* next song please! */ 585 id3 = nid3; /* next song please! */
586 *flags |= WPS_REFRESH_DYNAMIC;
584 if(!id3) 587 if(!id3)
585 return NULL; /* no such info (yet) */ 588 return NULL; /* no such info (yet) */
586 /* fall-through */ 589 /* fall-through */
diff --git a/apps/wps.c b/apps/wps.c
index cf2599d67c..6aa8a72b60 100644
--- a/apps/wps.c
+++ b/apps/wps.c
@@ -433,11 +433,11 @@ static bool update(void)
433 bool track_changed = mpeg_has_changed_track(); 433 bool track_changed = mpeg_has_changed_track();
434 bool retcode = false; 434 bool retcode = false;
435 435
436 nid3 = mpeg_next_track();
436 if (track_changed) 437 if (track_changed)
437 { 438 {
438 lcd_stop_scroll(); 439 lcd_stop_scroll();
439 id3 = mpeg_current_track(); 440 id3 = mpeg_current_track();
440 nid3 = mpeg_next_track();
441 if (wps_display(id3, nid3)) 441 if (wps_display(id3, nid3))
442 retcode = true; 442 retcode = true;
443 else 443 else