From 4e0b93f445db5a0105d8a61fe4ee292347ec058d Mon Sep 17 00:00:00 2001 From: radius Date: Sun, 5 Jul 2015 00:05:01 -0500 Subject: [PATCH 1/3] hide recording settings if ffmpeg support is not compiled in --- menu/menu_setting.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/menu/menu_setting.c b/menu/menu_setting.c index d6e6ab3b34..9d55783482 100644 --- a/menu/menu_setting.c +++ b/menu/menu_setting.c @@ -3221,7 +3221,7 @@ static bool setting_append_list_rewind_options( return true; } - +#ifndef HAVE_FFMPEG static bool setting_append_list_recording_options( rarch_setting_t **list, rarch_setting_info_t *list_info, const char *parent_group) @@ -3325,6 +3325,7 @@ static bool setting_append_list_recording_options( return true; } +#endif static bool setting_append_list_video_options( rarch_setting_t **list, @@ -6222,7 +6223,7 @@ rarch_setting_t *menu_setting_new(unsigned mask) if (!setting_append_list_input_hotkey_options(&list, list_info, root)) goto error; } - +#ifndef HAVE_FFMPEG if (mask & SL_FLAG_RECORDING_OPTIONS) { settings_t *settings = config_get_ptr(); @@ -6233,7 +6234,7 @@ rarch_setting_t *menu_setting_new(unsigned mask) goto error; } } - +#endif if (mask & SL_FLAG_FRAME_THROTTLE_OPTIONS) { if (!setting_append_list_frame_throttling_options(&list, list_info, root)) From 671c49d9704497e071a483f254a362a628997a4f Mon Sep 17 00:00:00 2001 From: radius Date: Sun, 5 Jul 2015 00:08:09 -0500 Subject: [PATCH 2/3] hide ffmpeg directory settings if ffmpeg support is not compiled in --- menu/menu_setting.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/menu/menu_setting.c b/menu/menu_setting.c index 9d55783482..122a5edb6d 100644 --- a/menu/menu_setting.c +++ b/menu/menu_setting.c @@ -5740,7 +5740,7 @@ static bool setting_append_list_directory_options( list, list_info, SD_FLAG_ALLOW_EMPTY | SD_FLAG_PATH_DIR | SD_FLAG_BROWSER_ACTION); - +#ifdef HAVE_FFMPEG CONFIG_DIR( global->record.output_dir, menu_hash_to_str(MENU_LABEL_RECORDING_OUTPUT_DIRECTORY), @@ -5772,7 +5772,7 @@ static bool setting_append_list_directory_options( list, list_info, SD_FLAG_ALLOW_EMPTY | SD_FLAG_PATH_DIR | SD_FLAG_BROWSER_ACTION); - +#endif #ifdef HAVE_OVERLAY CONFIG_DIR( global->overlay_dir, From 827f32b2d11022d8609f2db55ab6923fac5533d8 Mon Sep 17 00:00:00 2001 From: radius Date: Sun, 5 Jul 2015 14:54:15 -0400 Subject: [PATCH 3/3] make saving to possible again --- .../fragments/PathPreferenceFragment.java | 24 ------------------- .../preferences/util/UserPreferences.java | 17 ------------- frontend/drivers/platform_android.c | 8 +------ 3 files changed, 1 insertion(+), 48 deletions(-) diff --git a/android/phoenix/src/com/retroarch/browser/preferences/fragments/PathPreferenceFragment.java b/android/phoenix/src/com/retroarch/browser/preferences/fragments/PathPreferenceFragment.java index 174935e4a1..f3092c9bad 100644 --- a/android/phoenix/src/com/retroarch/browser/preferences/fragments/PathPreferenceFragment.java +++ b/android/phoenix/src/com/retroarch/browser/preferences/fragments/PathPreferenceFragment.java @@ -41,30 +41,6 @@ public final class PathPreferenceFragment extends PreferenceListFragment impleme romDirBrowser.setIsDirectoryTarget(true); romDirBrowser.show(getFragmentManager(), "romDirBrowser"); } - // Custom savefile directory - else if (prefKey.equals("srmDirPref")) - { - final DirectoryFragment srmDirBrowser = DirectoryFragment.newInstance(R.string.savefile_directory_select); - srmDirBrowser.setPathSettingKey("savefile_directory"); - srmDirBrowser.setIsDirectoryTarget(true); - srmDirBrowser.show(getFragmentManager(), "srmDirBrowser"); - } - // Custom save state directory - else if (prefKey.equals("saveStateDirPref")) - { - final DirectoryFragment saveStateDirBrowser = DirectoryFragment.newInstance(R.string.save_state_directory_select); - saveStateDirBrowser.setPathSettingKey("savestate_directory"); - saveStateDirBrowser.setIsDirectoryTarget(true); - saveStateDirBrowser.show(getFragmentManager(), "saveStateDirBrowser"); - } - // Custom system directory - else if (prefKey.equals("systemDirPref")) - { - final DirectoryFragment systemDirBrowser = DirectoryFragment.newInstance(R.string.system_directory_select); - systemDirBrowser.setPathSettingKey("system_directory"); - systemDirBrowser.setIsDirectoryTarget(true); - systemDirBrowser.show(getFragmentManager(), "systemDirBrowser"); - } return true; } diff --git a/android/phoenix/src/com/retroarch/browser/preferences/util/UserPreferences.java b/android/phoenix/src/com/retroarch/browser/preferences/util/UserPreferences.java index d354f0a359..556ab10861 100644 --- a/android/phoenix/src/com/retroarch/browser/preferences/util/UserPreferences.java +++ b/android/phoenix/src/com/retroarch/browser/preferences/util/UserPreferences.java @@ -157,10 +157,6 @@ public final class UserPreferences // Path settings readbackString(config, edit, "rgui_browser_directory"); - readbackString(config, edit, "savefile_directory"); - readbackString(config, edit, "savestate_directory"); - readbackBool(config, edit, "savefile_directory_enable"); // Ignored by RetroArch - readbackBool(config, edit, "savestate_directory_enable"); // Ignored by RetroArch edit.apply(); } @@ -239,19 +235,6 @@ public final class UserPreferences config.setBoolean("input_overlay_enable", prefs.getBoolean("input_overlay_enable", true)); config.setString("input_overlay", prefs.getString("input_overlay", "")); - if (prefs.getBoolean("savefile_directory_enable", false)) - { - config.setString("savefile_directory", prefs.getString("savefile_directory", "")); - } - if (prefs.getBoolean("savestate_directory_enable", false)) - { - config.setString("savestate_directory", prefs.getString("savestate_directory", "")); - } - if (prefs.getBoolean("system_directory_enable", false)) - { - config.setString("system_directory", prefs.getString("system_directory", "")); - } - config.setBoolean("video_font_enable", prefs.getBoolean("video_font_enable", true)); config.setString("content_history_path", dataDir + "/content_history.rpl"); diff --git a/frontend/drivers/platform_android.c b/frontend/drivers/platform_android.c index df23fcb86e..d93b8bf891 100644 --- a/frontend/drivers/platform_android.c +++ b/frontend/drivers/platform_android.c @@ -591,14 +591,8 @@ static void frontend_android_get_environment_settings(int *argc, { fill_pathname_join(g_defaults.assets_dir, path, "assets", sizeof(g_defaults.savestate_dir)); - fill_pathname_join(g_defaults.savestate_dir, path, - "savestates", sizeof(g_defaults.savestate_dir)); fill_pathname_join(g_defaults.extraction_dir, path, "tmp", sizeof(g_defaults.extraction_dir)); - fill_pathname_join(g_defaults.sram_dir, path, - "savefiles", sizeof(g_defaults.sram_dir)); - fill_pathname_join(g_defaults.system_dir, path, - "system", sizeof(g_defaults.system_dir)); fill_pathname_join(g_defaults.shader_dir, path, "shaders_glsl", sizeof(g_defaults.shader_dir)); fill_pathname_join(g_defaults.overlay_dir, path, @@ -613,7 +607,7 @@ static void frontend_android_get_environment_settings(int *argc, path, "audio_filters", sizeof(g_defaults.audio_filter_dir)); fill_pathname_join(g_defaults.video_filter_dir, path, "video_filters", sizeof(g_defaults.video_filter_dir)); - strlcpy(g_defaults.content_history_dir, + strlcpy(g_defaults.content_history_dir, path, sizeof(g_defaults.content_history_dir)); fill_pathname_join(g_defaults.database_dir, path, "database/rdb", sizeof(g_defaults.database_dir));