diff options
author | Solomon Peachy <pizza@shaftnet.org> | 2019-02-03 19:37:56 -0500 |
---|---|---|
committer | Solomon Peachy <pizza@shaftnet.org> | 2019-02-04 02:31:07 +0100 |
commit | 32e074584857a2e107a91d51c2531d67747331fd (patch) | |
tree | 20493d841b6bc3ab39e0a3a074637a484e2f921d /apps | |
parent | fd9d4a889b086c331f1c89d2446ebb42a65187b5 (diff) | |
download | rockbox-32e074584857a2e107a91d51c2531d67747331fd.tar.gz rockbox-32e074584857a2e107a91d51c2531d67747331fd.zip |
Fix minor issues introduced in fe95127 (Playlist playing time)
* Custom statusbars inappropriately overwriten
* Off-by-one error displaying playlist position.
Change-Id: I08df67110fab97ed213c53e8fa86d386367cd6be
Diffstat (limited to 'apps')
-rw-r--r-- | apps/onplay.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/onplay.c b/apps/onplay.c index 092d23406b..095a337d6b 100644 --- a/apps/onplay.c +++ b/apps/onplay.c | |||
@@ -289,7 +289,7 @@ static const char * playing_time_get_or_speak_info(int selected_item, void * dat | |||
289 | case 4: { /* track index */ | 289 | case 4: { /* track index */ |
290 | int track_perc = (pti->curr_playing+1) *100 / pti->nb_tracks; | 290 | int track_perc = (pti->curr_playing+1) *100 / pti->nb_tracks; |
291 | snprintf(buf, buffer_len, str(LANG_PLAYTIME_TRACK), | 291 | snprintf(buf, buffer_len, str(LANG_PLAYTIME_TRACK), |
292 | pti->curr_playing, pti->nb_tracks, track_perc); | 292 | pti->curr_playing + 1, pti->nb_tracks, track_perc); |
293 | if (say_it) | 293 | if (say_it) |
294 | talk_ids(false, LANG_PLAYTIME_TRACK, | 294 | talk_ids(false, LANG_PLAYTIME_TRACK, |
295 | TALK_ID(pti->curr_playing+1, UNIT_INT), | 295 | TALK_ID(pti->curr_playing+1, UNIT_INT), |
@@ -430,10 +430,10 @@ static bool playing_time(void) | |||
430 | gui_synclist_set_voice_callback(&pt_lists, playing_time_speak_info); | 430 | gui_synclist_set_voice_callback(&pt_lists, playing_time_speak_info); |
431 | gui_synclist_set_nb_items(&pt_lists, 8); | 431 | gui_synclist_set_nb_items(&pt_lists, 8); |
432 | gui_synclist_draw(&pt_lists); | 432 | gui_synclist_draw(&pt_lists); |
433 | gui_syncstatusbar_draw(&statusbars, true); | 433 | /* gui_syncstatusbar_draw(&statusbars, true); */ |
434 | gui_synclist_speak_item(&pt_lists); | 434 | gui_synclist_speak_item(&pt_lists); |
435 | while (true) { | 435 | while (true) { |
436 | gui_syncstatusbar_draw(&statusbars, false); | 436 | /* gui_syncstatusbar_draw(&statusbars, false); */ |
437 | if (list_do_action(CONTEXT_LIST, HZ/2, | 437 | if (list_do_action(CONTEXT_LIST, HZ/2, |
438 | &pt_lists, &key, LIST_WRAP_UNLESS_HELD) == 0 | 438 | &pt_lists, &key, LIST_WRAP_UNLESS_HELD) == 0 |
439 | && key!=ACTION_NONE && key!=ACTION_UNKNOWN) | 439 | && key!=ACTION_NONE && key!=ACTION_UNKNOWN) |