(Menu) Rename files

This commit is contained in:
twinaphex 2015-06-08 14:44:24 +02:00
parent 7b0d29b5fc
commit 2fc0d7c4b4
23 changed files with 42 additions and 43 deletions

View File

@ -340,7 +340,7 @@ ifeq ($(HAVE_MENU_COMMON), 1)
menu/menu_navigation.o \
menu/menu_setting.o \
menu/menu_shader.o \
menu/menu_entries_cbs.o \
menu/menu_entries.o \
menu/cbs/menu_entries_cbs_ok.o \
menu/cbs/menu_entries_cbs_cancel.o \
menu/cbs/menu_entries_cbs_select.o \

View File

@ -715,7 +715,7 @@ MENU
#include "../menu/menu_entry.c"
#include "../menu/menu_setting.c"
#include "../menu/menu_list.c"
#include "../menu/menu_entries_cbs.c"
#include "../menu/menu_entries.c"
#include "../menu/cbs/menu_entries_cbs_ok.c"
#include "../menu/cbs/menu_entries_cbs_cancel.c"
#include "../menu/cbs/menu_entries_cbs_select.c"

View File

@ -15,7 +15,7 @@
#include <file/file_path.h>
#include "../menu.h"
#include "../menu_entries_cbs.h"
#include "../menu_entries.h"
#include "../menu_entry.h"
#include "../menu_setting.h"

View File

@ -14,7 +14,7 @@
*/
#include "../menu.h"
#include "../menu_entries_cbs.h"
#include "../menu_entries.h"
int menu_entries_cbs_init_bind_content_list_switch(menu_file_list_cbs_t *cbs,
const char *path, const char *label, unsigned type, size_t idx,

View File

@ -17,7 +17,7 @@
#include "../menu.h"
#include "../menu_displaylist.h"
#include "../menu_entries_cbs.h"
#include "../menu_entries.h"
#include "../menu_setting.h"
#include "../../file_ext.h"

View File

@ -15,7 +15,7 @@
#include "../menu.h"
#include "../menu_navigation.h"
#include "../menu_entries_cbs.h"
#include "../menu_entries.h"
static int action_bind_down_generic(unsigned type, const char *label)
{

View File

@ -17,7 +17,7 @@
#include <rhash.h>
#include "../menu.h"
#include "../menu_entries_cbs.h"
#include "../menu_entries.h"
#include "../menu_shader.h"
#include "../menu_setting.h"

View File

@ -14,7 +14,7 @@
*/
#include "../menu.h"
#include "../menu_entries_cbs.h"
#include "../menu_entries.h"
static int action_info_default(unsigned type, const char *label)
{

View File

@ -20,7 +20,7 @@
#include "../menu.h"
#include "../menu_display.h"
#include "../menu_entry.h"
#include "../menu_entries_cbs.h"
#include "../menu_entries.h"
#include "../menu_setting.h"
#include "../menu_input.h"
#include "../menu_shader.h"

View File

@ -16,7 +16,7 @@
#include <file/file_path.h>
#include "../menu.h"
#include "../menu_entries_cbs.h"
#include "../menu_entries.h"
#include "../menu_setting.h"
#include "../menu_shader.h"
#include "../menu_navigation.h"

View File

@ -18,12 +18,11 @@
#include "../menu.h"
#include "../menu_display.h"
#include "../menu_entries_cbs.h"
#include "../menu_entries.h"
#include "../menu_setting.h"
#include "../menu_entry.h"
#include "../menu_shader.h"
#include "../menu_navigation.h"
#include "../menu_entries_cbs.h"
#include "../../retroarch.h"
#include "../../runloop_data.h"

View File

@ -15,7 +15,7 @@
#include "../menu.h"
#include "../menu_displaylist.h"
#include "../menu_entries_cbs.h"
#include "../menu_entries.h"
static int action_refresh_default(file_list_t *list, file_list_t *menu_list)
{

View File

@ -16,7 +16,7 @@
#include <file/file_path.h>
#include "../menu.h"
#include "../menu_entries_cbs.h"
#include "../menu_entries.h"
#include "../menu_setting.h"
#include "../menu_shader.h"
#include "../menu_navigation.h"

View File

@ -15,7 +15,7 @@
#include <file/file_path.h>
#include "../menu.h"
#include "../menu_entries_cbs.h"
#include "../menu_entries.h"
#include "../menu_entry.h"
#include "../menu_setting.h"

View File

@ -15,7 +15,7 @@
#include "../menu.h"
#include "../menu_entry.h"
#include "../menu_entries_cbs.h"
#include "../menu_entries.h"
#include "../menu_setting.h"
#include "../../runloop_data.h"

View File

@ -14,7 +14,7 @@
*/
#include "../menu.h"
#include "../menu_entries_cbs.h"
#include "../menu_entries.h"
#include "../menu_setting.h"
#include "../menu_shader.h"

View File

@ -18,7 +18,7 @@
#include <file/file_path.h>
#include "../menu.h"
#include "../menu_entries_cbs.h"
#include "../menu_entries.h"
static INLINE void replace_chars(char *str, char c1, char c2)
{

View File

@ -15,7 +15,7 @@
#include "../menu.h"
#include "../menu_navigation.h"
#include "../menu_entries_cbs.h"
#include "../menu_entries.h"
static int action_bind_up_generic(unsigned type, const char *label)
{

View File

@ -21,7 +21,7 @@
#include "../menu_setting.h"
#include "../menu_display.h"
#include "../menu_entries_cbs.h"
#include "../menu_entries.h"
#ifdef HAVE_OPENGL
#include "../../gfx/drivers/gl_common.h"

View File

@ -31,7 +31,7 @@
#include "../menu_animation.h"
#include "../menu_display.h"
#include "../menu_entries_cbs.h"
#include "../menu_entries.h"
#include "../../file_ext.h"
#include "../../gfx/video_texture.h"

View File

@ -19,7 +19,7 @@
#include "menu_driver.h"
#include "menu.h"
#include "menu_entries_cbs.h"
#include "menu_entries.h"
#include "menu_displaylist.h"
#include "../driver.h"
#include "../general.h"
@ -248,7 +248,7 @@ void menu_driver_list_insert(file_list_t *list, const char *path,
return;
}
menu_entries_cbs_init(list, path, label, type, idx);
menu_entries_init(list, path, label, type, idx);
}
void menu_driver_list_cache(menu_list_type_t type, unsigned action)

View File

@ -16,13 +16,13 @@
#include <rhash.h>
#include "menu.h"
#include "menu_entries_cbs.h"
#include "menu_entries.h"
#if 0
#define DEBUG_LOG
#endif
static void menu_entries_cbs_init_log(int ret,
static void menu_entries_init_log(int ret,
const char *bind_label, const char *label, const char *elem0, const char *elem1,
unsigned type)
{
@ -43,7 +43,7 @@ static void menu_entries_cbs_init_log(int ret,
}
}
void menu_entries_cbs_init(void *data,
void menu_entries_init(void *data,
const char *path, const char *label,
unsigned type, size_t idx)
{
@ -88,65 +88,65 @@ void menu_entries_cbs_init(void *data,
ret = menu_entries_cbs_init_bind_ok(cbs, path, label, type, idx, elem0, elem1, menu_label, label_hash, menu_label_hash);
menu_entries_cbs_init_log(ret, "OK", label, elem0, elem1, type);
menu_entries_init_log(ret, "OK", label, elem0, elem1, type);
ret = menu_entries_cbs_init_bind_cancel(cbs, path, label, type, idx, elem0, elem1, label_hash, menu_label_hash);
menu_entries_cbs_init_log(ret, "CANCEL", label, elem0, elem1, type);
menu_entries_init_log(ret, "CANCEL", label, elem0, elem1, type);
ret = menu_entries_cbs_init_bind_scan(cbs, path, label, type, idx, elem0, elem1, label_hash, menu_label_hash);
menu_entries_cbs_init_log(ret, "SCAN", label, elem0, elem1, type);
menu_entries_init_log(ret, "SCAN", label, elem0, elem1, type);
ret = menu_entries_cbs_init_bind_start(cbs, path, label, type, idx, elem0, elem1, label_hash, menu_label_hash);
menu_entries_cbs_init_log(ret, "START", label, elem0, elem1, type);
menu_entries_init_log(ret, "START", label, elem0, elem1, type);
ret = menu_entries_cbs_init_bind_select(cbs, path, label, type, idx, elem0, elem1, label_hash, menu_label_hash);
menu_entries_cbs_init_log(ret, "SELECT", label, elem0, elem1, type);
menu_entries_init_log(ret, "SELECT", label, elem0, elem1, type);
ret = menu_entries_cbs_init_bind_info(cbs, path, label, type, idx, elem0, elem1, label_hash, menu_label_hash);
menu_entries_cbs_init_log(ret, "INFO", label, elem0, elem1, type);
menu_entries_init_log(ret, "INFO", label, elem0, elem1, type);
ret = menu_entries_cbs_init_bind_content_list_switch(cbs, path, label, type, idx, elem0, elem1, label_hash, menu_label_hash);
menu_entries_cbs_init_log(ret, "CONTENT SWITCH", label, elem0, elem1, type);
menu_entries_init_log(ret, "CONTENT SWITCH", label, elem0, elem1, type);
ret = menu_entries_cbs_init_bind_up(cbs, path, label, type, idx, elem0, elem1, label_hash, menu_label_hash);
menu_entries_cbs_init_log(ret, "UP", label, elem0, elem1, type);
menu_entries_init_log(ret, "UP", label, elem0, elem1, type);
ret = menu_entries_cbs_init_bind_down(cbs, path, label, type, idx, elem0, elem1, label_hash, menu_label_hash);
menu_entries_cbs_init_log(ret, "DOWN", label, elem0, elem1, type);
menu_entries_init_log(ret, "DOWN", label, elem0, elem1, type);
ret = menu_entries_cbs_init_bind_left(cbs, path, label, type, idx, elem0, elem1, menu_label, label_hash, menu_label_hash);
menu_entries_cbs_init_log(ret, "LEFT", label, elem0, elem1, type);
menu_entries_init_log(ret, "LEFT", label, elem0, elem1, type);
ret = menu_entries_cbs_init_bind_right(cbs, path, label, type, idx, elem0, elem1, menu_label, label_hash, menu_label_hash);
menu_entries_cbs_init_log(ret, "RIGHT", label, elem0, elem1, type);
menu_entries_init_log(ret, "RIGHT", label, elem0, elem1, type);
ret = menu_entries_cbs_init_bind_deferred_push(cbs, path, label, type, idx, elem0, elem1, label_hash, menu_label_hash);
menu_entries_cbs_init_log(ret, "DEFERRED PUSH", label, elem0, elem1, type);
menu_entries_init_log(ret, "DEFERRED PUSH", label, elem0, elem1, type);
ret = menu_entries_cbs_init_bind_refresh(cbs, path, label, type, idx, elem0, elem1, label_hash, menu_label_hash);
menu_entries_cbs_init_log(ret, "REFRESH", label, elem0, elem1, type);
menu_entries_init_log(ret, "REFRESH", label, elem0, elem1, type);
ret = menu_entries_cbs_init_bind_iterate(cbs, path, label, type, idx, elem0, elem1, label_hash, menu_label_hash);
menu_entries_cbs_init_log(ret, "ITERATE", label, elem0, elem1, type);
menu_entries_init_log(ret, "ITERATE", label, elem0, elem1, type);
ret = menu_entries_cbs_init_bind_get_string_representation(cbs, path, label, type, idx, elem0, elem1, label_hash, menu_label_hash);
menu_entries_cbs_init_log(ret, "REPRESENTATION", label, elem0, elem1, type);
menu_entries_init_log(ret, "REPRESENTATION", label, elem0, elem1, type);
ret = menu_entries_cbs_init_bind_title(cbs, path, label, type, idx, elem0, elem1, label_hash, menu_label_hash);
menu_entries_cbs_init_log(ret, "TITLE", label, elem0, elem1, type);
menu_entries_init_log(ret, "TITLE", label, elem0, elem1, type);
}

View File

@ -126,7 +126,7 @@ int menu_entries_cbs_init_bind_title(menu_file_list_cbs_t *cbs,
int deferred_push_content_list(void *data, void *userdata,
const char *path, const char *label, unsigned type);
void menu_entries_cbs_init(void *data,
void menu_entries_init(void *data,
const char *path, const char *label,
unsigned type, size_t idx);