(PS3) Fixes setting CGP preset file

This commit is contained in:
twinaphex 2013-02-10 22:45:25 +01:00
parent 1643b30146
commit 1734586c24
2 changed files with 15 additions and 3 deletions

View File

@ -1325,9 +1325,12 @@ static int set_setting_action(void *data, unsigned switchvalue, uint64_t input)
#ifdef HAVE_OSKUTIL
if((input & (1ULL << RMENU_DEVICE_NAV_LEFT)) || (input & (1ULL << RMENU_DEVICE_NAV_RIGHT)) || (input & (1ULL << RMENU_DEVICE_NAV_B)))
{
rmenu_state.osk_param = SHADER_PRESET_FILE;
rmenu_state.osk_init = osk_callback_enter_filename_init;
rmenu_state.osk_callback = osk_callback_enter_filename;
if(g_extern.main_is_init)
{
rmenu_state.osk_param = SHADER_PRESET_FILE;
rmenu_state.osk_init = osk_callback_enter_filename_init;
rmenu_state.osk_callback = osk_callback_enter_filename;
}
}
#endif
break;
@ -1335,6 +1338,11 @@ static int set_setting_action(void *data, unsigned switchvalue, uint64_t input)
break;
#endif
case SETTING_DEFAULT_VIDEO_ALL:
if(input & (1ULL << RMENU_DEVICE_NAV_START))
{
set_setting_action(NULL, SETTING_SHADER, 1ULL << RMENU_DEVICE_NAV_START);
set_setting_action(NULL, SETTING_SHADER_2, 1ULL << RMENU_DEVICE_NAV_START);
}
break;
case SETTING_SOUND_MODE:
if(input & (1ULL << RMENU_DEVICE_NAV_LEFT))

View File

@ -1363,16 +1363,20 @@ bool gl_cg_save_cgp(const char *path, const struct gl_cg_cgp_info *info)
fprintf(file, "scale0 = %.1f\n", info->fbo_scale);
}
#ifndef __CELLOS_LV2__
if (info->lut_texture_path && info->lut_texture_id)
{
fprintf(file, "textures = %s\n", info->lut_texture_id);
fprintf(file, "%s = \"%s\"\n",
info->lut_texture_id, info->lut_texture_path);
/* something is breaking in here right now - don't know what it is, but don't bother with it for now */
fprintf(file, "%s_absolute = %s\n",
info->lut_texture_id,
info->lut_texture_absolute ? "true" : "false");
}
#endif
fclose(file);
return true;