Xargon/Duckstation
1
0
Fork 0
mirror of https://github.com/RetroDECK/Duckstation.git synced 2024-09-17 08:02:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Frontends: Add cubeb as audio backend option

Browse source
This commit is contained in:
Connor McLaughlin 2020-01-11 13:49:52 +10:00
parent 9586970a9f
commit 8f6ac437ab
3 changed files with 24 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/core/types.h
View file

@ -53,6 +53,7 @@ enum class AudioBackend : u8
{
Null,
Default,
Cubeb,
Count
};

23
src/duckstation-qt/qthostinterface.cpp
View file

@ -27,7 +27,6 @@ QtHostInterface::QtHostInterface(QObject* parent)
checkSettings();
createGameList();
doUpdateInputMap();
createAudioStream();
createThread();
}
@ -445,9 +444,20 @@ void QtHostInterface::doBootSystem(QString initial_filename, QString initial_sav
void QtHostInterface::createAudioStream()
{
// Qt at least on Windows seems to want a buffer size of at least 8KB.
// m_audio_stream = QtAudioStream::Create();
// if (!m_audio_stream->Reconfigure(AUDIO_SAMPLE_RATE, AUDIO_CHANNELS, AUDIO_BUFFER_SIZE, 4))
switch (m_settings.audio_backend)
{
case AudioBackend::Default:
case AudioBackend::Cubeb:
m_audio_stream = AudioStream::CreateCubebAudioStream();
break;
case AudioBackend::Null:
default:
m_audio_stream = AudioStream::CreateNullAudioStream();
break;
}
if (!m_audio_stream->Reconfigure(AUDIO_SAMPLE_RATE, AUDIO_CHANNELS, AUDIO_BUFFER_SIZE, 4))
{
qWarning() << "Failed to configure audio stream, falling back to null output";
@ -482,6 +492,10 @@ void QtHostInterface::doStopThread()
void QtHostInterface::threadEntryPoint()
{
m_worker_thread_event_loop = new QEventLoop();
createAudioStream();
// TODO: Event which flags the thread as ready
while (!m_shutdown_flag.load())
{
if (!m_system || m_paused)
@ -524,6 +538,7 @@ void QtHostInterface::threadEntryPoint()
}
m_system.reset();
m_audio_stream.reset();
delete m_worker_thread_event_loop;
m_worker_thread_event_loop = nullptr;

4
src/duckstation/sdl_host_interface.cpp
View file

@ -128,6 +128,10 @@ void SDLHostInterface::CreateAudioStream()
m_audio_stream = AudioStream::CreateNullAudioStream();
break;
case AudioBackend::Cubeb:
m_audio_stream = AudioStream::CreateCubebAudioStream();
break;
case AudioBackend::Default:
default:
m_audio_stream = std::make_unique<SDLAudioStream>();