libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-11-24 08:30:16 +00:00
Code Issues Actions 23 Packages Projects Releases Wiki Activity

Cleanups

Browse Source
This commit is contained in:
twinaphex 2020-02-04 05:54:00 +01:00
parent 51290457dd
commit 3990254a7c
2 changed files with 26 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
configuration.c
View File

@ -2440,6 +2440,20 @@ void config_set_defaults(void *data)
#endif
}
/**
* config_load:
*
* Loads a config file and reads all the values into memory.
*
*/
void config_load(void *data)
{
global_t *global = (global_t*)data;
config_set_defaults(global);
#ifdef HAVE_CONFIGFILE
config_parse_file(global);
#endif
}
#ifdef HAVE_CONFIGFILE
@ -3602,24 +3616,6 @@ void config_parse_file(void *data)
}
}
}
#endif
/**
* config_load:
*
* Loads a config file and reads all the values into memory.
*
*/
void config_load(void *data)
{
global_t *global = (global_t*)data;
config_set_defaults(global);
#ifdef HAVE_CONFIGFILE
config_parse_file(global);
#endif
}
#ifdef HAVE_CONFIGFILE
/**
* config_save_autoconf_profile:
* @path : Path that shall be written to.

24
retroarch.c
View File

@ -24671,11 +24671,10 @@ static void retroarch_parse_input_and_config(int argc, char *argv[])
case 'c':
path_set(RARCH_PATH_CONFIG, optarg);
break;
#endif
case RA_OPT_APPENDCONFIG:
path_set(RARCH_PATH_CONFIG_APPEND, optarg);
break;
#endif
case 's':
strlcpy(global->name.savefile, optarg,
@ -24873,19 +24872,18 @@ static void retroarch_parse_input_and_config(int argc, char *argv[])
break;
#endif
case 'P':
strlcpy(bsv_movie_state.movie_start_path, optarg,
sizeof(bsv_movie_state.movie_start_path));
bsv_movie_state.movie_start_playback = true;
bsv_movie_state.movie_start_recording = false;
break;
case 'R':
strlcpy(bsv_movie_state.movie_start_path, optarg,
sizeof(bsv_movie_state.movie_start_path));
if (c == 'P')
bsv_movie_state.movie_start_playback = true;
else
bsv_movie_state.movie_start_playback = false;
if (c == 'R')
bsv_movie_state.movie_start_recording = true;
else
bsv_movie_state.movie_start_recording = false;
bsv_movie_state.movie_start_playback = false;
bsv_movie_state.movie_start_recording = true;
break;
case 'M':
@ -25074,9 +25072,11 @@ static void retroarch_parse_input_and_config(int argc, char *argv[])
rarch_log_file_set_override(optarg);
break;
case 'c':
case 'h':
#ifdef HAVE_CONFIGFILE
case 'c':
case RA_OPT_APPENDCONFIG:
#endif
case 's':
case 'S':
break; /* Handled in the first pass */