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

Merge branch 'master' of https://github.com/Themaister/RetroArch

Browse Source
This commit is contained in:
freakdave 2012-07-16 20:47:17 +02:00
commit 616bfea527
1 changed files with 23 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ps3/frontend/menu.c
View File

@ -87,6 +87,9 @@ static void set_setting_label_color(bool cond, unsigned currentsetting)
static void set_setting_label(menu * menu_obj, unsigned currentsetting) static void set_setting_label(menu * menu_obj, unsigned currentsetting)
{ {
char fname[PATH_MAX];
(void)fname;
switch(currentsetting) switch(currentsetting)
{ {
case SETTING_CHANGE_RESOLUTION: case SETTING_CHANGE_RESOLUTION:
@ -94,30 +97,21 @@ static void set_setting_label(menu * menu_obj, unsigned currentsetting)
snprintf(items_generalsettings[currentsetting].setting_text, sizeof(items_generalsettings[currentsetting].setting_text), ps3_get_resolution_label(g_console.supported_resolutions[g_console.current_resolution_index])); snprintf(items_generalsettings[currentsetting].setting_text, sizeof(items_generalsettings[currentsetting].setting_text), ps3_get_resolution_label(g_console.supported_resolutions[g_console.current_resolution_index]));
break; break;
case SETTING_SHADER_PRESETS: case SETTING_SHADER_PRESETS:
{
char fname[PATH_MAX];
set_setting_label_color(g_console.cgp_path == DEFAULT_PRESET_FILE, currentsetting); set_setting_label_color(g_console.cgp_path == DEFAULT_PRESET_FILE, currentsetting);
fill_pathname_base(fname, g_console.cgp_path, sizeof(fname)); fill_pathname_base(fname, g_console.cgp_path, sizeof(fname));
snprintf(items_generalsettings[currentsetting].setting_text, sizeof(items_generalsettings[currentsetting].setting_text), fname); snprintf(items_generalsettings[currentsetting].setting_text, sizeof(items_generalsettings[currentsetting].setting_text), fname);
}
break; break;
case SETTING_SHADER: case SETTING_SHADER:
{
char fname[PATH_MAX];
fill_pathname_base(fname, g_settings.video.cg_shader_path, sizeof(fname)); fill_pathname_base(fname, g_settings.video.cg_shader_path, sizeof(fname));
snprintf(items_generalsettings[currentsetting].setting_text, sizeof(items_generalsettings[currentsetting].setting_text), "%s", fname); snprintf(items_generalsettings[currentsetting].setting_text, sizeof(items_generalsettings[currentsetting].setting_text), "%s", fname);
set_setting_label_color(strcmp(g_settings.video.cg_shader_path,DEFAULT_SHADER_FILE) == 0, set_setting_label_color(strcmp(g_settings.video.cg_shader_path,DEFAULT_SHADER_FILE) == 0,
currentsetting); currentsetting);
}
break; break;
case SETTING_SHADER_2: case SETTING_SHADER_2:
{
char fname[PATH_MAX];
fill_pathname_base(fname, g_settings.video.second_pass_shader, sizeof(fname)); fill_pathname_base(fname, g_settings.video.second_pass_shader, sizeof(fname));
snprintf(items_generalsettings[currentsetting].setting_text, sizeof(items_generalsettings[currentsetting].setting_text), "%s", fname); snprintf(items_generalsettings[currentsetting].setting_text, sizeof(items_generalsettings[currentsetting].setting_text), "%s", fname);
set_setting_label_color(strcmp(g_settings.video.second_pass_shader,DEFAULT_SHADER_FILE) == 0, set_setting_label_color(strcmp(g_settings.video.second_pass_shader,DEFAULT_SHADER_FILE) == 0,
currentsetting); currentsetting);
}
break; break;
case SETTING_FONT_SIZE: case SETTING_FONT_SIZE:
set_setting_label_color(g_console.menu_font_size == 1.0f, currentsetting); set_setting_label_color(g_console.menu_font_size == 1.0f, currentsetting);
@ -223,13 +217,10 @@ static void set_setting_label(menu * menu_obj, unsigned currentsetting)
} }
break; break;
case SETTING_RARCH_DEFAULT_EMU: case SETTING_RARCH_DEFAULT_EMU:
{
char fname[PATH_MAX];
fill_pathname_base(fname, g_settings.libretro, sizeof(fname)); fill_pathname_base(fname, g_settings.libretro, sizeof(fname));
snprintf(items_generalsettings[currentsetting].setting_text, sizeof(items_generalsettings[currentsetting].setting_text), "%s", fname); snprintf(items_generalsettings[currentsetting].setting_text, sizeof(items_generalsettings[currentsetting].setting_text), "%s", fname);
items_generalsettings[currentsetting].text_color = GREEN; items_generalsettings[currentsetting].text_color = GREEN;
}
break; break;
case SETTING_EMU_AUDIO_MUTE: case SETTING_EMU_AUDIO_MUTE:
set_setting_label_write_on_or_off(g_extern.audio_data.mute, currentsetting); set_setting_label_write_on_or_off(g_extern.audio_data.mute, currentsetting);
@ -609,7 +600,7 @@ static void display_menubar(void)
} }
uint64_t state; uint64_t state;
uint16_t input_state, old_input_state = 0; uint16_t input_state = 0;
uint16_t trigger_st = 0; uint16_t trigger_st = 0;
static uint64_t old_state = 0; static uint64_t old_state = 0;
@ -2158,7 +2149,7 @@ void menu_loop(void)
} }
control_update_wrap(trigger_state); control_update_wrap(trigger_state);
trigger_st = input_state & ~old_input_state; trigger_st = input_state;
gfx_ctx_clear(); gfx_ctx_clear();