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

Qt: AudioProcessor refactoring

This commit is contained in:
Vicki Pfau 2021-04-15 21:00:11 -07:00
parent d1d9e796af
commit 9f099eab0b
3 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,6 +5,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "AudioProcessor.h" #include "AudioProcessor.h"
#include "ConfigController.h"
#ifdef BUILD_SDL #ifdef BUILD_SDL
#include "AudioProcessorSDL.h" #include "AudioProcessorSDL.h"
#endif #endif
@ -51,8 +53,18 @@ AudioProcessor::~AudioProcessor() {
stop(); stop();
} }
void AudioProcessor::configure(ConfigController* config) {
const mCoreOptions* opts = config->options();
setBufferSamples(opts->audioBuffers);
requestSampleRate(opts->sampleRate);
}
void AudioProcessor::setInput(std::shared_ptr<CoreController> input) { void AudioProcessor::setInput(std::shared_ptr<CoreController> input) {
m_context = input; m_context = input;
connect(input.get(), &CoreController::stopping, this, &AudioProcessor::stop);
connect(input.get(), &CoreController::fastForwardChanged, this, &AudioProcessor::inputParametersChanged);
connect(input.get(), &CoreController::paused, this, &AudioProcessor::pause);
connect(input.get(), &CoreController::unpaused, this, &AudioProcessor::start);
} }
void AudioProcessor::stop() { void AudioProcessor::stop() {

8
src/platform/qt/AudioProcessor.h
View File

@ -15,17 +15,15 @@ struct mCoreThread;
namespace QGBA { namespace QGBA {
class ConfigController;
class AudioProcessor : public QObject { class AudioProcessor : public QObject {
Q_OBJECT Q_OBJECT
public: public:
enum class Driver { enum class Driver {
#ifdef BUILD_QT_MULTIMEDIA
QT_MULTIMEDIA = 0, QT_MULTIMEDIA = 0,
#endif
#ifdef BUILD_SDL
SDL = 1, SDL = 1,
#endif
}; };
static AudioProcessor* create(); static AudioProcessor* create();
@ -37,6 +35,8 @@ public:
int getBufferSamples() const { return m_samples; } int getBufferSamples() const { return m_samples; }
virtual unsigned sampleRate() const = 0; virtual unsigned sampleRate() const = 0;
virtual void configure(ConfigController*);
public slots: public slots:
virtual void setInput(std::shared_ptr<CoreController>); virtual void setInput(std::shared_ptr<CoreController>);
virtual void stop(); virtual void stop();

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

@ -247,8 +247,7 @@ void Window::reloadConfig() {
if (m_controller) { if (m_controller) {
m_controller->loadConfig(m_config); m_controller->loadConfig(m_config);
if (m_audioProcessor) { if (m_audioProcessor) {
m_audioProcessor->setBufferSamples(opts->audioBuffers); m_audioProcessor->configure(m_config);
m_audioProcessor->requestSampleRate(opts->sampleRate);
} }
m_display->resizeContext(); m_display->resizeContext();
} }
@ -989,16 +988,10 @@ void Window::reloadAudioDriver() {
m_audioProcessor.reset(); m_audioProcessor.reset();
} }
const mCoreOptions* opts = m_config->options();
m_audioProcessor = std::unique_ptr<AudioProcessor>(AudioProcessor::create()); m_audioProcessor = std::unique_ptr<AudioProcessor>(AudioProcessor::create());
m_audioProcessor->setInput(m_controller); m_audioProcessor->setInput(m_controller);
m_audioProcessor->setBufferSamples(opts->audioBuffers); m_audioProcessor->configure(m_config);
m_audioProcessor->requestSampleRate(opts->sampleRate);
m_audioProcessor->start(); m_audioProcessor->start();
connect(m_controller.get(), &CoreController::stopping, m_audioProcessor.get(), &AudioProcessor::stop);
connect(m_controller.get(), &CoreController::fastForwardChanged, m_audioProcessor.get(), &AudioProcessor::inputParametersChanged);
connect(m_controller.get(), &CoreController::paused, m_audioProcessor.get(), &AudioProcessor::pause);
connect(m_controller.get(), &CoreController::unpaused, m_audioProcessor.get(), &AudioProcessor::start);
} }
void Window::changeRenderer() { void Window::changeRenderer() {