diff options
author | William Wilgus <wilgus.william@gmail.com> | 2022-12-14 03:06:04 -0500 |
---|---|---|
committer | William Wilgus <wilgus.william@gmail.com> | 2022-12-14 22:35:33 -0500 |
commit | 6b87bfadfff6c44722f8ffe5227c05c41b1b47c8 (patch) | |
tree | a0f346c8cde95c33d0561977a064cc438841923e /apps/playlist_viewer.c | |
parent | eaf717744d425e0bb8905f451e7443b07b67f97b (diff) | |
download | rockbox-6b87bfadfff6c44722f8ffe5227c05c41b1b47c8.tar.gz rockbox-6b87bfadfff6c44722f8ffe5227c05c41b1b47c8.zip |
wps.c cleanup gui_show_wps
remove some old cruft move a few things around clean-up flow
Change-Id: I138c6cd9e2d58ef526eb686333da413819df725d
Diffstat (limited to 'apps/playlist_viewer.c')
-rw-r--r-- | apps/playlist_viewer.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/apps/playlist_viewer.c b/apps/playlist_viewer.c index 4c57d1a5ce..80239367e4 100644 --- a/apps/playlist_viewer.c +++ b/apps/playlist_viewer.c | |||
@@ -143,7 +143,7 @@ static void format_line(const struct playlist_entry* track, char* str, | |||
143 | static bool update_playlist(bool force); | 143 | static bool update_playlist(bool force); |
144 | static enum pv_onplay_result onplay_menu(int index); | 144 | static enum pv_onplay_result onplay_menu(int index); |
145 | 145 | ||
146 | static void close_playlist_viewer(bool pop_activity); | 146 | static void close_playlist_viewer(void); |
147 | 147 | ||
148 | static void playlist_buffer_init(struct playlist_buffer *pb, char *names_buffer, | 148 | static void playlist_buffer_init(struct playlist_buffer *pb, char *names_buffer, |
149 | int names_buffer_size) | 149 | int names_buffer_size) |
@@ -525,12 +525,12 @@ static enum pv_onplay_result show_track_info(const struct playlist_entry *curren | |||
525 | static enum pv_onplay_result open_with(const struct playlist_entry *current_track) | 525 | static enum pv_onplay_result open_with(const struct playlist_entry *current_track) |
526 | { | 526 | { |
527 | char selected_track[MAX_PATH]; | 527 | char selected_track[MAX_PATH]; |
528 | close_playlist_viewer(false); /* don't pop activity yet – relevant for plugin_load */ | 528 | close_playlist_viewer(); /* don't pop activity yet – relevant for plugin_load */ |
529 | 529 | ||
530 | strmemccpy(selected_track, current_track->name, sizeof(selected_track)); | 530 | strmemccpy(selected_track, current_track->name, sizeof(selected_track)); |
531 | 531 | ||
532 | int plugin_return = filetype_list_viewers(selected_track); | 532 | int plugin_return = filetype_list_viewers(selected_track); |
533 | pop_current_activity(ACTIVITY_REFRESH_DEFERRED); | 533 | pop_current_activity_without_refresh(); |
534 | 534 | ||
535 | switch (plugin_return) | 535 | switch (plugin_return) |
536 | { | 536 | { |
@@ -548,11 +548,11 @@ static enum pv_onplay_result open_with(const struct playlist_entry *current_trac | |||
548 | static enum pv_onplay_result open_pictureflow(const struct playlist_entry *current_track) | 548 | static enum pv_onplay_result open_pictureflow(const struct playlist_entry *current_track) |
549 | { | 549 | { |
550 | char selected_track[MAX_PATH]; | 550 | char selected_track[MAX_PATH]; |
551 | close_playlist_viewer(false); /* don't pop activity yet – relevant for plugin_load */ | 551 | close_playlist_viewer(); /* don't pop activity yet – relevant for plugin_load */ |
552 | 552 | ||
553 | strmemccpy(selected_track, current_track->name, sizeof(selected_track)); | 553 | strmemccpy(selected_track, current_track->name, sizeof(selected_track)); |
554 | int plugin_return = filetype_load_plugin((void *)"pictureflow", selected_track); | 554 | int plugin_return = filetype_load_plugin((void *)"pictureflow", selected_track); |
555 | pop_current_activity(ACTIVITY_REFRESH_DEFERRED); | 555 | pop_current_activity_without_refresh(); |
556 | 556 | ||
557 | switch (plugin_return) | 557 | switch (plugin_return) |
558 | { | 558 | { |
@@ -1093,15 +1093,14 @@ enum playlist_viewer_result playlist_viewer_ex(const char* filename, | |||
1093 | } | 1093 | } |
1094 | 1094 | ||
1095 | exit: | 1095 | exit: |
1096 | close_playlist_viewer(true); | 1096 | pop_current_activity_without_refresh(); |
1097 | close_playlist_viewer(); | ||
1097 | return ret; | 1098 | return ret; |
1098 | } | 1099 | } |
1099 | 1100 | ||
1100 | static void close_playlist_viewer(bool pop_activity) | 1101 | static void close_playlist_viewer(void) |
1101 | { | 1102 | { |
1102 | talk_shutup(); | 1103 | talk_shutup(); |
1103 | if (pop_activity) | ||
1104 | pop_current_activity(ACTIVITY_REFRESH_DEFERRED); | ||
1105 | if (viewer.playlist) | 1104 | if (viewer.playlist) |
1106 | { | 1105 | { |
1107 | if (viewer.initial_selection) | 1106 | if (viewer.initial_selection) |