piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-24 06:39:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11165 from AdmiralCurtiss/audiocommon-pass-system

Browse Source 
AudioCommon: Pass Core::System to AudioCommon functions.
This commit is contained in:
Mai
2022-11-23 04:49:31 +00:00
committed by GitHub
parent 1469055244 1c63349984
commit 0ef6d30a0d
8 changed files with 55 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Source/Core/DolphinQt/HotkeyScheduler.cpp
View File

@ -30,6 +30,7 @@
#include "Core/IOS/USB/Bluetooth/BTBase.h"
#include "Core/IOS/USB/Bluetooth/BTReal.h"
#include "Core/State.h"
#include "Core/System.h"
#include "Core/WiiUtils.h"
#ifdef HAS_LIBMGBA
@ -353,7 +354,7 @@ void HotkeyScheduler::Run()
if (IsHotkey(HK_VOLUME_TOGGLE_MUTE))
{
AudioCommon::ToggleMuteVolume();
AudioCommon::ToggleMuteVolume(Core::System::GetInstance());
ShowVolume();
}

5
Source/Core/DolphinQt/Settings.cpp
View File

@ -36,6 +36,7 @@
#include "Core/IOS/IOS.h"
#include "Core/NetPlayClient.h"
#include "Core/NetPlayServer.h"
#include "Core/System.h"
#include "DolphinQt/Host.h"
#include "DolphinQt/QtUtils/QueueOnObject.h"
@ -384,13 +385,13 @@ void Settings::SetVolume(int volume)
void Settings::IncreaseVolume(int volume)
{
AudioCommon::IncreaseVolume(volume);
AudioCommon::IncreaseVolume(Core::System::GetInstance(), volume);
emit VolumeChanged(GetVolume());
}
void Settings::DecreaseVolume(int volume)
{
AudioCommon::DecreaseVolume(volume);
AudioCommon::DecreaseVolume(Core::System::GetInstance(), volume);
emit VolumeChanged(GetVolume());
}

3
Source/Core/DolphinQt/Settings/AudioPane.cpp
View File

@ -23,6 +23,7 @@
#include "Core/Config/MainSettings.h"
#include "Core/Core.h"
#include "Core/System.h"
#include "DolphinQt/Config/SettingsWindow.h"
#include "DolphinQt/Settings.h"
@ -328,7 +329,7 @@ void AudioPane::SaveSettings()
Config::SetBaseOrCurrent(Config::MAIN_WASAPI_DEVICE, device);
#endif
AudioCommon::UpdateSoundStream();
AudioCommon::UpdateSoundStream(Core::System::GetInstance());
}
void AudioPane::OnDspChanged()