forked from len0rd/rockbox
Remove mp3info function & remove list_do_action from plugin_api
Change-Id: Ia9a2d6889679832f23b19a989927277ba886cba4
This commit is contained in:
parent
13830439fa
commit
23e5f77ab0
12 changed files with 31 additions and 57 deletions
|
|
@ -35,5 +35,5 @@ bool retrieve_id3(struct mp3entry *id3, const char* file)
|
|||
}
|
||||
#endif
|
||||
|
||||
return !rb->mp3info(id3, file);
|
||||
return rb->get_metadata(id3, -1, file);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4040,7 +4040,7 @@ static int show_id3_info(const char *selected_file)
|
|||
i = 0;
|
||||
do {
|
||||
file_name = i == 0 ? selected_file : get_track_filename(i);
|
||||
if (rb->mp3info(&id3, file_name))
|
||||
if (!rb->get_metadata(&id3, -1, file_name))
|
||||
return 0;
|
||||
|
||||
if (is_multiple_tracks)
|
||||
|
|
|
|||
|
|
@ -350,7 +350,7 @@ static bool playing_time(void)
|
|||
continue;
|
||||
|
||||
if (rb->playlist_get_track_info(NULL, index, &pltrack) < 0
|
||||
|| rb->mp3info(&id3, pltrack.filename))
|
||||
|| !rb->get_metadata(&id3, -1, pltrack.filename))
|
||||
{
|
||||
error_count++;
|
||||
continue;
|
||||
|
|
@ -392,7 +392,8 @@ static bool playing_time(void)
|
|||
rb->gui_synclist_draw(&pt_lists);
|
||||
rb->gui_synclist_speak_item(&pt_lists);
|
||||
while (true) {
|
||||
if (rb->list_do_action(CONTEXT_LIST, HZ/2, &pt_lists, &key) == 0
|
||||
key = rb->get_action(CONTEXT_LIST, HZ/2);
|
||||
if (rb->gui_synclist_do_button(&pt_lists, &key) == 0
|
||||
&& key!=ACTION_NONE && key!=ACTION_UNKNOWN)
|
||||
{
|
||||
bool usb = rb->default_event_handler(key) == SYS_USB_CONNECTED;
|
||||
|
|
|
|||
|
|
@ -130,7 +130,7 @@ static bool file_properties(const char* selected_file)
|
|||
rb->snprintf(str_time, sizeof str_time, "%02d:%02d:%02d",
|
||||
tm.tm_hour, tm.tm_min, tm.tm_sec);
|
||||
|
||||
if (props_type != PROPS_PLAYLIST && !rb->mp3info(&id3, selected_file))
|
||||
if (props_type != PROPS_PLAYLIST && rb->get_metadata(&id3, -1, selected_file))
|
||||
props_type = PROPS_ID3;
|
||||
found = true;
|
||||
break;
|
||||
|
|
@ -416,7 +416,7 @@ static bool determine_file_or_dir(void)
|
|||
|
||||
bool mul_id3_add(const char *file_name)
|
||||
{
|
||||
if (!file_name || rb->mp3info(&id3, file_name))
|
||||
if (!file_name || !rb->get_metadata(&id3, -1, file_name))
|
||||
skipped_count++;
|
||||
else
|
||||
{
|
||||
|
|
|
|||
|
|
@ -155,8 +155,8 @@ static bool vbr_fix(const char *selected_file)
|
|||
|
||||
xingupdate(0);
|
||||
|
||||
rc = rb->mp3info(&entry, selected_file);
|
||||
if(rc) {
|
||||
rc = rb->get_metadata(&entry, -1, selected_file);
|
||||
if(!rc) {
|
||||
fileerror(rc);
|
||||
return true;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue