beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-11-22 15:40:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Ladybird: Detect changes to the default audio device

Browse source 
When the default audio device changes on the host, it's convenient to
automatically switch to that device rather than needing to reload the
page to update.
This commit is contained in:
Timothy Flynn 2023-06-21 10:16:42 -04:00 committed by Andreas Kling
parent 8f927eaa68
commit 33dbfa3281
Notes: sideshowbarker 2024-07-17 22:09:47 +09:00 
Author: https://github.com/trflynn89
Commit: https://github.com/SerenityOS/serenity/commit/33dbfa3281
Pull-request: https://github.com/SerenityOS/serenity/pull/19536
1 changed files with 55 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
Ladybird/AudioCodecPluginLadybird.cpp
View file

@ -27,6 +27,7 @@ struct AudioTask {
Pause, Pause,
Seek, Seek,
Volume, Volume,
RecreateAudioDevice,
}; };
Type type; Type type;
@ -82,20 +83,64 @@ private:
No, No,
}; };
struct AudioDevice {
static AudioDevice create()
{
auto const& device_info = QMediaDevices::defaultAudioOutput();
auto format = device_info.preferredFormat();
format.setChannelCount(2);
auto audio_output = make<QAudioSink>(device_info, format);
return AudioDevice { move(audio_output) };
}
AudioDevice(AudioDevice&&) = default;
AudioDevice& operator=(AudioDevice&& device)
{
if (audio_output) {
audio_output->stop();
io_device = nullptr;
}
swap(audio_output, device.audio_output);
swap(io_device, device.io_device);
return *this;
}
~AudioDevice()
{
if (audio_output)
audio_output->stop();
}
OwnPtr<QAudioSink> audio_output;
QIODevice* io_device { nullptr };
private:
explicit AudioDevice(NonnullOwnPtr<QAudioSink> output)
: audio_output(move(output))
{
io_device = audio_output->start();
}
};
void run() override void run() override
{ {
auto devices = make<QMediaDevices>(); auto devices = make<QMediaDevices>();
auto const& device_info = devices->defaultAudioOutput(); auto audio_device = AudioDevice::create();
auto format = device_info.preferredFormat(); connect(devices, &QMediaDevices::audioOutputsChanged, this, [this]() {
format.setChannelCount(2); queue_task({ AudioTask::Type::RecreateAudioDevice }).release_value_but_fixme_should_propagate_errors();
});
auto audio_output = make<QAudioSink>(device_info, format);
auto* io_device = audio_output->start();
auto paused = Paused::Yes; auto paused = Paused::Yes;
while (true) { while (true) {
auto& audio_output = audio_device.audio_output;
auto* io_device = audio_device.io_device;
if (auto result = m_task_queue.dequeue(); result.is_error()) { if (auto result = m_task_queue.dequeue(); result.is_error()) {
VERIFY(result.error() == AudioTaskQueue::QueueStatus::Empty); VERIFY(result.error() == AudioTaskQueue::QueueStatus::Empty);
} else { } else {
@ -136,6 +181,10 @@ private:
VERIFY(task.data.has_value()); VERIFY(task.data.has_value());
audio_output->setVolume(*task.data); audio_output->setVolume(*task.data);
break; break;
case AudioTask::Type::RecreateAudioDevice:
audio_device = AudioDevice::create();
continue;
} }
} }