mirror of
https://github.com/libretro/RetroArch
synced 2025-02-07 03:40:24 +00:00
Added common macro file for CONFIG_ macros - used now too by PS3
port
This commit is contained in:
TwinAphex51224
parent
a685701805
commit
b56b09af35
64
conf/config_file_macros.h
Normal file
64
conf/config_file_macros.h
Normal file
@ -0,0 +1,64 @@
|
||||
/* SSNES - A Super Nintendo Entertainment System (SNES) Emulator frontend for libsnes.
|
||||
* Copyright (C) 2010-2012 - Hans-Kristian Arntzen
|
||||
* Copyright (C) 2011-2012 - Daniel De Matteis
|
||||
*
|
||||
* Some code herein may be based on code found in BSNES.
|
||||
*
|
||||
* SSNES is free software: you can redistribute it and/or modify it under the terms
|
||||
* of the GNU General Public License as published by the Free Software Found-
|
||||
* ation, either version 3 of the License, or (at your option) any later version.
|
||||
*
|
||||
* SSNES is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
|
||||
* without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
|
||||
* PURPOSE. See the GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License along with SSNES.
|
||||
* If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#ifndef _CONFIG_FILE_MACROS_H
|
||||
#define _CONFIG_FILE_MACROS_H
|
||||
|
||||
/* Macros to ease config getting. */
|
||||
|
||||
#define CONFIG_GET_BOOL(var, key) if (config_get_bool(conf, key, &tmp_bool)) \
|
||||
g_settings.var = tmp_bool
|
||||
|
||||
#define CONFIG_GET_INT(var, key) if (config_get_int(conf, key, &tmp_int)) \
|
||||
g_settings.var = tmp_int
|
||||
|
||||
#define CONFIG_GET_DOUBLE(var, key) if (config_get_double(conf, key, &tmp_double)) \
|
||||
g_settings.var = tmp_double
|
||||
|
||||
#define CONFIG_GET_STRING(var, key) \
|
||||
config_get_array(conf, key, g_settings.var, sizeof(g_settings.var))
|
||||
|
||||
#ifdef SSNES_CONSOLE
|
||||
|
||||
#define CONFIG_GET_BOOL_CONSOLE(var, key) if (config_get_bool(conf, key, &tmp_bool)) \
|
||||
g_console.var = tmp_bool
|
||||
|
||||
#define CONFIG_GET_INT_CONSOLE(var, key) if (config_get_int(conf, key, &tmp_int)) \
|
||||
g_console.var = tmp_int
|
||||
|
||||
#define CONFIG_GET_DOUBLE_CONSOLE(var, key) if (config_get_double(conf, key, &tmp_double)) \
|
||||
g_console.var = tmp_double
|
||||
|
||||
#define CONFIG_GET_STRING_CONSOLE(var, key) \
|
||||
config_get_array(conf, key, g_console.var, sizeof(g_console.var))
|
||||
|
||||
#endif
|
||||
|
||||
#define CONFIG_GET_BOOL_EXTERN(var, key) if (config_get_bool(conf, key, &tmp_bool)) \
|
||||
g_extern.var = tmp_bool
|
||||
|
||||
#define CONFIG_GET_INT_EXTERN(var, key) if (config_get_int(conf, key, &tmp_int)) \
|
||||
g_extern.var = tmp_int
|
||||
|
||||
#define CONFIG_GET_DOUBLE_EXTERN(var, key) if (config_get_double(conf, key, &tmp_double)) \
|
||||
g_extern.var = tmp_double
|
||||
|
||||
#define CONFIG_GET_STRING_EXTERN(var, key) \
|
||||
config_get_array(conf, key, g_extern.var, sizeof(g_extern.var))
|
||||
|
||||
#endif
|
||||
86
ps3/main.c
86
ps3/main.c
@ -32,6 +32,7 @@
|
||||
#include "ps3_video_psgl.h"
|
||||
|
||||
#include "../conf/config_file.h"
|
||||
#include "../conf/config_file_macros.h"
|
||||
#include "../general.h"
|
||||
|
||||
#include "shared.h"
|
||||
@ -39,34 +40,8 @@
|
||||
#include "menu.h"
|
||||
|
||||
#define MAX_PATH_LENGTH 1024
|
||||
|
||||
#define EMULATOR_CONTENT_DIR "SSNE10000"
|
||||
|
||||
#define init_setting_uint(charstring, setting, defaultvalue) \
|
||||
if(!(config_get_uint(currentconfig, charstring, &setting))) \
|
||||
setting = defaultvalue;
|
||||
|
||||
#define init_setting_int(charstring, setting, defaultvalue) \
|
||||
if(!(config_get_int(currentconfig, charstring, &setting))) \
|
||||
setting = defaultvalue;
|
||||
|
||||
#define init_setting_float(charstring, setting, defaultvalue) \
|
||||
if(!(config_get_float(currentconfig, charstring, &setting))) \
|
||||
setting = defaultvalue;
|
||||
|
||||
#define init_setting_bool(charstring, setting, defaultvalue) \
|
||||
if(!(config_get_bool(currentconfig, charstring, &setting))) \
|
||||
setting = defaultvalue;
|
||||
|
||||
#define init_setting_bool(charstring, setting, defaultvalue) \
|
||||
if(!(config_get_bool(currentconfig, charstring, &setting))) \
|
||||
setting = defaultvalue;
|
||||
|
||||
#define init_setting_char(charstring, setting, defaultvalue) \
|
||||
if(!(config_get_array(currentconfig, charstring, setting, sizeof(setting)))) \
|
||||
strncpy(setting,defaultvalue, sizeof(setting));
|
||||
|
||||
|
||||
uint32_t g_emulator_initialized = 0;
|
||||
|
||||
char special_action_msg[256]; /* message which should be overlaid on top of the screen*/
|
||||
@ -116,7 +91,23 @@ static bool file_exists(const char * filename)
|
||||
return false;
|
||||
}
|
||||
|
||||
static void init_settings(void)
|
||||
static void default_settings(void)
|
||||
{
|
||||
g_settings.video.smooth = 1;
|
||||
g_settings.video.second_pass_smooth = 1;
|
||||
snprintf(g_settings.video.cg_shader_path, sizeof(g_settings.video.cg_shader_path), DEFAULT_SHADER_FILE);
|
||||
snprintf(g_settings.video.cg_shader_path, sizeof(g_settings.video.second_pass_shader), DEFAULT_SHADER_FILE);
|
||||
g_settings.video.fbo_scale_x = 2.0f;
|
||||
g_settings.video.fbo_scale_y = 2.0f;
|
||||
g_settings.video.render_to_texture = 1;
|
||||
g_settings.video.vsync = 1;
|
||||
g_extern.state_slot = 0;
|
||||
g_console.screenshots_enable = 0;
|
||||
snprintf(g_settings.cheat_database , sizeof(g_settings.cheat_database), usrDirPath);
|
||||
g_settings.rewind_enable = false;
|
||||
}
|
||||
|
||||
static bool init_settings(void)
|
||||
{
|
||||
if(!file_exists(SYS_CONFIG_FILE))
|
||||
{
|
||||
@ -125,20 +116,29 @@ static void init_settings(void)
|
||||
fclose(f);
|
||||
}
|
||||
|
||||
config_file_t * currentconfig = config_file_new(SYS_CONFIG_FILE);
|
||||
config_file_t * conf = config_file_new(SYS_CONFIG_FILE);
|
||||
if (!conf)
|
||||
return 1;
|
||||
|
||||
init_setting_bool("video_smooth", g_settings.video.smooth, 1);
|
||||
init_setting_bool("video_second_pass_smooth", g_settings.video.second_pass_smooth, 1);
|
||||
init_setting_char("video_cg_shader", g_settings.video.cg_shader_path, DEFAULT_SHADER_FILE);
|
||||
init_setting_char("video_second_pass_shader", g_settings.video.second_pass_shader, DEFAULT_SHADER_FILE);
|
||||
init_setting_float("video_fbo_scale_x", g_settings.video.fbo_scale_x, 2.0f);
|
||||
init_setting_float("video_fbo_scale_y", g_settings.video.fbo_scale_y, 2.0f);
|
||||
init_setting_bool("video_render_to_texture", g_settings.video.render_to_texture, 1);
|
||||
init_setting_bool("video_vsync", g_settings.video.vsync, 1);
|
||||
init_setting_uint("state_slot", g_extern.state_slot, 0);
|
||||
init_setting_uint("screenshots_enabled", g_console.screenshots_enable, 0);
|
||||
init_setting_char("cheat_database_path", g_settings.cheat_database, usrDirPath);
|
||||
init_setting_bool("rewind_enable", g_settings.rewind_enable, false);
|
||||
int tmp_int;
|
||||
double tmp_double;
|
||||
bool tmp_bool;
|
||||
char tmp_str[PATH_MAX];
|
||||
|
||||
CONFIG_GET_BOOL(video.smooth, "video_smooth");
|
||||
CONFIG_GET_BOOL(video.second_pass_smooth, "video_second_pass_smooth");
|
||||
CONFIG_GET_STRING(video.cg_shader_path, "video_cg_shader");
|
||||
CONFIG_GET_STRING(video.second_pass_shader, "video_second_pass_shader");
|
||||
CONFIG_GET_DOUBLE(video.fbo_scale_x, "video_fbo_scale_x");
|
||||
CONFIG_GET_DOUBLE(video.fbo_scale_y, "video_fbo_scale_y");
|
||||
CONFIG_GET_BOOL(video.render_to_texture, "video_render_to_texture");
|
||||
CONFIG_GET_BOOL(video.vsync, "video_vsync");
|
||||
CONFIG_GET_INT_EXTERN(state_slot, "state_slot");
|
||||
CONFIG_GET_INT_CONSOLE(screenshots_enable, "screenshots_enabled");
|
||||
CONFIG_GET_STRING(cheat_database, "cheat_database_path");
|
||||
CONFIG_GET_BOOL(rewind_enable, "rewind_enable");
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void get_path_settings(bool multiman_support)
|
||||
@ -503,6 +503,7 @@ int main(int argc, char *argv[])
|
||||
|
||||
g_console.block_config_read = true;
|
||||
g_extern.verbose = true;
|
||||
config_set_defaults_cb(default_settings);
|
||||
config_set_defaults();
|
||||
|
||||
SSNES_LOG("Registering Callback\n");
|
||||
@ -520,7 +521,10 @@ int main(int argc, char *argv[])
|
||||
#endif
|
||||
|
||||
get_path_settings(g_console.return_to_multiman_enable);
|
||||
init_settings();
|
||||
if(!init_settings())
|
||||
{
|
||||
SSNES_ERR("Couldn't find config at path: \"%s\"\n", SYS_CONFIG_FILE);
|
||||
}
|
||||
|
||||
#if(CELL_SDK_VERSION > 0x340000)
|
||||
if (g_console.screenshots_enable)
|
||||
|
||||
13
settings.c
13
settings.c
@ -17,6 +17,7 @@
|
||||
|
||||
#include "general.h"
|
||||
#include "conf/config_file.h"
|
||||
#include "conf/config_file_macros.h"
|
||||
#include "input/keysym.h"
|
||||
#include "strl.h"
|
||||
#include "config.def.h"
|
||||
@ -307,18 +308,6 @@ static config_file_t *open_default_config_file(void)
|
||||
}
|
||||
#endif
|
||||
|
||||
// Macros to ease config getting.
|
||||
#define CONFIG_GET_BOOL(var, key) if (config_get_bool(conf, key, &tmp_bool)) \
|
||||
g_settings.var = tmp_bool
|
||||
|
||||
#define CONFIG_GET_INT(var, key) if (config_get_int(conf, key, &tmp_int)) \
|
||||
g_settings.var = tmp_int
|
||||
|
||||
#define CONFIG_GET_DOUBLE(var, key) if (config_get_double(conf, key, &tmp_double)) \
|
||||
g_settings.var = tmp_double
|
||||
|
||||
#define CONFIG_GET_STRING(var, key) \
|
||||
config_get_array(conf, key, g_settings.var, sizeof(g_settings.var))
|
||||
|
||||
#ifdef HAVE_CONFIGFILE
|
||||
static void parse_config_file(void)
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user