Merge pull request #6024 from ligfx/coreonstatechangedcallback

Qt: use Settings::EmulationStateChanged
This commit is contained in:
Leo Lam
2017-09-15 18:45:17 +02:00
committed by GitHub
31 changed files with 156 additions and 199 deletions

View File

@ -18,6 +18,7 @@
#include "AudioCommon/AudioCommon.h"
#include "Core/ConfigManager.h"
#include "Core/Core.h"
#include "DolphinQt2/Config/SettingsWindow.h"
#include "DolphinQt2/Settings.h"
@ -28,6 +29,8 @@ AudioPane::AudioPane()
ConnectWidgets();
connect(&Settings::Instance(), &Settings::VolumeChanged, this, &AudioPane::OnVolumeChanged);
connect(&Settings::Instance(), &Settings::EmulationStateChanged, this,
[=](Core::State state) { OnEmulationStateChanged(state != Core::State::Uninitialized); });
}
void AudioPane::CreateWidgets()

View File

@ -21,8 +21,6 @@ class AudioPane final : public QWidget
public:
explicit AudioPane();
void OnEmulationStateChanged(bool running);
private:
void CreateWidgets();
void ConnectWidgets();
@ -30,6 +28,7 @@ private:
void LoadSettings();
void SaveSettings();
void OnEmulationStateChanged(bool running);
void OnBackendChanged();
void OnVolumeChanged(int volume);