mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-01-30 12:32:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1898 from fr500/master

Browse Source 
Hide recording stuff on targets that do not have FFMPEG
This commit is contained in:
Twinaphex 2015-07-05 20:56:37 +02:00
commit 4e59fe67d0
4 changed files with 7 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
android/phoenix/src/com/retroarch/browser/preferences/fragments/PathPreferenceFragment.java
View File

@ -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;
}

17
android/phoenix/src/com/retroarch/browser/preferences/util/UserPreferences.java
View File

@ -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");

8
frontend/drivers/platform_android.c
View File

@ -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));

11
menu/menu_setting.c
View File

@ -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,
@ -5739,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),
@ -5771,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,
@ -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))