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

PictureFlow: Disable 'Album Not Found' splash when stopped

Browse source 
...and go to last album, even if it hadn't
been selected for playback

Change-Id: I44013e930a1feb873f128c2885ecb8ddaf4ae3ff
This commit is contained in:
Christian Soffke 2022-04-16 01:15:09 +02:00 committed by Aidan MacDonald
parent e3bf6f08e3
commit 68ac932585
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
apps/plugins/pictureflow/pictureflow.c
View file

@ -4082,7 +4082,9 @@ static bool start_playback(bool return_to_WPS)
#endif #endif
rb->lcd_clear_display(); rb->lcd_clear_display();
rb->lcd_update(); rb->lcd_update();
#endif /* USEGSLIB */ #else /* if !USEGSLIB */
(void) return_to_WPS;
#endif
if (!rb->warn_on_pl_erase() || !track_list_ready()) if (!rb->warn_on_pl_erase() || !track_list_ready())
{ {
@ -4112,10 +4114,8 @@ static bool start_playback(bool return_to_WPS)
rb->playlist_start(start_index, 0, 0); rb->playlist_start(start_index, 0, 0);
rb->playlist_get_current()->num_inserted_tracks = 0; /* prevent warn_on_pl_erase */ rb->playlist_get_current()->num_inserted_tracks = 0; /* prevent warn_on_pl_erase */
old_shuffle = shuffle; old_shuffle = shuffle;
if (return_to_WPS)
pf_cfg.last_album = center_index;
#ifdef USEGSLIB #ifdef USEGSLIB
else if (!return_to_WPS)
grey_show(true); grey_show(true);
#endif #endif
return true; return true;
@ -4213,7 +4213,9 @@ static void draw_album_text(void)
static void set_initial_slide(const char* selected_file) static void set_initial_slide(const char* selected_file)
{ {
if (selected_file == NULL) if (selected_file == NULL)
set_current_slide(id3_get_index(rb->audio_current_track())); set_current_slide(rb->audio_status() ?
id3_get_index(rb->audio_current_track()) :
pf_cfg.last_album);
else else
{ {
struct mp3entry id3; struct mp3entry id3;
@ -4687,6 +4689,7 @@ enum plugin_status plugin_start(const void *parameter)
ret = file_id3 ? pictureflow_main(file) : pictureflow_main(NULL); ret = file_id3 ? pictureflow_main(file) : pictureflow_main(NULL);
if ( ret == PLUGIN_OK || ret == PLUGIN_GOTO_WPS) { if ( ret == PLUGIN_OK || ret == PLUGIN_GOTO_WPS) {
pf_cfg.last_album = center_index;
if (configfile_save(CONFIG_FILE, config, CONFIG_NUM_ITEMS, if (configfile_save(CONFIG_FILE, config, CONFIG_NUM_ITEMS,
CONFIG_VERSION)) CONFIG_VERSION))
{ {