mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-29 22:20:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

iOS: Add option to disable respecting silent mode (#14928) (#15952)

Browse Source
This commit is contained in:
Eric Warmenhoven 2023-11-26 07:59:14 -05:00 committed by GitHub
parent f7b0e3e1c7
commit 2b820bdf10
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 59 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
config.def.h
View File

@ -1150,6 +1150,11 @@
#define DEFAULT_WASAPI_SH_BUFFER_LENGTH 0
#endif
#if TARGET_OS_IOS
/* Respect silent mode (false will render audio in silent mode) */
#define DEFAULT_AUDIO_RESPECT_SILENT_MODE true
#endif
/* Automatically mute audio when fast forward
* is enabled */
#define DEFAULT_AUDIO_FASTFORWARD_MUTE false

3
configuration.c
View File

@ -1772,6 +1772,9 @@ static struct config_bool_setting *populate_settings_bool(
SETTING_BOOL("audio_mute_enable", audio_get_bool_ptr(AUDIO_ACTION_MUTE_ENABLE), true, false, false);
#ifdef HAVE_AUDIOMIXER
SETTING_BOOL("audio_mixer_mute_enable", audio_get_bool_ptr(AUDIO_ACTION_MIXER_MUTE_ENABLE), true, false, false);
#endif
#if TARGET_OS_IOS
SETTING_BOOL("audio_respect_silent_mode", &settings->bools.audio_respect_silent_mode, true, DEFAULT_AUDIO_RESPECT_SILENT_MODE, false);
#endif
SETTING_BOOL("audio_fastforward_mute", &settings->bools.audio_fastforward_mute, true, DEFAULT_AUDIO_FASTFORWARD_MUTE, false);
SETTING_BOOL("audio_fastforward_speedup", &settings->bools.audio_fastforward_speedup, true, DEFAULT_AUDIO_FASTFORWARD_SPEEDUP, false);

3
configuration.h
View File

@ -630,6 +630,9 @@ typedef struct settings
bool audio_rate_control;
bool audio_fastforward_mute;
bool audio_fastforward_speedup;
#ifdef TARGET_OS_IOS
bool audio_respect_silent_mode;
#endif
#ifdef HAVE_WASAPI
bool audio_wasapi_exclusive_mode;

4
intl/msg_hash_lbl.h
View File

@ -275,6 +275,10 @@ MSG_HASH(
MENU_ENUM_LABEL_AUDIO_MUTE,
"audio_mute_enable"
)
MSG_HASH(
MENU_ENUM_LABEL_AUDIO_RESPECT_SILENT_MODE,
"audio_respect_silent_mode"
)
MSG_HASH(
MENU_ENUM_LABEL_AUDIO_FASTFORWARD_MUTE,
"audio_fastforward_mute"

8
intl/msg_hash_us.h
View File

@ -2633,6 +2633,14 @@ MSG_HASH(
MENU_ENUM_SUBLABEL_AUDIO_MIXER_MUTE,
"Mute mixer audio."
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_AUDIO_RESPECT_SILENT_MODE,
"Respect Silent Mode"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_AUDIO_RESPECT_SILENT_MODE,
"Mute all audio in Silent Mode."
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_AUDIO_FASTFORWARD_MUTE,
"Mute When Fast-Forwarding"

8
menu/cbs/menu_cbs_sublabel.c
View File

@ -516,6 +516,9 @@ DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_audio_mute, MENU_
#ifdef HAVE_AUDIOMIXER
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_audio_mixer_mute, MENU_ENUM_SUBLABEL_AUDIO_MIXER_MUTE)
#endif
#if TARGET_OS_IOS
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_audio_respect_silent_mode, MENU_ENUM_SUBLABEL_AUDIO_RESPECT_SILENT_MODE)
#endif
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_audio_fastforward_mute, MENU_ENUM_SUBLABEL_AUDIO_FASTFORWARD_MUTE)
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_audio_fastforward_speedup, MENU_ENUM_SUBLABEL_AUDIO_FASTFORWARD_SPEEDUP)
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_camera_allow, MENU_ENUM_SUBLABEL_CAMERA_ALLOW)
@ -4512,6 +4515,11 @@ int menu_cbs_init_bind_sublabel(menu_file_list_cbs_t *cbs,
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_audio_mixer_mute);
#endif
break;
#if TARGET_OS_IOS
case MENU_ENUM_LABEL_AUDIO_RESPECT_SILENT_MODE:
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_audio_respect_silent_mode);
break;
#endif
case MENU_ENUM_LABEL_AUDIO_FASTFORWARD_MUTE:
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_audio_fastforward_mute);
break;

1
menu/menu_displaylist.c
View File

@ -7292,6 +7292,7 @@ unsigned menu_displaylist_build_list(
{MENU_ENUM_LABEL_MENU_SOUNDS, PARSE_ACTION, true },
{MENU_ENUM_LABEL_AUDIO_MUTE, PARSE_ONLY_BOOL, true },
{MENU_ENUM_LABEL_AUDIO_MIXER_MUTE, PARSE_ONLY_BOOL, true },
{MENU_ENUM_LABEL_AUDIO_RESPECT_SILENT_MODE, PARSE_ONLY_BOOL, true },
{MENU_ENUM_LABEL_AUDIO_FASTFORWARD_MUTE, PARSE_ONLY_BOOL, true },
{MENU_ENUM_LABEL_AUDIO_FASTFORWARD_SPEEDUP, PARSE_ONLY_BOOL, true },
{MENU_ENUM_LABEL_AUDIO_VOLUME, PARSE_ONLY_FLOAT, false },

20
menu/menu_setting.c
View File

@ -13774,6 +13774,26 @@ static bool setting_append_list(
SD_FLAG_LAKKA_ADVANCED
);
#endif
#if TARGET_OS_IOS
CONFIG_BOOL(
list, list_info,
&settings->bools.audio_respect_silent_mode,
MENU_ENUM_LABEL_AUDIO_RESPECT_SILENT_MODE,
MENU_ENUM_LABEL_VALUE_AUDIO_RESPECT_SILENT_MODE,
DEFAULT_AUDIO_RESPECT_SILENT_MODE,
MENU_ENUM_LABEL_VALUE_OFF,
MENU_ENUM_LABEL_VALUE_ON,
&group_info,
&subgroup_info,
parent_group,
general_write_handler,
general_read_handler,
SD_FLAG_NONE
);
#endif
CONFIG_BOOL(
list, list_info,
&settings->bools.audio_fastforward_mute,

1
msg_hash.h
View File

@ -2132,6 +2132,7 @@ enum msg_hash_enums
MENU_LABEL(AUDIO_DSP_PLUGIN_REMOVE),
MENU_LABEL(AUDIO_MUTE),
MENU_LABEL(AUDIO_MIXER_MUTE),
MENU_LABEL(AUDIO_RESPECT_SILENT_MODE),
MENU_LABEL(AUDIO_FASTFORWARD_MUTE),
MENU_LABEL(AUDIO_FASTFORWARD_SPEEDUP),
MENU_LABEL(AUDIO_SYNC),

8
ui/drivers/ui_cocoatouch.m
View File

@ -459,7 +459,6 @@ enum
- (void)applicationDidFinishLaunching:(UIApplication *)application
{
NSError *error;
char arguments[] = "retroarch";
char *argv[] = {arguments, NULL};
int argc = 1;
@ -471,7 +470,6 @@ enum
self.window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
[self.window makeKeyAndVisible];
[[AVAudioSession sharedInstance] setCategory:AVAudioSessionCategoryAmbient error:&error];
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(handleAudioSessionInterruption:) name:AVAudioSessionInterruptionNotification object:[AVAudioSession sharedInstance]];
[self refreshSystemConfig];
@ -507,9 +505,15 @@ enum
- (void)applicationDidBecomeActive:(UIApplication *)application
{
rarch_start_draw_observer();
NSError *error;
settings_t *settings = config_get_ptr();
bool ui_companion_start_on_boot = settings->bools.ui_companion_start_on_boot;
if (settings->bools.audio_respect_silent_mode)
[[AVAudioSession sharedInstance] setCategory:AVAudioSessionCategoryAmbient error:&error];
else
[[AVAudioSession sharedInstance] setCategory:AVAudioSessionCategoryPlayback error:&error];
if (!ui_companion_start_on_boot)
[self showGameView];
}