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

Create 'loading and saving' of configuration settings for video_driver_ctl

Browse Source
This commit is contained in:
twinaphex 2015-11-21 09:32:51 +01:00
parent 32717d1340
commit 30272dd413
4 changed files with 92 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
configuration.c
View File

@ -33,39 +33,6 @@
#include "config.h"
#endif
#define CONFIG_GET_BOOL_BASE(conf, base, var, key) do { \
bool tmp = false; \
if (config_get_bool(conf, key, &tmp)) \
base->var = tmp; \
} while(0)
#define CONFIG_GET_INT_BASE(conf, base, var, key) do { \
int tmp = 0; \
if (config_get_int(conf, key, &tmp)) \
base->var = tmp; \
} while(0)
#define CONFIG_GET_UINT64_BASE(conf, base, var, key) do { \
uint64_t tmp = 0; \
if (config_get_int(conf, key, &tmp)) \
base->var = tmp; \
} while(0)
#define CONFIG_GET_HEX_BASE(conf, base, var, key) do { \
unsigned tmp = 0; \
if (config_get_hex(conf, key, &tmp)) \
base->var = tmp; \
} while(0)
#define CONFIG_GET_FLOAT_BASE(conf, base, var, key) do { \
float tmp = 0.0f; \
if (config_get_float(conf, key, &tmp)) \
base->var = tmp; \
} while(0)
#define CONFIG_GET_STRING_BASE(conf, base, var, key) config_get_array(conf, key, base->var, sizeof(base->var))
#define CONFIG_GET_PATH_BASE(conf, base, var, key) config_get_path (conf, key, base->var, sizeof(base->var))
static settings_t *g_config;
struct defaults g_defaults;
@ -1354,28 +1321,10 @@ static bool config_load_file(const char *path, bool set_defaults)
#ifdef RARCH_CONSOLE
/* TODO - will be refactored later to make it more clean - it's more
* important that it works for consoles right now */
CONFIG_GET_BOOL_BASE(conf, global, console.screen.gamma_correction, "gamma_correction");
config_get_bool(conf, "custom_bgm_enable",
&global->console.sound.system_bgm_enable);
config_get_bool(conf, "flicker_filter_enable",
&global->console.flickerfilter_enable);
config_get_bool(conf, "soft_filter_enable",
&global->console.softfilter_enable);
CONFIG_GET_INT_BASE(conf, global, console.screen.resolutions.width,
"console_resolution_width");
CONFIG_GET_INT_BASE(conf, global, console.screen.resolutions.height,
"console_resolution_height");
CONFIG_GET_INT_BASE(conf, global, console.screen.flicker_filter_index,
"flicker_filter_index");
CONFIG_GET_INT_BASE(conf, global, console.screen.soft_filter_index,
"soft_filter_index");
CONFIG_GET_INT_BASE(conf, global, console.screen.resolutions.current.id,
"current_resolution_id");
CONFIG_GET_INT_BASE(conf, global, console.sound.mode, "sound_mode");
video_driver_ctl(RARCH_DISPLAY_CTL_LOAD_SETTINGS, conf);
#endif
CONFIG_GET_INT_BASE(conf, settings, state_slot, "state_slot");
@ -2711,24 +2660,6 @@ bool config_save_file(const char *path)
config_set_float(conf, "video_message_pos_x", settings->video.msg_pos_x);
config_set_float(conf, "video_message_pos_y", settings->video.msg_pos_y);
config_set_bool(conf, "gamma_correction",
global->console.screen.gamma_correction);
config_set_bool(conf, "soft_filter_enable",
global->console.softfilter_enable);
config_set_bool(conf, "flicker_filter_enable",
global->console.flickerfilter_enable);
config_set_int(conf, "console_resolution_width",
global->console.screen.resolutions.width);
config_set_int(conf, "console_resolution_height",
global->console.screen.resolutions.height);
config_set_int(conf, "flicker_filter_index",
global->console.screen.flicker_filter_index);
config_set_int(conf, "soft_filter_index",
global->console.screen.soft_filter_index);
config_set_int(conf, "current_resolution_id",
global->console.screen.resolutions.current.id);
config_set_int(conf, "custom_viewport_width",
settings->video_viewport_custom.width);
config_set_int(conf, "custom_viewport_height",
@ -2738,6 +2669,7 @@ bool config_save_file(const char *path)
config_set_int(conf, "custom_viewport_y",
settings->video_viewport_custom.y);
video_driver_ctl(RARCH_DISPLAY_CTL_SAVE_SETTINGS, conf);
config_set_float(conf, "video_font_size", settings->video.font_size);

55
gfx/video_driver.c
View File

@ -16,6 +16,8 @@
#include <string.h>
#include <file/config_file.h>
#include "video_thread_wrapper.h"
#include "video_pixel_converter.h"
#include "video_context_driver.h"
@ -1212,6 +1214,59 @@ bool video_driver_ctl(enum rarch_display_ctl_state state, void *data)
return false;
case RARCH_DISPLAY_CTL_FRAME_FILTER_IS_32BIT:
return video_state.filter.out_rgb32;
case RARCH_DISPLAY_CTL_LOAD_SETTINGS:
{
global_t *global = global_get_ptr();
config_file_t *conf = (config_file_t*)data;
if (!conf)
return false;
CONFIG_GET_BOOL_BASE(conf, global, console.screen.gamma_correction, "gamma_correction");
config_get_bool(conf, "flicker_filter_enable",
&global->console.flickerfilter_enable);
config_get_bool(conf, "soft_filter_enable",
&global->console.softfilter_enable);
CONFIG_GET_INT_BASE(conf, global, console.screen.resolutions.width,
"console_resolution_width");
CONFIG_GET_INT_BASE(conf, global, console.screen.resolutions.height,
"console_resolution_height");
CONFIG_GET_INT_BASE(conf, global, console.screen.soft_filter_index,
"soft_filter_index");
CONFIG_GET_INT_BASE(conf, global, console.screen.resolutions.current.id,
"current_resolution_id");
CONFIG_GET_INT_BASE(conf, global, console.screen.flicker_filter_index,
"flicker_filter_index");
}
return true;
case RARCH_DISPLAY_CTL_SAVE_SETTINGS:
{
global_t *global = global_get_ptr();
config_file_t *conf = (config_file_t*)data;
if (!conf)
return false;
config_set_bool(conf, "gamma_correction",
global->console.screen.gamma_correction);
config_set_bool(conf, "flicker_filter_enable",
global->console.flickerfilter_enable);
config_set_bool(conf, "soft_filter_enable",
global->console.softfilter_enable);
config_set_int(conf, "console_resolution_width",
global->console.screen.resolutions.width);
config_set_int(conf, "console_resolution_height",
global->console.screen.resolutions.height);
config_set_int(conf, "soft_filter_index",
global->console.screen.soft_filter_index);
config_set_int(conf, "current_resolution_id",
global->console.screen.resolutions.current.id);
config_set_int(conf, "flicker_filter_index",
global->console.screen.flicker_filter_index);
}
return true;
case RARCH_DISPLAY_CTL_NONE:
default:
break;

2
gfx/video_driver.h
View File

@ -223,6 +223,8 @@ enum rarch_display_ctl_state
RARCH_DISPLAY_CTL_NONE = 0,
RARCH_DISPLAY_CTL_INIT,
RARCH_DISPLAY_CTL_DEINIT,
RARCH_DISPLAY_CTL_LOAD_SETTINGS,
RARCH_DISPLAY_CTL_SAVE_SETTINGS,
RARCH_DISPLAY_CTL_MONITOR_RESET,
RARCH_DISPLAY_CTL_MONITOR_ADJUST_SYSTEM_RATES,
RARCH_DISPLAY_CTL_APPLY_STATE_CHANGES,

33
libretro-common/include/file/config_file.h
View File

@ -34,6 +34,39 @@ extern "C" {
#include <boolean.h>
#define CONFIG_GET_BOOL_BASE(conf, base, var, key) do { \
bool tmp = false; \
if (config_get_bool(conf, key, &tmp)) \
base->var = tmp; \
} while(0)
#define CONFIG_GET_INT_BASE(conf, base, var, key) do { \
int tmp = 0; \
if (config_get_int(conf, key, &tmp)) \
base->var = tmp; \
} while(0)
#define CONFIG_GET_UINT64_BASE(conf, base, var, key) do { \
uint64_t tmp = 0; \
if (config_get_int(conf, key, &tmp)) \
base->var = tmp; \
} while(0)
#define CONFIG_GET_HEX_BASE(conf, base, var, key) do { \
unsigned tmp = 0; \
if (config_get_hex(conf, key, &tmp)) \
base->var = tmp; \
} while(0)
#define CONFIG_GET_FLOAT_BASE(conf, base, var, key) do { \
float tmp = 0.0f; \
if (config_get_float(conf, key, &tmp)) \
base->var = tmp; \
} while(0)
#define CONFIG_GET_STRING_BASE(conf, base, var, key) config_get_array(conf, key, base->var, sizeof(base->var))
#define CONFIG_GET_PATH_BASE(conf, base, var, key) config_get_path (conf, key, base->var, sizeof(base->var))
typedef struct config_file config_file_t;
/* Config file format