mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-06 18:40:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

(menu_driver.c) 80-char width limit

Browse Source
This commit is contained in:
twinaphex 2016-02-04 20:23:52 +01:00
parent 9c9fdcfa58
commit 2901c3c737
1 changed files with 35 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
menu/menu_driver.c
View File

@ -78,8 +78,8 @@ const void *menu_driver_find_handle(int idx)
* menu_driver_find_ident: * menu_driver_find_ident:
* @idx : index of driver to get handle to. * @idx : index of driver to get handle to.
* *
* Returns: Human-readable identifier of menu driver at index. Can be NULL * Returns: Human-readable identifier of menu driver at index.
* if nothing found. * Can be NULL if nothing found.
**/ **/
const char *menu_driver_find_ident(int idx) const char *menu_driver_find_ident(int idx)
{ {
@ -184,7 +184,8 @@ static void menu_free(menu_handle_t *menu)
} }
#ifdef HAVE_ZLIB #ifdef HAVE_ZLIB
static void bundle_decompressed(void *task_data, void *user_data, const char *err) static void bundle_decompressed(void *task_data,
void *user_data, const char *err)
{ {
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
decompress_task_data_t *dec = (decompress_task_data_t*)task_data; decompress_task_data_t *dec = (decompress_task_data_t*)task_data;
@ -202,7 +203,8 @@ static void bundle_decompressed(void *task_data, void *user_data, const char *er
free(dec); free(dec);
} }
settings->bundle_assets_extract_last_version = settings->bundle_assets_extract_version_current; settings->bundle_assets_extract_last_version =
settings->bundle_assets_extract_version_current;
settings->bundle_finished = true; settings->bundle_finished = true;
} }
#endif #endif
@ -239,7 +241,8 @@ static void *menu_init(const void *data)
goto error; goto error;
#ifdef HAVE_SHADER_MANAGER #ifdef HAVE_SHADER_MANAGER
menu_driver_shader = (struct video_shader*)calloc(1, sizeof(struct video_shader)); menu_driver_shader = (struct video_shader*)
calloc(1, sizeof(struct video_shader));
if (!menu_driver_shader) if (!menu_driver_shader)
goto error; goto error;
#endif #endif
@ -258,15 +261,18 @@ static void *menu_init(const void *data)
#ifdef IOS #ifdef IOS
&& menu->push_help_screen && menu->push_help_screen
#else #else
&& (settings->bundle_assets_extract_version_current != settings->bundle_assets_extract_last_version) && (settings->bundle_assets_extract_version_current
!= settings->bundle_assets_extract_last_version)
#endif #endif
) )
{ {
menu->help_screen_type = MENU_HELP_EXTRACT; menu->help_screen_type = MENU_HELP_EXTRACT;
menu->push_help_screen = true; menu->push_help_screen = true;
#ifdef HAVE_ZLIB #ifdef HAVE_ZLIB
rarch_task_push_decompress(settings->bundle_assets_src_path, settings->bundle_assets_dst_path, rarch_task_push_decompress(settings->bundle_assets_src_path,
NULL, settings->bundle_assets_dst_path_subdir, NULL, bundle_decompressed, NULL); settings->bundle_assets_dst_path,
NULL, settings->bundle_assets_dst_path_subdir,
NULL, bundle_decompressed, NULL);
#endif #endif
} }
@ -304,7 +310,8 @@ void menu_driver_list_insert(file_list_t *list, const char *path,
const menu_ctx_driver_t *driver = menu_driver_ctx; const menu_ctx_driver_t *driver = menu_driver_ctx;
if (driver->list_insert) if (driver->list_insert)
driver->list_insert(menu_userdata ? menu_userdata : NULL, list, path, label, idx); driver->list_insert(menu_userdata ?
menu_userdata : NULL, list, path, label, idx);
} }
void menu_driver_list_free(file_list_t *list, size_t idx, size_t list_size) void menu_driver_list_free(file_list_t *list, size_t idx, size_t list_size)
@ -351,7 +358,8 @@ bool menu_driver_list_push(menu_displaylist_info_t *info, unsigned type)
const menu_ctx_driver_t *driver = menu_driver_ctx; const menu_ctx_driver_t *driver = menu_driver_ctx;
if (driver->list_push) if (driver->list_push)
if (driver->list_push(menu_driver_data, menu_userdata ? menu_userdata : NULL, if (driver->list_push(menu_driver_data, menu_userdata ?
menu_userdata : NULL,
info, type) == 0) info, type) == 0)
return true; return true;
return false; return false;
@ -379,7 +387,8 @@ void *menu_driver_list_get_entry(menu_list_type_t type, unsigned i)
const menu_ctx_driver_t *driver = menu_driver_ctx; const menu_ctx_driver_t *driver = menu_driver_ctx;
if (driver && driver->list_get_entry) if (driver && driver->list_get_entry)
return driver->list_get_entry(menu_userdata ? menu_userdata : NULL, type, i); return driver->list_get_entry(menu_userdata ?
menu_userdata : NULL, type, i);
return NULL; return NULL;
} }
@ -424,8 +433,8 @@ static void menu_driver_toggle(bool latch)
{ {
retro_keyboard_event_t *key_event = NULL; retro_keyboard_event_t *key_event = NULL;
retro_keyboard_event_t *frontend_key_event = NULL; retro_keyboard_event_t *frontend_key_event = NULL;
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
rarch_system_info_t *system = NULL; rarch_system_info_t *system = NULL;
runloop_ctl(RUNLOOP_CTL_SYSTEM_INFO_GET, &system); runloop_ctl(RUNLOOP_CTL_SYSTEM_INFO_GET, &system);
menu_driver_ctl(RARCH_MENU_CTL_TOGGLE, &latch); menu_driver_ctl(RARCH_MENU_CTL_TOGGLE, &latch);
@ -484,7 +493,8 @@ bool menu_driver_load_image(void *data, menu_image_type_t type)
const menu_ctx_driver_t *driver = menu_driver_ctx; const menu_ctx_driver_t *driver = menu_driver_ctx;
if (driver->load_image) if (driver->load_image)
return driver->load_image(menu_userdata ? menu_userdata : NULL, data, type); return driver->load_image(menu_userdata ?
menu_userdata : NULL, data, type);
return false; return false;
} }
@ -495,7 +505,9 @@ bool menu_environment_cb(menu_environ_cb_t type, void *data)
if (driver->environ_cb) if (driver->environ_cb)
{ {
int ret = driver->environ_cb(type, data, menu_userdata ? menu_userdata : NULL); int ret = driver->environ_cb(type, data, menu_userdata
? menu_userdata : NULL);
if (ret == 0) if (ret == 0)
return true; return true;
} }
@ -510,7 +522,8 @@ int menu_driver_pointer_tap(unsigned x, unsigned y, unsigned ptr,
const menu_ctx_driver_t *driver = menu_driver_ctx; const menu_ctx_driver_t *driver = menu_driver_ctx;
if (driver->pointer_tap) if (driver->pointer_tap)
return driver->pointer_tap(menu_userdata ? menu_userdata : NULL, x, y, ptr, cbs, entry, action); return driver->pointer_tap(menu_userdata
? menu_userdata : NULL, x, y, ptr, cbs, entry, action);
return 0; return 0;
} }
@ -561,7 +574,8 @@ bool menu_driver_ctl(enum rarch_menu_ctl_state state, void *data)
return true; return true;
case RARCH_MENU_CTL_SYSTEM_INFO_GET: case RARCH_MENU_CTL_SYSTEM_INFO_GET:
{ {
struct retro_system_info **system = (struct retro_system_info**)data; struct retro_system_info **system =
(struct retro_system_info**)data;
if (!system) if (!system)
return false; return false;
*system = &menu_driver_system; *system = &menu_driver_system;
@ -575,7 +589,8 @@ bool menu_driver_ctl(enum rarch_menu_ctl_state state, void *data)
break; break;
case RARCH_MENU_CTL_RENDER_MESSAGEBOX: case RARCH_MENU_CTL_RENDER_MESSAGEBOX:
if (driver->render_messagebox) if (driver->render_messagebox)
driver->render_messagebox(menu_userdata, menu_driver_data->menu_state.msg); driver->render_messagebox(menu_userdata,
menu_driver_data->menu_state.msg);
break; break;
case RARCH_MENU_CTL_BLIT_RENDER: case RARCH_MENU_CTL_BLIT_RENDER:
if (driver->render) if (driver->render)
@ -715,7 +730,8 @@ bool menu_driver_ctl(enum rarch_menu_ctl_state state, void *data)
if (!pending_push) if (!pending_push)
return false; return false;
if (driver->navigation_clear) if (driver->navigation_clear)
driver->navigation_clear(menu_userdata ? menu_userdata : NULL, pending_push); driver->navigation_clear(menu_userdata ?
menu_userdata : NULL, pending_push);
} }
break; break;
case RARCH_MENU_CTL_POPULATE_ENTRIES: case RARCH_MENU_CTL_POPULATE_ENTRIES: