mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-03 17:54:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

(PS3/RMenu) Move oskutil_handle to menu_common.h

Browse Source
This commit is contained in:
twinaphex 2013-05-05 16:12:06 +02:00
parent 9c3d943600
commit 6a1eb0c0b1
4 changed files with 12 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
frontend/menu/menu_common.h
View File

@ -244,6 +244,7 @@ typedef struct
#ifdef HAVE_OSKUTIL #ifdef HAVE_OSKUTIL
unsigned osk_param; unsigned osk_param;
oskutil_params oskutil_handle;
bool (*osk_init)(void *data); bool (*osk_init)(void *data);
bool (*osk_callback)(void *data); bool (*osk_callback)(void *data);
#endif #endif

18
frontend/menu/rmenu.c
View File

@ -741,7 +741,7 @@ static bool osk_callback_enter_rsound(void *data)
{ {
RARCH_LOG("OSK - Applying input data.\n"); RARCH_LOG("OSK - Applying input data.\n");
char tmp_str[256]; char tmp_str[256];
int num = wcstombs(tmp_str, g_extern.console.misc.oskutil_handle.text_buf, sizeof(tmp_str)); int num = wcstombs(tmp_str, rgui->oskutil_handle.text_buf, sizeof(tmp_str));
tmp_str[num] = 0; tmp_str[num] = 0;
strlcpy(g_settings.audio.device, tmp_str, sizeof(g_settings.audio.device)); strlcpy(g_settings.audio.device, tmp_str, sizeof(g_settings.audio.device));
goto do_exit; goto do_exit;
@ -759,9 +759,9 @@ do_exit:
static bool osk_callback_enter_rsound_init(void *data) static bool osk_callback_enter_rsound_init(void *data)
{ {
oskutil_write_initial_message(&g_extern.console.misc.oskutil_handle, L"192.168.1.1"); oskutil_write_initial_message(&rgui->oskutil_handle, L"192.168.1.1");
oskutil_write_message(&g_extern.console.misc.oskutil_handle, L"Enter IP address for the RSound Server."); oskutil_write_message(&rgui->oskutil_handle, L"Enter IP address for the RSound Server.");
oskutil_start(&g_extern.console.misc.oskutil_handle); oskutil_start(&rgui->oskutil_handle);
return true; return true;
} }
@ -773,7 +773,7 @@ static bool osk_callback_enter_filename(void *data)
RARCH_LOG("OSK - Applying input data.\n"); RARCH_LOG("OSK - Applying input data.\n");
char tmp_str[256]; char tmp_str[256];
char filepath[PATH_MAX]; char filepath[PATH_MAX];
int num = wcstombs(tmp_str, g_extern.console.misc.oskutil_handle.text_buf, sizeof(tmp_str)); int num = wcstombs(tmp_str, rgui->oskutil_handle.text_buf, sizeof(tmp_str));
tmp_str[num] = 0; tmp_str[num] = 0;
switch(rgui->osk_param) switch(rgui->osk_param)
@ -806,9 +806,9 @@ do_exit:
static bool osk_callback_enter_filename_init(void *data) static bool osk_callback_enter_filename_init(void *data)
{ {
oskutil_write_initial_message(&g_extern.console.misc.oskutil_handle, L"example"); oskutil_write_initial_message(&rgui->oskutil_handle, L"example");
oskutil_write_message(&g_extern.console.misc.oskutil_handle, L"Enter filename for preset"); oskutil_write_message(&rgui->oskutil_handle, L"Enter filename for preset");
oskutil_start(&g_extern.console.misc.oskutil_handle); oskutil_start(&rgui->oskutil_handle);
return true; return true;
} }
@ -3029,7 +3029,7 @@ rgui_handle_t *rgui_init(void)
#ifdef HAVE_OSKUTIL #ifdef HAVE_OSKUTIL
oskutil_params *osk = &g_extern.console.misc.oskutil_handle; oskutil_params *osk = &rgui->oskutil_handle;
oskutil_init(osk, 0); oskutil_init(osk, 0);
#endif #endif

4
frontend/platform/platform_ps3.c
View File

@ -143,7 +143,7 @@ static void callback_sysutil_exit(uint64_t status, uint64_t param, void *userdat
#ifndef IS_SALAMANDER #ifndef IS_SALAMANDER
#ifdef HAVE_OSKUTIL #ifdef HAVE_OSKUTIL
oskutil_params *osk = &g_extern.console.misc.oskutil_handle; oskutil_params *osk = &rgui->oskutil_handle;
#endif #endif
gl_t *gl = driver.video_data; gl_t *gl = driver.video_data;
@ -181,7 +181,7 @@ static void callback_sysutil_exit(uint64_t status, uint64_t param, void *userdat
break; break;
case CELL_SYSUTIL_OSKDIALOG_UNLOADED: case CELL_SYSUTIL_OSKDIALOG_UNLOADED:
RARCH_LOG("CELL_SYSUTIL_OSKDIALOG_UNLOADED.\n"); RARCH_LOG("CELL_SYSUTIL_OSKDIALOG_UNLOADED.\n");
sys_memory_container_destroy(g_extern.console.misc.oskutil_handle.containerid); sys_memory_container_destroy(osk->containerid);
break; break;
#endif #endif
} }

8
general.h
View File

@ -100,7 +100,6 @@ enum menu_enums
{ {
MODE_GAME = 0, MODE_GAME = 0,
MODE_LOAD_GAME, MODE_LOAD_GAME,
MODE_LOAD_FIRST_SHADER,
MODE_INIT, MODE_INIT,
MODE_MENU, MODE_MENU,
MODE_MENU_WIDESCREEN, MODE_MENU_WIDESCREEN,
@ -572,13 +571,6 @@ struct global
unsigned volume_level; unsigned volume_level;
#endif #endif
} sound; } sound;
#ifdef HAVE_OSKUTIL
struct
{
oskutil_params oskutil_handle;
} misc;
#endif
} console; } console;
uint64_t lifecycle_state; uint64_t lifecycle_state;