Mirrored_Repos/LookingGlass
1
0
Fork 0
mirror of https://github.com/gnif/LookingGlass.git synced 2024-11-10 08:38:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[client] audio: prompt before allowing audio

Browse Source 
If the user clicks no, the guest only receives silence.
This commit is contained in:
Quantum 2022-03-18 01:57:02 -04:00 committed by Geoffrey McRae
parent dd6d9c44df
commit 9afe170413
1 changed files with 57 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
client/src/audio.c
View File

@ -738,6 +738,45 @@ static void recordPushFrames(uint8_t * data, int frames)
purespice_writeAudio(data, frames * audio.record.stride, 0); purespice_writeAudio(data, frames * audio.record.stride, 0);
} }
static void realRecordStart(int channels, int sampleRate, PSAudioFormat format)
{
audio.record.started = true;
audio.record.stride = channels * sizeof(uint16_t);
audio.audioDev->record.start(channels, sampleRate, recordPushFrames);
// if a volume level was stored, set it before we return
if (audio.record.volumeChannels)
audio.audioDev->record.volume(
audio.playback.volumeChannels,
audio.playback.volume);
// set the inital mute state
if (audio.audioDev->record.mute)
audio.audioDev->record.mute(audio.playback.mute);
}
struct AudioFormat
{
int channels;
int sampleRate;
PSAudioFormat format;
};
static void recordConfirm(bool yes, void * opaque)
{
if (yes)
{
struct AudioFormat * format = opaque;
DEBUG_INFO("Microphone access granted");
realRecordStart(format->channels, format->sampleRate, format->format);
}
else
DEBUG_INFO("Microphone access denied");
free(opaque);
}
void audio_recordStart(int channels, int sampleRate, PSAudioFormat format) void audio_recordStart(int channels, int sampleRate, PSAudioFormat format)
{ {
if (!audio.audioDev) if (!audio.audioDev)
@ -756,20 +795,26 @@ void audio_recordStart(int channels, int sampleRate, PSAudioFormat format)
lastChannels = channels; lastChannels = channels;
lastSampleRate = sampleRate; lastSampleRate = sampleRate;
audio.record.started = true;
audio.record.stride = channels * sizeof(uint16_t);
audio.audioDev->record.start(channels, sampleRate, recordPushFrames); if (g_params.micAlwaysAllow)
{
DEBUG_INFO("Microphone access granted by default");
realRecordStart(channels, sampleRate, format);
}
else
{
struct AudioFormat * fmt = malloc(sizeof(*fmt));
if (!format)
DEBUG_FATAL("Failed to allocate memory!");
// if a volume level was stored, set it before we return fmt->channels = channels;
if (audio.record.volumeChannels) fmt->sampleRate = sampleRate;
audio.audioDev->record.volume( fmt->format = format;
audio.playback.volumeChannels,
audio.playback.volume);
// set the inital mute state app_confirmMsgBox("Microphone", recordConfirm, fmt,
if (audio.audioDev->record.mute) "An application just opened the microphone!\n"
audio.audioDev->record.mute(audio.playback.mute); "Do you want it to access your microphone?");
}
} }
void audio_recordStop(void) void audio_recordStop(void)
@ -777,6 +822,7 @@ void audio_recordStop(void)
if (!audio.audioDev || !audio.record.started) if (!audio.audioDev || !audio.record.started)
return; return;
DEBUG_INFO("Microphone recording stopped");
audio.audioDev->record.stop(); audio.audioDev->record.stop();
audio.record.started = false; audio.record.started = false;
} }