libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2025-02-10 19:33:26 +00:00
Code Issues Actions 25 Packages Projects Releases Wiki Activity

(menu_common) Remove HAVE_OSK - will have to be reimplemented

Browse Source
This commit is contained in:
twinaphex 2013-11-12 23:08:34 +01:00
parent 27d1a9625f
commit b20360948f
2 changed files with 0 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
frontend/menu/menu_common.c
View File

@ -33,9 +33,6 @@
rgui_handle_t *rgui;
const menu_ctx_driver_t *menu_ctx;
#ifdef HAVE_OSK
input_osk_driver_t *osk;
#endif
//forward decl
static int menu_iterate_func(void *data, unsigned action);
@ -385,36 +382,6 @@ bool load_menu_game(void)
}
}
#ifdef HAVE_OSK
static const input_osk_driver_t *osk_drivers[] = {
#if defined(__CELLOS_LV2__)
&input_ps3_osk,
#endif
NULL // zero length array is not valid
};
static bool osk_init_first(void **data)
{
unsigned i;
input_osk_driver_t **handle = (input_osk_driver_t**)data;
if (!osk_drivers[0])
return false;
for (i = 0; osk_drivers[i]; i++)
{
void *h = osk_drivers[i]->init(0);
if (h)
{
*handle = (input_osk_driver_t*)h;
return true;
}
}
return false;
}
#endif
void menu_init(void)
{
if (!menu_ctx_init_first(&menu_ctx, ((void**)&rgui)))
@ -444,14 +411,6 @@ void menu_init(void)
shader_manager_init(rgui);
#endif
#ifdef HAVE_OSK
if (!osk_init_first(((void**)&osk)))
{
RARCH_ERR("Could not initialize OSK.\n");
rarch_fail(1, "osk_init()");
}
#endif
menu_init_history();
rgui->last_time = rarch_get_time_usec();
}
@ -465,11 +424,6 @@ void menu_free(void)
libretro_free_system_info(&rgui->info);
#endif
#ifdef HAVE_OSK
if (osk)
free(osk);
#endif
file_list_free(rgui->menu_stack);
file_list_free(rgui->selection_buf);

3
frontend/menu/menu_common.h
View File

@ -321,9 +321,6 @@ typedef struct
} rgui_handle_t;
extern rgui_handle_t *rgui;
#ifdef HAVE_OSK
extern input_osk_driver_t *osk;
#endif
void menu_init(void);
bool menu_iterate(void);