diff options
author | Christian Soffke <christian.soffke@gmail.com> | 2024-07-24 18:39:06 +0200 |
---|---|---|
committer | Christian Soffke <christian.soffke@gmail.com> | 2024-07-26 15:15:06 -0400 |
commit | 23e5f77ab0c5f80de4091b365165276cfe9899dd (patch) | |
tree | 4aaeed994a811fbfaa9f96e697a6178ad19c27c2 /apps/plugins | |
parent | 13830439fae202247626e5ebfd7fe3d57d7c5628 (diff) | |
download | rockbox-23e5f77ab0c5f80de4091b365165276cfe9899dd.tar.gz rockbox-23e5f77ab0c5f80de4091b365165276cfe9899dd.zip |
Remove mp3info function & remove list_do_action from plugin_api
Change-Id: Ia9a2d6889679832f23b19a989927277ba886cba4
Diffstat (limited to 'apps/plugins')
-rw-r--r-- | apps/plugins/lib/id3.c | 2 | ||||
-rw-r--r-- | apps/plugins/pictureflow/pictureflow.c | 2 | ||||
-rw-r--r-- | apps/plugins/playing_time.c | 5 | ||||
-rw-r--r-- | apps/plugins/properties.c | 4 | ||||
-rw-r--r-- | apps/plugins/vbrfix.c | 4 |
5 files changed, 9 insertions, 8 deletions
diff --git a/apps/plugins/lib/id3.c b/apps/plugins/lib/id3.c index b0202b1d9c..6af715b1fb 100644 --- a/apps/plugins/lib/id3.c +++ b/apps/plugins/lib/id3.c | |||
@@ -35,5 +35,5 @@ bool retrieve_id3(struct mp3entry *id3, const char* file) | |||
35 | } | 35 | } |
36 | #endif | 36 | #endif |
37 | 37 | ||
38 | return !rb->mp3info(id3, file); | 38 | return rb->get_metadata(id3, -1, file); |
39 | } | 39 | } |
diff --git a/apps/plugins/pictureflow/pictureflow.c b/apps/plugins/pictureflow/pictureflow.c index 87ad1a403f..e5492cf01c 100644 --- a/apps/plugins/pictureflow/pictureflow.c +++ b/apps/plugins/pictureflow/pictureflow.c | |||
@@ -4040,7 +4040,7 @@ static int show_id3_info(const char *selected_file) | |||
4040 | i = 0; | 4040 | i = 0; |
4041 | do { | 4041 | do { |
4042 | file_name = i == 0 ? selected_file : get_track_filename(i); | 4042 | file_name = i == 0 ? selected_file : get_track_filename(i); |
4043 | if (rb->mp3info(&id3, file_name)) | 4043 | if (!rb->get_metadata(&id3, -1, file_name)) |
4044 | return 0; | 4044 | return 0; |
4045 | 4045 | ||
4046 | if (is_multiple_tracks) | 4046 | if (is_multiple_tracks) |
diff --git a/apps/plugins/playing_time.c b/apps/plugins/playing_time.c index f8b4b006a9..1da0d437c0 100644 --- a/apps/plugins/playing_time.c +++ b/apps/plugins/playing_time.c | |||
@@ -350,7 +350,7 @@ static bool playing_time(void) | |||
350 | continue; | 350 | continue; |
351 | 351 | ||
352 | if (rb->playlist_get_track_info(NULL, index, &pltrack) < 0 | 352 | if (rb->playlist_get_track_info(NULL, index, &pltrack) < 0 |
353 | || rb->mp3info(&id3, pltrack.filename)) | 353 | || !rb->get_metadata(&id3, -1, pltrack.filename)) |
354 | { | 354 | { |
355 | error_count++; | 355 | error_count++; |
356 | continue; | 356 | continue; |
@@ -392,7 +392,8 @@ static bool playing_time(void) | |||
392 | rb->gui_synclist_draw(&pt_lists); | 392 | rb->gui_synclist_draw(&pt_lists); |
393 | rb->gui_synclist_speak_item(&pt_lists); | 393 | rb->gui_synclist_speak_item(&pt_lists); |
394 | while (true) { | 394 | while (true) { |
395 | if (rb->list_do_action(CONTEXT_LIST, HZ/2, &pt_lists, &key) == 0 | 395 | key = rb->get_action(CONTEXT_LIST, HZ/2); |
396 | if (rb->gui_synclist_do_button(&pt_lists, &key) == 0 | ||
396 | && key!=ACTION_NONE && key!=ACTION_UNKNOWN) | 397 | && key!=ACTION_NONE && key!=ACTION_UNKNOWN) |
397 | { | 398 | { |
398 | bool usb = rb->default_event_handler(key) == SYS_USB_CONNECTED; | 399 | bool usb = rb->default_event_handler(key) == SYS_USB_CONNECTED; |
diff --git a/apps/plugins/properties.c b/apps/plugins/properties.c index 73ec64be80..dc55b8128b 100644 --- a/apps/plugins/properties.c +++ b/apps/plugins/properties.c | |||
@@ -130,7 +130,7 @@ static bool file_properties(const char* selected_file) | |||
130 | rb->snprintf(str_time, sizeof str_time, "%02d:%02d:%02d", | 130 | rb->snprintf(str_time, sizeof str_time, "%02d:%02d:%02d", |
131 | tm.tm_hour, tm.tm_min, tm.tm_sec); | 131 | tm.tm_hour, tm.tm_min, tm.tm_sec); |
132 | 132 | ||
133 | if (props_type != PROPS_PLAYLIST && !rb->mp3info(&id3, selected_file)) | 133 | if (props_type != PROPS_PLAYLIST && rb->get_metadata(&id3, -1, selected_file)) |
134 | props_type = PROPS_ID3; | 134 | props_type = PROPS_ID3; |
135 | found = true; | 135 | found = true; |
136 | break; | 136 | break; |
@@ -416,7 +416,7 @@ static bool determine_file_or_dir(void) | |||
416 | 416 | ||
417 | bool mul_id3_add(const char *file_name) | 417 | bool mul_id3_add(const char *file_name) |
418 | { | 418 | { |
419 | if (!file_name || rb->mp3info(&id3, file_name)) | 419 | if (!file_name || !rb->get_metadata(&id3, -1, file_name)) |
420 | skipped_count++; | 420 | skipped_count++; |
421 | else | 421 | else |
422 | { | 422 | { |
diff --git a/apps/plugins/vbrfix.c b/apps/plugins/vbrfix.c index 5aaf2ffada..622a0a4f07 100644 --- a/apps/plugins/vbrfix.c +++ b/apps/plugins/vbrfix.c | |||
@@ -155,8 +155,8 @@ static bool vbr_fix(const char *selected_file) | |||
155 | 155 | ||
156 | xingupdate(0); | 156 | xingupdate(0); |
157 | 157 | ||
158 | rc = rb->mp3info(&entry, selected_file); | 158 | rc = rb->get_metadata(&entry, -1, selected_file); |
159 | if(rc) { | 159 | if(!rc) { |
160 | fileerror(rc); | 160 | fileerror(rc); |
161 | return true; | 161 | return true; |
162 | } | 162 | } |