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

Qt: Support loading fpsTarget and audioBuffers

This commit is contained in:
Jeffrey Pfau 2014-11-02 02:58:47 -08:00
parent 776c64b0c8
commit 6788008418
3 changed files with 31 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -58,10 +58,14 @@ void AudioProcessor::pause() {
} }
void AudioProcessor::setBufferSamples(int samples) { void AudioProcessor::setBufferSamples(int samples) {
QAudioFormat format = m_audioOutput->format(); if (m_audioOutput) {
m_audioOutput->setBufferSize(samples * format.channelCount() * format.sampleSize() / 8); QAudioFormat format = m_audioOutput->format();
m_audioOutput->setBufferSize(samples * format.channelCount() * format.sampleSize() / 8);
}
} }
void AudioProcessor::inputParametersChanged() { void AudioProcessor::inputParametersChanged() {
m_device->setFormat(m_audioOutput->format()); if (m_device) {
m_device->setFormat(m_audioOutput->format());
}
} }

23
src/platform/qt/GameController.cpp
View File

@ -243,17 +243,26 @@ void GameController::keyReleased(int key) {
} }
void GameController::setAudioBufferSamples(int samples) { void GameController::setAudioBufferSamples(int samples) {
GBAThreadInterrupt(&m_threadContext); if (m_gameOpen) {
m_threadContext.audioBuffers = samples; GBAThreadInterrupt(&m_threadContext);
GBAAudioResizeBuffer(&m_threadContext.gba->audio, samples); m_threadContext.audioBuffers = samples;
GBAThreadContinue(&m_threadContext); GBAAudioResizeBuffer(&m_threadContext.gba->audio, samples);
GBAThreadContinue(&m_threadContext);
} else {
m_threadContext.audioBuffers = samples;
}
QMetaObject::invokeMethod(m_audioProcessor, "setBufferSamples", Q_ARG(int, samples)); QMetaObject::invokeMethod(m_audioProcessor, "setBufferSamples", Q_ARG(int, samples));
} }
void GameController::setFPSTarget(float fps) { void GameController::setFPSTarget(float fps) {
GBAThreadInterrupt(&m_threadContext); if (m_gameOpen) {
m_threadContext.fpsTarget = fps; GBAThreadInterrupt(&m_threadContext);
GBAThreadContinue(&m_threadContext); m_threadContext.fpsTarget = fps;
GBAThreadContinue(&m_threadContext);
} else {
m_threadContext.fpsTarget = fps;
}
QMetaObject::invokeMethod(m_audioProcessor, "inputParametersChanged"); QMetaObject::invokeMethod(m_audioProcessor, "inputParametersChanged");
} }

8
src/platform/qt/Window.cpp
View File

@ -118,6 +118,14 @@ void Window::setOptions(GBAOptions* opts) {
if (opts->bios) { if (opts->bios) {
m_controller->loadBIOS(opts->bios); m_controller->loadBIOS(opts->bios);
} }
if (opts->fpsTarget) {
emit fpsTargetChanged(opts->fpsTarget);
}
if (opts->audioBuffers) {
emit audioBufferSamplesChanged(opts->audioBuffers);
}
} }
void Window::selectROM() { void Window::selectROM() {