Permalink
Browse files

Remove screenshots_dir and cgp_dir from default_paths - cgp_dir

is now the same as shaders_dir
  • Loading branch information...
1 parent bcbac5a commit bb0821b514f22f89201a636d240f8d2bf011bcb0 @twinaphex twinaphex committed Apr 6, 2013
View
@@ -27,14 +27,12 @@ typedef struct
{
char menu_border_file[MAXIMUM_PATH];
char border_dir[MAXIMUM_PATH];
- char cgp_dir[MAXIMUM_PATH];
char core_dir[MAXIMUM_PATH];
char config_path[MAXIMUM_PATH];
char libretro_path[MAXIMUM_PATH];
char filebrowser_startup_dir[MAXIMUM_PATH];
char filesystem_root_dir[MAXIMUM_PATH];
char input_presets_dir[MAXIMUM_PATH];
- char screenshots_dir[MAXIMUM_PATH];
char port_dir[MAXIMUM_PATH];
char savestate_dir[MAXIMUM_PATH];
char sram_dir[MAXIMUM_PATH];
View
@@ -1470,7 +1470,7 @@ static bool osk_callback_enter_filename(void *data)
case CONFIG_FILE:
break;
case SHADER_PRESET_FILE:
- snprintf(filepath, sizeof(filepath), "%s/%s.cgp", default_paths.cgp_dir, tmp_str);
+ snprintf(filepath, sizeof(filepath), "%s/%s.cgp", g_settings.video.shader_dir, tmp_str);
RARCH_LOG("[osk_callback_enter_filename]: filepath is: %s.\n", filepath);
/* TODO - stub */
break;
@@ -1573,7 +1573,7 @@ static int set_setting_action(uint8_t menu_type, unsigned switchvalue, uint64_t
if (g_extern.main_is_init)
{
menu_stack_push(PRESET_CHOICE);
- filebrowser_set_root_and_ext(filebrowser, EXT_CGP_PRESETS, default_paths.cgp_dir);
+ filebrowser_set_root_and_ext(filebrowser, EXT_CGP_PRESETS, g_settings.video.shader_dir);
}
}
if (input & (1ULL << RMENU_DEVICE_NAV_START))
@@ -291,8 +291,7 @@ static void get_environment_settings(int argc, char *argv[])
/* now we fill in all the variables */
snprintf(default_paths.menu_border_file, sizeof(default_paths.menu_border_file), "%s/borders/Menu/main-menu_1080p.png", default_paths.core_dir);
- snprintf(default_paths.cgp_dir, sizeof(default_paths.cgp_dir), "%s/presets", default_paths.core_dir);
- snprintf(default_paths.input_presets_dir, sizeof(default_paths.input_presets_dir), "%s/input", default_paths.cgp_dir);
+ snprintf(default_paths.input_presets_dir, sizeof(default_paths.input_presets_dir), "%s/presets", default_paths.core_dir);
snprintf(default_paths.border_dir, sizeof(default_paths.border_dir), "%s/borders", default_paths.core_dir);
#if defined(HAVE_CG) || defined(HAVE_GLSL)
snprintf(g_settings.video.shader_dir, sizeof(g_settings.video.shader_dir), "%s/shaders", default_paths.core_dir);
@@ -64,8 +64,7 @@ static void get_environment_settings(int argc, char *argv[])
/* now we fill in all the variables */
snprintf(default_paths.menu_border_file, sizeof(default_paths.menu_border_file), "%s/borders/Menu/main-menu.png", default_paths.core_dir);
- snprintf(default_paths.cgp_dir, sizeof(default_paths.cgp_dir), "%s/presets", default_paths.core_dir);
- snprintf(default_paths.input_presets_dir, sizeof(default_paths.input_presets_dir), "%s/input", default_paths.cgp_dir);
+ snprintf(default_paths.input_presets_dir, sizeof(default_paths.input_presets_dir), "%s/presets", default_paths.core_dir);
snprintf(default_paths.border_dir, sizeof(default_paths.border_dir), "%s/borders", default_paths.core_dir);
snprintf(g_extern.config_path, sizeof(g_extern.config_path), "%s/retroarch.cfg", default_paths.port_dir);
}
@@ -304,11 +304,11 @@ static void get_environment_settings(int argc, char *argv[])
strlcpy(default_paths.system_dir, "D:\\system", sizeof(default_paths.system_dir));
strlcpy(default_paths.filesystem_root_dir, "D:", sizeof(default_paths.filesystem_root_dir));
strlcpy(default_paths.filebrowser_startup_dir, "D:", sizeof(default_paths.filebrowser_startup_dir));
- strlcpy(default_paths.screenshots_dir, "D:\\screenshots", sizeof(default_paths.screenshots_dir));
+ strlcpy(g_settings.screenshot_directory, "D:\\screenshots", sizeof(g_settings.screenshot_directory));
#elif defined(_XBOX360)
strlcpy(default_paths.core_dir, "game:", sizeof(default_paths.core_dir));
strlcpy(default_paths.filesystem_root_dir, "game:\\", sizeof(default_paths.filesystem_root_dir));
- strlcpy(default_paths.screenshots_dir, "game:", sizeof(default_paths.screenshots_dir));
+ strlcpy(g_settings.screenshot_directory, "game:", sizeof(g_settings.screenshot_directory));
#ifdef IS_SALAMANDER
strlcpy(default_paths.config_path, "game:\\retroarch.cfg", sizeof(default_paths.config_path));
#else
View
@@ -34,7 +34,7 @@ bool screenshot_dump(const char *folder, const void *frame,
char shotname[PATH_MAX];
fill_dated_filename(shotname, "bmp", sizeof(shotname));
- snprintf(filename, sizeof(filename), "%s\\%s", default_paths.screenshots_dir, shotname);
+ snprintf(filename, sizeof(filename), "%s\\%s", g_settings.screenshot_directory, shotname);
D3DSurface *surf = NULL;
d3d->d3d_render_device->GetBackBuffer(-1, D3DBACKBUFFER_TYPE_MONO, &surf);

0 comments on commit bb0821b

Please sign in to comment.