maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #24324 from volzhs/access-mic

Browse source 
Request mic access only when is needed
This commit is contained in:
Rémi Verschelde 2018-12-14 08:57:22 +01:00 committed by GitHub
parent 7e4e9e95e4 7d387dc63f
commit 4148eed943
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
doc/classes/ProjectSettings.xml
View file

@ -210,6 +210,9 @@
</member>
<member name="audio/driver" type="String" setter="" getter="">
</member>
<member name="audio/enable_audio_input" type="bool" setter="" getter="">
This option should be enabled if project works with microphone.
</member>
<member name="audio/mix_rate" type="int" setter="" getter="">
Mix rate used for audio. In general, it's better to not touch this and leave it to the host operating system.
</member>

5
drivers/coreaudio/audio_driver_coreaudio.cpp
View file

@ -159,7 +159,10 @@ Error AudioDriverCoreAudio::init() {
result = AudioUnitInitialize(audio_unit);
ERR_FAIL_COND_V(result != noErr, FAILED);
return capture_init();
if (GLOBAL_GET("audio/enable_audio_input")) {
return capture_init();
}
return OK;
}
OSStatus AudioDriverCoreAudio::output_callback(void *inRefCon,

7
servers/audio/audio_stream.cpp
View file

@ -30,6 +30,7 @@
#include "audio_stream.h"
#include "core/os/os.h"
#include "core/project_settings.h"
//////////////////////////////
@ -184,6 +185,12 @@ float AudioStreamPlaybackMicrophone::get_stream_sampling_rate() {
}
void AudioStreamPlaybackMicrophone::start(float p_from_pos) {
if (!GLOBAL_GET("audio/enable_audio_input")) {
WARN_PRINTS("Need to enable Project settings > Audio > Enable Audio Input option to use capturing.");
return;
}
input_ofs = 0;
AudioDriver::get_singleton()->capture_start();

1
servers/audio_server.cpp
View file

@ -172,6 +172,7 @@ int AudioDriverManager::get_driver_count() {
}
void AudioDriverManager::initialize(int p_driver) {
GLOBAL_DEF_RST("audio/enable_audio_input", false);
int failed_driver = -1;
// Check if there is a selected driver