Commit 0eae1c55 authored by Max Kellermann's avatar Max Kellermann

output: moved code to audio_output_update()

Moved code from syncAudioDeviceStates() to audio_output_update().
parent 67831453
......@@ -214,19 +214,13 @@ static void audio_output_wait_all(void)
static void syncAudioDeviceStates(void)
{
struct audio_output *audioOutput;
unsigned int i;
if (!audio_format_defined(&input_audio_format))
return;
for (i = 0; i < audioOutputArraySize; ++i) {
audioOutput = &audioOutputArray[i];
if (audioOutput->enabled)
audio_output_open(audioOutput, &input_audio_format);
else if (audio_output_is_open(audioOutput))
audio_output_close(audioOutput);
}
for (i = 0; i < audioOutputArraySize; ++i)
audio_output_update(&audioOutputArray[i], &input_audio_format);
}
bool playAudio(const char *buffer, size_t length)
......
......@@ -90,6 +90,16 @@ audio_output_open(struct audio_output *audioOutput,
}
void
audio_output_update(struct audio_output *ao,
const struct audio_format *audio_format)
{
if (ao->enabled)
audio_output_open(ao, audio_format);
else if (audio_output_is_open(ao))
audio_output_close(ao);
}
void
audio_output_signal(struct audio_output *ao)
{
notify_signal(&ao->notify);
......
......@@ -36,6 +36,13 @@ audio_output_open(struct audio_output *audioOutput,
const struct audio_format *audioFormat);
/**
* Opens or closes the device, depending on the "enabled" flag.
*/
void
audio_output_update(struct audio_output *ao,
const struct audio_format *audio_format);
/**
* Wakes up the audio output thread. This is part of a workaround for
* a deadlock bug, and should be removed as soon as the real cause is
* fixed. XXX
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment