ShuriZma
/
mgba
mirror of https://github.com/mgba-emu/mgba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Qt: Change audio driver back to SDL by default

This commit is contained in:
Jeffrey Pfau 2015-03-23 21:34:20 -07:00
parent 1c422d4057
commit 740f733563
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/platform/qt/AudioProcessor.cpp
View File

@ -19,7 +19,7 @@ extern "C" {
using namespace QGBA;
#ifdef BUILD_QT_MULTIMEDIA
#ifndef BUILD_SDL
AudioProcessor::Driver AudioProcessor::s_driver = AudioProcessor::Driver::QT_MULTIMEDIA;
#else
AudioProcessor::Driver AudioProcessor::s_driver = AudioProcessor::Driver::SDL;

6
src/platform/qt/SettingsView.cpp
View File

@ -42,17 +42,17 @@ SettingsView::SettingsView(ConfigController* controller, QWidget* parent)
m_ui.idleOptimization->setCurrentIndex(2);
}
int audioDriver = m_controller->getQtOption("audioDriver").toInt();
QVariant audioDriver = m_controller->getQtOption("audioDriver");
#ifdef BUILD_QT_MULTIMEDIA
m_ui.audioDriver->addItem(tr("Qt Multimedia"), static_cast<int>(AudioProcessor::Driver::QT_MULTIMEDIA));
if (audioDriver == static_cast<int>(AudioProcessor::Driver::QT_MULTIMEDIA)) {
if (!audioDriver.isNull() && audioDriver.toInt() == static_cast<int>(AudioProcessor::Driver::QT_MULTIMEDIA)) {
m_ui.audioDriver->setCurrentIndex(m_ui.audioDriver->count() - 1);
}
#endif
#ifdef BUILD_SDL
m_ui.audioDriver->addItem(tr("SDL"), static_cast<int>(AudioProcessor::Driver::SDL));
if (audioDriver == static_cast<int>(AudioProcessor::Driver::SDL)) {
if (audioDriver.isNull() || audioDriver.toInt() == static_cast<int>(AudioProcessor::Driver::SDL)) {
m_ui.audioDriver->setCurrentIndex(m_ui.audioDriver->count() - 1);
}
#endif