mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-24 15:02:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1902 from fr500/master

Browse Source 
change it so it can be changed at runtime instead of a compile time o…
This commit is contained in:
Twinaphex 2015-07-06 00:15:46 +02:00
commit 044ef3d3f4
1 changed files with 51 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
menu/menu_setting.c
View File

@ -3221,7 +3221,7 @@ static bool setting_append_list_rewind_options(
return true; return true;
} }
#ifndef HAVE_FFMPEG
static bool setting_append_list_recording_options( static bool setting_append_list_recording_options(
rarch_setting_t **list, rarch_setting_t **list,
rarch_setting_info_t *list_info, const char *parent_group) rarch_setting_info_t *list_info, const char *parent_group)
@ -3325,7 +3325,6 @@ static bool setting_append_list_recording_options(
return true; return true;
} }
#endif
static bool setting_append_list_video_options( static bool setting_append_list_video_options(
rarch_setting_t **list, rarch_setting_t **list,
@ -4924,7 +4923,7 @@ static bool setting_append_list_multimedia_options(
START_SUB_GROUP(list, list_info, "State", group_info.name, subgroup_info, parent_group); START_SUB_GROUP(list, list_info, "State", group_info.name, subgroup_info, parent_group);
#ifdef HAVE_FFMPEG if (strcmp(settings->record.driver, "null") != 0)
CONFIG_BOOL( CONFIG_BOOL(
settings->multimedia.builtin_mediaplayer_enable, settings->multimedia.builtin_mediaplayer_enable,
menu_hash_to_str(MENU_LABEL_USE_BUILTIN_PLAYER), menu_hash_to_str(MENU_LABEL_USE_BUILTIN_PLAYER),
@ -4937,7 +4936,7 @@ static bool setting_append_list_multimedia_options(
parent_group, parent_group,
general_write_handler, general_write_handler,
general_read_handler); general_read_handler);
#endif
#ifdef HAVE_IMAGEVIEWER #ifdef HAVE_IMAGEVIEWER
CONFIG_BOOL( CONFIG_BOOL(
@ -5740,7 +5739,9 @@ static bool setting_append_list_directory_options(
list, list,
list_info, list_info,
SD_FLAG_ALLOW_EMPTY | SD_FLAG_PATH_DIR | SD_FLAG_BROWSER_ACTION); SD_FLAG_ALLOW_EMPTY | SD_FLAG_PATH_DIR | SD_FLAG_BROWSER_ACTION);
#ifdef HAVE_FFMPEG
if (strcmp(settings->record.driver, "null") != 0)
{
CONFIG_DIR( CONFIG_DIR(
global->record.output_dir, global->record.output_dir,
menu_hash_to_str(MENU_LABEL_RECORDING_OUTPUT_DIRECTORY), menu_hash_to_str(MENU_LABEL_RECORDING_OUTPUT_DIRECTORY),
@ -5772,7 +5773,7 @@ static bool setting_append_list_directory_options(
list, list,
list_info, list_info,
SD_FLAG_ALLOW_EMPTY | SD_FLAG_PATH_DIR | SD_FLAG_BROWSER_ACTION); SD_FLAG_ALLOW_EMPTY | SD_FLAG_PATH_DIR | SD_FLAG_BROWSER_ACTION);
#endif }
#ifdef HAVE_OVERLAY #ifdef HAVE_OVERLAY
CONFIG_DIR( CONFIG_DIR(
global->overlay_dir, global->overlay_dir,
@ -6223,7 +6224,7 @@ rarch_setting_t *menu_setting_new(unsigned mask)
if (!setting_append_list_input_hotkey_options(&list, list_info, root)) if (!setting_append_list_input_hotkey_options(&list, list_info, root))
goto error; goto error;
} }
#ifndef HAVE_FFMPEG
if (mask & SL_FLAG_RECORDING_OPTIONS) if (mask & SL_FLAG_RECORDING_OPTIONS)
{ {
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
@ -6234,7 +6235,7 @@ rarch_setting_t *menu_setting_new(unsigned mask)
goto error; goto error;
} }
} }
#endif
if (mask & SL_FLAG_FRAME_THROTTLE_OPTIONS) if (mask & SL_FLAG_FRAME_THROTTLE_OPTIONS)
{ {
if (!setting_append_list_frame_throttling_options(&list, list_info, root)) if (!setting_append_list_frame_throttling_options(&list, list_info, root))