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

Core: Put back mute

This commit is contained in:
Jeffrey Pfau 2016-02-21 08:50:21 -08:00
parent cf27d88696
commit dedcaeb51d
5 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/gb/core.c
View File

@ -70,7 +70,11 @@ static void _GBCoreLoadConfig(struct mCore* core, const struct mCoreConfig* conf
UNUSED(config); UNUSED(config);
struct GB* gb = core->board; struct GB* gb = core->board;
gb->audio.masterVolume = core->opts.volume; if (core->opts.mute) {
gb->audio.masterVolume = 0;
} else {
gb->audio.masterVolume = core->opts.volume;
}
gb->video.frameskip = core->opts.frameskip; gb->video.frameskip = core->opts.frameskip;
} }

6
src/gba/core.c
View File

@ -77,7 +77,11 @@ static void _GBACoreSetSync(struct mCore* core, struct mCoreSync* sync) {
static void _GBACoreLoadConfig(struct mCore* core, const struct mCoreConfig* config) { static void _GBACoreLoadConfig(struct mCore* core, const struct mCoreConfig* config) {
struct GBA* gba = core->board; struct GBA* gba = core->board;
gba->audio.masterVolume = core->opts.volume; if (core->opts.mute) {
gba->audio.masterVolume = 0;
} else {
gba->audio.masterVolume = core->opts.volume;
}
gba->video.frameskip = core->opts.frameskip; gba->video.frameskip = core->opts.frameskip;
#if !defined(MINIMAL_CORE) || MINIMAL_CORE < 2 #if !defined(MINIMAL_CORE) || MINIMAL_CORE < 2

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

@ -848,12 +848,6 @@ void GameController::saveBackupState() {
}); });
} }
void GameController::setMute(bool mute) {
threadInterrupt();
// TODO: Put back mute
threadContinue();
}
void GameController::setTurbo(bool set, bool forced) { void GameController::setTurbo(bool set, bool forced) {
if (m_turboForced && !forced) { if (m_turboForced && !forced) {
return; return;

1
src/platform/qt/GameController.h
View File

@ -132,7 +132,6 @@ public slots:
void saveState(int slot = 0); void saveState(int slot = 0);
void loadBackupState(); void loadBackupState();
void saveBackupState(); void saveBackupState();
void setMute(bool);
void setTurbo(bool, bool forced = true); void setTurbo(bool, bool forced = true);
void setTurboSpeed(float ratio = -1); void setTurboSpeed(float ratio = -1);
void setAVStream(mAVStream*); void setAVStream(mAVStream*);

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

@ -1139,7 +1139,7 @@ void Window::setupMenu(QMenuBar* menubar) {
ConfigOption* mute = m_config->addOption("mute"); ConfigOption* mute = m_config->addOption("mute");
mute->addBoolean(tr("Mute"), avMenu); mute->addBoolean(tr("Mute"), avMenu);
mute->connect([this](const QVariant& value) { mute->connect([this](const QVariant& value) {
m_controller->setMute(value.toBool()); reloadConfig();
}, this); }, this);
m_config->updateOption("mute"); m_config->updateOption("mute");