mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-01-30 03:32:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #966 from lakkatv/lakka

Browse Source 
Use setting_data_get_string_representation + fix a bug
This commit is contained in:
Twinaphex 2014-09-10 15:16:10 +02:00
commit 84563583d1
2 changed files with 16 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
frontend/menu/disp/lakka.c
View File

@ -482,7 +482,7 @@ static void lakka_draw_subitems(int i, int j)
if (!subitem)
continue;
if (k == 0 && g_extern.main_is_init
if (i && k == 0 && g_extern.main_is_init
&& !g_extern.libretro_dummy
&& strcmp(g_extern.fullpath, active_item->rom) == 0)
{
@ -755,43 +755,20 @@ void lakka_init_settings(void)
item->num_subitems++;
item->subitems = (menu_subitem_t*)
realloc(item->subitems, item->num_subitems * sizeof(menu_subitem_t));
realloc(item->subitems,
item->num_subitems * sizeof(menu_subitem_t));
menu_subitem_t *subitem = (menu_subitem_t*)&item->subitems[kk];
strlcpy(subitem->name, setting.short_description, sizeof(subitem->name));
strlcpy(subitem->name, setting.short_description,
sizeof(subitem->name));
subitem->alpha = kk ? 1.0 : 0.5;
subitem->zoom = kk ? i_active_zoom : i_passive_zoom;
subitem->y = kk ? vspacing * (kk + under_item_offset)
: vspacing * active_item_factor;
if (setting.type == ST_BOOL)
{
if (setting.value.boolean)
strlcpy(subitem->value, "ON", sizeof(subitem->value));
else
strlcpy(subitem->value, "OFF", sizeof(subitem->value));
}
else if (setting.type == ST_INT)
{
sprintf(subitem->value, "%d", *setting.value.integer);
}
else if (setting.type == ST_UINT)
{
sprintf(subitem->value, "%u", *setting.value.unsigned_integer);
}
else if (setting.type == ST_FLOAT)
{
sprintf(subitem->value, "%f", *setting.value.fraction);
}
else if (setting.type == ST_STRING || setting.type == ST_PATH || setting.type == ST_DIR)
{
sprintf(subitem->value, "%s", setting.value.string);
}
else
{
strlcpy(subitem->value, "tbd", sizeof(subitem->value));
}
setting_data_get_string_representation(&setting, subitem->value,
sizeof(subitem->value));
kk++;
}

14
settings_data.c
View File

@ -603,11 +603,15 @@ void setting_data_get_string_representation(rarch_setting_t* setting,
snprintf(buf, sizeof_buf, "[KB:%s] [JS:%s] [AX:%s]", key_name, button_name, axis_name);
#else
#ifdef HAVE_MENU
const struct retro_keybind* bind = (const struct retro_keybind*)
&setting->value.keybind[driver.menu->current_pad];
const struct retro_keybind* auto_bind = (const struct retro_keybind*)
input_get_auto_bind(driver.menu->current_pad, bind->id);
input_get_bind_string(buf, bind, auto_bind, sizeof_buf);
if (driver.menu != NULL)
{
const struct retro_keybind* bind = (const struct retro_keybind*)
&setting->value.keybind[driver.menu->current_pad];
const struct retro_keybind* auto_bind =
(const struct retro_keybind*)
input_get_auto_bind(driver.menu->current_pad, bind->id);
input_get_bind_string(buf, bind, auto_bind, sizeof_buf);
}
#endif
#endif
}