mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-10 15:45:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

(Zarch) Start implementing control flow for loading content - not

Browse Source 
finished yet
This commit is contained in:
twinaphex 2015-10-06 13:38:44 +02:00
parent 6fe8195fc5
commit 8676712537
1 changed files with 36 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
menu/drivers/zarch.c
View File

@ -29,6 +29,8 @@
#include "menu_generic.h" #include "menu_generic.h"
#include "../../config.def.h"
#include "../menu.h" #include "../menu.h"
#include "../menu_animation.h" #include "../menu_animation.h"
#include "../menu_entry.h" #include "../menu_entry.h"
@ -96,6 +98,7 @@ typedef struct zarch_handle
unsigned height; unsigned height;
gfx_font_raster_block_t tmp_block; gfx_font_raster_block_t tmp_block;
unsigned hash; unsigned hash;
bool time_to_exit;
struct { struct {
unsigned active; unsigned active;
@ -817,6 +820,19 @@ void render_sidebar(zui_t *zui)
exit(0); exit(0);
} }
static int zui_load_content(zui_t *zui, unsigned i)
{
global_t *global = global_get_ptr();
menu_handle_t *menu = menu_driver_get_ptr();
settings_t *settings = config_get_ptr();
int ret = menu_common_load_content
(zui->pick_cores[i].path, zui->pick_content, false, CORE_TYPE_PLAIN);
layout = LAY_HOME;
return ret;
}
static void zui_render(void) static void zui_render(void)
{ {
menu_handle_t *menu = menu_driver_get_ptr(); menu_handle_t *menu = menu_driver_get_ptr();
@ -849,8 +865,10 @@ static void zui_render(void)
render_sidebar(zui); render_sidebar(zui);
if (zui->pick_supported == 1) if (zui->pick_supported == 1)
{ {
fputs("Core loading is not implemented yet, sorry.", stderr); int ret =zui_load_content(zui, 0);
layout = LAY_HOME; layout = LAY_HOME;
zui->time_to_exit = true;
return;
} }
else else
{ {
@ -872,8 +890,10 @@ static void zui_render(void)
if (zui_list_item(zui, 0, 54 + j * 54, zui->pick_cores[i].display_name)) if (zui_list_item(zui, 0, 54 + j * 54, zui->pick_cores[i].display_name))
{ {
fputs("Core loading is not implemented yet, sorry.", stderr); int ret =zui_load_content(zui, i);
layout = LAY_HOME; layout = LAY_HOME;
zui->time_to_exit = true;
break; break;
} }
j++; j++;
@ -1146,17 +1166,30 @@ static void zarch_context_reset(void)
static int zarch_iterate(bool render_this_frame, enum menu_action action) static int zarch_iterate(bool render_this_frame, enum menu_action action)
{ {
menu_handle_t *menu = menu_driver_get_ptr(); zui_t *zui = NULL;
menu_handle_t *menu = menu_driver_get_ptr();
if (!menu) if (!menu)
return 0; return 0;
zui = (zui_t*)menu->userdata;
if (!zui)
return -1;
if (render_this_frame) if (render_this_frame)
{ {
BIT64_SET(menu->state, MENU_STATE_RENDER_FRAMEBUFFER); BIT64_SET(menu->state, MENU_STATE_RENDER_FRAMEBUFFER);
BIT64_SET(menu->state, MENU_STATE_BLIT); BIT64_SET(menu->state, MENU_STATE_BLIT);
} }
if (zui->time_to_exit)
{
RARCH_LOG("Gets here.\n");
zui->time_to_exit = false;
return -1;
}
return 0; return 0;
} }