From 4893696e22815fadd7cb72442daa9bd9093938b4 Mon Sep 17 00:00:00 2001 From: Twinaphex Date: Sun, 22 Apr 2012 01:45:55 +0200 Subject: [PATCH] Use retroarch.cfg now --- 360/main.c | 6 +++--- console/console_ext.h | 2 +- ps3/main.c | 10 +++++----- ps3/menu.c | 26 +++++++++++++------------- ps3/menu.h | 2 +- ps3/shared.h | 4 ++-- retroarch.c | 6 +++--- 7 files changed, 28 insertions(+), 28 deletions(-) diff --git a/360/main.c b/360/main.c index 4b9a84083c..f6f2564edf 100644 --- a/360/main.c +++ b/360/main.c @@ -180,7 +180,7 @@ static void init_settings (bool load_libretro_path) if(!path_file_exists(SYS_CONFIG_FILE)) { FILE * f; - RARCH_ERR("Config file \"%s\" desn't exist. Creating...\n", "game:\\ssnes.cfg"); + RARCH_ERR("Config file \"%s\" desn't exist. Creating...\n", "game:\\retroarch.cfg"); f = fopen(SYS_CONFIG_FILE, "w"); fclose(f); } @@ -209,7 +209,7 @@ static void init_settings (bool load_libretro_path) { fill_pathname_base(fname_tmp, first_xex, sizeof(fname_tmp)); - if(strcmp(fname_tmp, "SSNES-Salamander.xex") == 0) + if(strcmp(fname_tmp, "RetroArch-Salamander.xex") == 0) { RARCH_WARN("First entry is RetroArch Salamander itself, increment entry by one and check if it exists.\n"); first_xex = dir_list[1]; @@ -365,7 +365,7 @@ static void get_environment_settings (void) } strlcpy(DEFAULT_SHADER_FILE, "game:\\media\\shaders\\stock.cg", sizeof(DEFAULT_SHADER_FILE)); - strlcpy(SYS_CONFIG_FILE, "game:\\ssnes.cfg", sizeof(SYS_CONFIG_FILE)); + strlcpy(SYS_CONFIG_FILE, "game:\\retroarch.cfg", sizeof(SYS_CONFIG_FILE)); } int main(int argc, char *argv[]) diff --git a/console/console_ext.h b/console/console_ext.h index a92448906f..4fba0e4b1c 100644 --- a/console/console_ext.h +++ b/console/console_ext.h @@ -97,7 +97,7 @@ bool rarch_manage_libretro_core(const char *full_path, const char *path, const c #endif /*============================================================ - SSNES + RetroArch ============================================================ */ #ifdef HAVE_RARCH_MAIN_WRAP diff --git a/ps3/main.c b/ps3/main.c index 820656f5b5..db39937e5b 100644 --- a/ps3/main.c +++ b/ps3/main.c @@ -69,7 +69,7 @@ char PRESETS_DIR_PATH[MAX_PATH_LENGTH]; char INPUT_PRESETS_DIR_PATH[MAX_PATH_LENGTH]; char BORDERS_DIR_PATH[MAX_PATH_LENGTH]; char SHADERS_DIR_PATH[MAX_PATH_LENGTH]; -char LIBSNES_DIR_PATH[MAX_PATH_LENGTH]; +char LIBRETRO_DIR_PATH[MAX_PATH_LENGTH]; char DEFAULT_SHADER_FILE[MAX_PATH_LENGTH]; char DEFAULT_MENU_SHADER_FILE[MAX_PATH_LENGTH]; char SYS_CONFIG_FILE[MAX_PATH_LENGTH]; @@ -173,7 +173,7 @@ static void init_settings(bool load_libretro_path) { //We need to set libretro to the first entry in the cores //directory so that it will be saved to the config file - char ** dir_list = dir_list_new(LIBSNES_DIR_PATH, ".SELF"); + char ** dir_list = dir_list_new(LIBRETRO_DIR_PATH, ".SELF"); if (!dir_list) { @@ -423,12 +423,12 @@ static void get_environment_settings(int argc, char *argv[]) snprintf(DEFAULT_MENU_BORDER_FILE, sizeof(DEFAULT_MENU_BORDER_FILE), "%s/%s/borders/Menu/main-menu.png", usrDirPath, EMULATOR_CORE_DIR); snprintf(PRESETS_DIR_PATH, sizeof(PRESETS_DIR_PATH), "%s/%s/presets", usrDirPath, EMULATOR_CORE_DIR); snprintf(INPUT_PRESETS_DIR_PATH, sizeof(INPUT_PRESETS_DIR_PATH), "%s/input", PRESETS_DIR_PATH); - snprintf(LIBSNES_DIR_PATH, sizeof(LIBSNES_DIR_PATH), "%s/%s", usrDirPath, EMULATOR_CORE_DIR); + snprintf(LIBRETRO_DIR_PATH, sizeof(LIBRETRO_DIR_PATH), "%s/%s", usrDirPath, EMULATOR_CORE_DIR); snprintf(BORDERS_DIR_PATH, sizeof(BORDERS_DIR_PATH), "%s/%s/borders", usrDirPath, EMULATOR_CORE_DIR); snprintf(SHADERS_DIR_PATH, sizeof(SHADERS_DIR_PATH), "%s/%s/shaders", usrDirPath, EMULATOR_CORE_DIR); snprintf(DEFAULT_SHADER_FILE, sizeof(DEFAULT_SHADER_FILE), "%s/%s/shaders/stock.cg", usrDirPath, EMULATOR_CORE_DIR); - snprintf(DEFAULT_MENU_SHADER_FILE, sizeof(DEFAULT_MENU_SHADER_FILE), "%s/%s/shaders/Borders/Menu/border-only-ssnes.cg", usrDirPath, EMULATOR_CORE_DIR); - snprintf(SYS_CONFIG_FILE, sizeof(SYS_CONFIG_FILE), "%s/ssnes.cfg", usrDirPath); + snprintf(DEFAULT_MENU_SHADER_FILE, sizeof(DEFAULT_MENU_SHADER_FILE), "%s/%s/shaders/Borders/Menu/border-only-rarch.cg", usrDirPath, EMULATOR_CORE_DIR); + snprintf(SYS_CONFIG_FILE, sizeof(SYS_CONFIG_FILE), "%s/retroarch.cfg", usrDirPath); } g_extern.verbose = false; diff --git a/ps3/menu.c b/ps3/menu.c index 1abc189393..fafbe1b6b9 100644 --- a/ps3/menu.c +++ b/ps3/menu.c @@ -842,7 +842,7 @@ static void select_file(uint32_t menu_id) strncpy(title, "SHADER PRESETS SELECTION", sizeof(title)); strncpy(object, "Shader", sizeof(object)); strncpy(object, "Shader preset", sizeof(object)); - strncpy(comment, "INFO - Select a shader preset from the menu by pressing the X button. ", sizeof(comment)); + strncpy(comment, "INFO - Select a shader preset from the menu by pressing the X button.", sizeof(comment)); break; case INPUT_PRESET_CHOICE: strncpy(dir_path, INPUT_PRESETS_DIR_PATH, sizeof(dir_path)); @@ -850,7 +850,7 @@ static void select_file(uint32_t menu_id) strncpy(title, "INPUT PRESETS SELECTION", sizeof(title)); strncpy(object, "Input", sizeof(object)); strncpy(object, "Input preset", sizeof(object)); - strncpy(comment, "INFO - Select an input preset from the menu by pressing the X button. ", sizeof(comment)); + strncpy(comment, "INFO - Select an input preset from the menu by pressing the X button.", sizeof(comment)); break; case BORDER_CHOICE: strncpy(dir_path, BORDERS_DIR_PATH, sizeof(dir_path)); @@ -858,15 +858,15 @@ static void select_file(uint32_t menu_id) strncpy(title, "BORDER SELECTION", sizeof(title)); strncpy(object, "Border", sizeof(object)); strncpy(object, "Border image file", sizeof(object)); - strncpy(comment, "INFO - Select a border image file from the menu by pressing the X button. ", sizeof(comment)); + strncpy(comment, "INFO - Select a border image file from the menu by pressing the X button.", sizeof(comment)); break; - case LIBSNES_CHOICE: - strncpy(dir_path, LIBSNES_DIR_PATH, sizeof(dir_path)); + case LIBRETRO_CHOICE: + strncpy(dir_path, LIBRETRO_DIR_PATH, sizeof(dir_path)); strncpy(extensions, "self|SELF|bin|BIN", sizeof(extensions)); - strncpy(title, "LIBSNES CORE SELECTION", sizeof(title)); + strncpy(title, "LIBRETRO CORE SELECTION", sizeof(title)); strncpy(object, "Libretro", sizeof(object)); strncpy(object, "Libretro core library", sizeof(object)); - strncpy(comment, "INFO - Select a Libretro core library from the menu by pressing the X button. ", sizeof(comment)); + strncpy(comment, "INFO - Select a Libretro core from the menu by pressing the X button.", sizeof(comment)); break; } @@ -933,7 +933,7 @@ static void select_file(uint32_t menu_id) break; case BORDER_CHOICE: break; - case LIBSNES_CHOICE: + case LIBRETRO_CHOICE: strlcpy(g_settings.libretro, path, sizeof(g_settings.libretro)); strlcpy(g_console.launch_app_on_exit, path, sizeof(g_console.launch_app_on_exit)); g_console.return_to_launcher = true; @@ -1572,7 +1572,7 @@ static void producesettingentry(menu * menu_obj, uint64_t switchvalue) { menuStackindex++; menuStack[menuStackindex] = menu_filebrowser; - menuStack[menuStackindex].enum_id = LIBSNES_CHOICE; + menuStack[menuStackindex].enum_id = LIBRETRO_CHOICE; set_initial_dir_tmpbrowser = true; set_delay = DELAY_LONG; } @@ -2374,12 +2374,12 @@ static void ingame_menu(uint32_t menu_id) } strcpy(comment, "Press 'CROSS' to return to the ROM Browser menu."); break; - case MENU_ITEM_CHANGE_LIBSNES: + case MENU_ITEM_CHANGE_LIBRETRO: if(CTRL_CROSS(state)) { menuStackindex++; menuStack[menuStackindex] = menu_filebrowser; - menuStack[menuStackindex].enum_id = LIBSNES_CHOICE; + menuStack[menuStackindex].enum_id = LIBRETRO_CHOICE; set_initial_dir_tmpbrowser = true; set_delay = DELAY_LONG; } @@ -2482,7 +2482,7 @@ static void ingame_menu(uint32_t menu_id) cellDbgFontPuts(x_position, (ypos+(ypos_increment*MENU_ITEM_RETURN_TO_MENU)), font_size, MENU_ITEM_SELECTED(MENU_ITEM_RETURN_TO_MENU), "Return to Menu"); cellDbgFontDraw(); - cellDbgFontPuts(x_position, (ypos+(ypos_increment*MENU_ITEM_CHANGE_LIBSNES)), font_size, MENU_ITEM_SELECTED(MENU_ITEM_CHANGE_LIBSNES), "Change libretro core"); + cellDbgFontPuts(x_position, (ypos+(ypos_increment*MENU_ITEM_CHANGE_LIBRETRO)), font_size, MENU_ITEM_SELECTED(MENU_ITEM_CHANGE_LIBRETRO), "Change libretro core"); cellDbgFontDraw(); cellDbgFontPuts(x_position, (ypos+(ypos_increment*MENU_ITEM_RETURN_TO_MULTIMAN)), font_size, MENU_ITEM_SELECTED(MENU_ITEM_RETURN_TO_MULTIMAN), "Return to multiMAN"); @@ -2559,7 +2559,7 @@ void menu_loop(void) case SHADER_CHOICE: case PRESET_CHOICE: case BORDER_CHOICE: - case LIBSNES_CHOICE: + case LIBRETRO_CHOICE: case INPUT_PRESET_CHOICE: select_file(menuStack[menuStackindex].enum_id); break; diff --git a/ps3/menu.h b/ps3/menu.h index c33be2d800..2c8dbd3df6 100644 --- a/ps3/menu.h +++ b/ps3/menu.h @@ -69,7 +69,7 @@ enum SHADER_CHOICE, PRESET_CHOICE, BORDER_CHOICE, - LIBSNES_CHOICE, + LIBRETRO_CHOICE, PATH_SAVESTATES_DIR_CHOICE, PATH_DEFAULT_ROM_DIR_CHOICE, PATH_CHEATS_DIR_CHOICE, diff --git a/ps3/shared.h b/ps3/shared.h index 86a5400177..675329478b 100644 --- a/ps3/shared.h +++ b/ps3/shared.h @@ -66,7 +66,7 @@ enum { MENU_ITEM_RESET, MENU_ITEM_RETURN_TO_GAME, MENU_ITEM_RETURN_TO_MENU, - MENU_ITEM_CHANGE_LIBSNES, + MENU_ITEM_CHANGE_LIBRETRO, MENU_ITEM_RETURN_TO_MULTIMAN, MENU_ITEM_RETURN_TO_XMB }; @@ -87,7 +87,7 @@ extern char BORDERS_DIR_PATH[MAX_PATH_LENGTH]; extern char SHADERS_DIR_PATH[MAX_PATH_LENGTH]; extern char DEFAULT_SHADER_FILE[MAX_PATH_LENGTH]; extern char DEFAULT_MENU_SHADER_FILE[MAX_PATH_LENGTH]; -extern char LIBSNES_DIR_PATH[MAX_PATH_LENGTH]; +extern char LIBRETRO_DIR_PATH[MAX_PATH_LENGTH]; extern char SYS_CONFIG_FILE[MAX_PATH_LENGTH]; extern char MULTIMAN_EXECUTABLE[MAX_PATH_LENGTH]; diff --git a/retroarch.c b/retroarch.c index 31906446d2..419fb34f08 100644 --- a/retroarch.c +++ b/retroarch.c @@ -421,11 +421,11 @@ static int16_t input_state(unsigned port, unsigned device, unsigned index, unsig } #ifdef _WIN32 -#define RARCH_DEFAULT_CONF_PATH_STR "\n\t\tDefaults to ssnes.cfg in same directory as ssnes.exe." +#define RARCH_DEFAULT_CONF_PATH_STR "\n\t\tDefaults to retroarch.cfg in same directory as ssnes.exe." #elif defined(__APPLE__) -#define RARCH_DEFAULT_CONF_PATH_STR " Defaults to $HOME/.ssnes.cfg." +#define RARCH_DEFAULT_CONF_PATH_STR " Defaults to $HOME/.retroarch.cfg." #else -#define RARCH_DEFAULT_CONF_PATH_STR " Defaults to $XDG_CONFIG_HOME/ssnes/ssnes.cfg,\n\t\tor $HOME/.ssnes.cfg, if $XDG_CONFIG_HOME is not defined." +#define RARCH_DEFAULT_CONF_PATH_STR " Defaults to $XDG_CONFIG_HOME/ssnes/retroarch.cfg,\n\t\tor $HOME/.retroarch.cfg, if $XDG_CONFIG_HOME is not defined." #endif #include "config.features.h"