diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c index 429e7f34a1..a5670ca3c8 100644 --- a/menu/menu_displaylist.c +++ b/menu/menu_displaylist.c @@ -5810,7 +5810,6 @@ bool menu_displaylist_process(menu_displaylist_info_t *info) MENU_INFO_MESSAGE, 0, 0, NULL); menu_driver_populate_entries(info); - ui_companion_driver_notify_list_loaded(info->list, info->menu_list); } return true; } @@ -5852,7 +5851,6 @@ void menu_displaylist_info_init(menu_displaylist_info_t *info) info->path_c = NULL; info->exts = NULL; info->list = NULL; - info->menu_list = NULL; info->setting = NULL; } diff --git a/menu/menu_displaylist.h b/menu/menu_displaylist.h index 2c3b072ea6..3336a241cb 100644 --- a/menu/menu_displaylist.h +++ b/menu/menu_displaylist.h @@ -322,7 +322,6 @@ typedef struct menu_displaylist_info char *exts; char *label; file_list_t *list; - file_list_t *menu_list; rarch_setting_t *setting; size_t directory_ptr; diff --git a/menu/menu_driver.c b/menu/menu_driver.c index 8a8513fcb9..dc07d6b7b8 100644 --- a/menu/menu_driver.c +++ b/menu/menu_driver.c @@ -2482,7 +2482,6 @@ bool menu_driver_displaylist_push( enum_idx = cbs->enum_idx; info.list = entry_list; - info.menu_list = entry_stack; info.type = type; info.enum_idx = enum_idx; diff --git a/ui/drivers/ui_cocoa.m b/ui/drivers/ui_cocoa.m index ab2f6f9813..3859e587cb 100644 --- a/ui/drivers/ui_cocoa.m +++ b/ui/drivers/ui_cocoa.m @@ -1090,8 +1090,6 @@ static void ui_companion_cocoa_event_command(void *data, enum event_command cmd) break; } } -static void ui_companion_cocoa_notify_list_pushed(void *data, file_list_t *a, file_list_t *b) { } - static void *ui_companion_cocoa_get_main_window(void *data) { return (BRIDGE void *)((RetroArch_OSX*)[[NSApplication sharedApplication] delegate]).window; @@ -1103,7 +1101,6 @@ ui_companion_driver_t ui_companion_cocoa = { ui_companion_cocoa_toggle, ui_companion_cocoa_event_command, ui_companion_cocoa_notify_content_loaded, - ui_companion_cocoa_notify_list_pushed, NULL, /* notify_refresh */ NULL, /* msg_queue_push */ NULL, /* render_messagebox */ diff --git a/ui/drivers/ui_qt.cpp b/ui/drivers/ui_qt.cpp index 3711d4c36e..12758c0ce5 100644 --- a/ui/drivers/ui_qt.cpp +++ b/ui/drivers/ui_qt.cpp @@ -4887,9 +4887,6 @@ static void ui_companion_qt_event_command(void *data, enum event_command cmd) } } -static void ui_companion_qt_notify_list_pushed(void *data, file_list_t *list, - file_list_t *menu_list) { } - static void ui_companion_qt_notify_refresh(void *data) { ui_companion_qt_t *handle = (ui_companion_qt_t*)data; @@ -4929,7 +4926,6 @@ ui_companion_driver_t ui_companion_qt = { ui_companion_qt_toggle, ui_companion_qt_event_command, ui_companion_qt_notify_content_loaded, - ui_companion_qt_notify_list_pushed, ui_companion_qt_notify_refresh, ui_companion_qt_msg_queue_push, NULL, diff --git a/ui/drivers/ui_win32.c b/ui/drivers/ui_win32.c index bcc22a66f2..bd47f94858 100644 --- a/ui/drivers/ui_win32.c +++ b/ui/drivers/ui_win32.c @@ -316,8 +316,6 @@ static void ui_companion_win32_notify_content_loaded(void *data) { } static void ui_companion_win32_toggle(void *data, bool force) { } static void ui_companion_win32_event_command( void *data, enum event_command cmd) { } -static void ui_companion_win32_notify_list_pushed(void *data, - file_list_t *list, file_list_t *menu_list) { } ui_companion_driver_t ui_companion_win32 = { ui_companion_win32_init, @@ -325,7 +323,6 @@ ui_companion_driver_t ui_companion_win32 = { ui_companion_win32_toggle, ui_companion_win32_event_command, ui_companion_win32_notify_content_loaded, - ui_companion_win32_notify_list_pushed, NULL, NULL, NULL, diff --git a/ui/ui_companion_driver.c b/ui/ui_companion_driver.c index fc64ed263f..bb50715985 100644 --- a/ui/ui_companion_driver.c +++ b/ui/ui_companion_driver.c @@ -33,7 +33,6 @@ static ui_companion_driver_t ui_companion_null = { NULL, /* toggle */ NULL, /* event_command */ NULL, /* notify_content_loaded */ - NULL, /* notify_list_loaded */ NULL, /* notify_refresh */ NULL, /* msg_queue_push */ NULL, /* render_messagebox */ @@ -178,15 +177,6 @@ void ui_companion_driver_notify_refresh(void) #endif } -void ui_companion_driver_notify_list_loaded( - file_list_t *list, file_list_t *menu_list) -{ - uico_driver_state_t *uico_st = &uico_driver_st; - const ui_companion_driver_t *ui = uico_st->drv; - if (ui && ui->notify_list_loaded) - ui->notify_list_loaded(uico_st->data, list, menu_list); -} - void ui_companion_driver_notify_content_loaded(void) { uico_driver_state_t *uico_st = &uico_driver_st; diff --git a/ui/ui_companion_driver.h b/ui/ui_companion_driver.h index a00fc4f3bd..9035175db6 100644 --- a/ui/ui_companion_driver.h +++ b/ui/ui_companion_driver.h @@ -119,7 +119,6 @@ typedef struct ui_companion_driver void (*toggle)(void *data, bool force); void (*event_command)(void *data, enum event_command action); void (*notify_content_loaded)(void *data); - void (*notify_list_loaded)(void *data, file_list_t *list, file_list_t *menu_list); void (*notify_refresh)(void *data); void (*msg_queue_push)(void *data, const char *msg, unsigned priority, unsigned duration, bool flush); void (*render_messagebox)(const char *msg); @@ -150,7 +149,6 @@ typedef struct } uico_driver_state_t; extern ui_companion_driver_t ui_companion_cocoa; -extern ui_companion_driver_t ui_companion_cocoatouch; extern ui_companion_driver_t ui_companion_qt; extern ui_companion_driver_t ui_companion_win32; @@ -162,8 +160,6 @@ void ui_companion_event_command(enum event_command action); void ui_companion_driver_notify_refresh(void); -void ui_companion_driver_notify_list_loaded(file_list_t *list, file_list_t *menu_list); - void ui_companion_driver_notify_content_loaded(void); const ui_msg_window_t *ui_companion_driver_get_msg_window_ptr(void);