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

Merge pull request #1782 from FL-dolphinemu/master

Browse Source 
Issue 7968: Added keybinds for increasing, decreasing, and muting audio.
This commit is contained in:
skidau
2015-01-08 14:09:18 +11:00
parent 660e0476c7 5de43536ba
commit 25c6f6e6a1
7 changed files with 60 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
Source/Core/AudioCommon/AudioCommon.cpp
View File

@ -27,6 +27,9 @@ static bool s_audio_dump_start = false;
namespace AudioCommon
{
static const int AUDIO_VOLUME_MIN = 0;
static const int AUDIO_VOLUME_MAX = 100;
SoundStream* InitSoundStream()
{
CMixer *mixer = new CMixer(48000);
@ -140,11 +143,13 @@ namespace AudioCommon
}
}
}
void UpdateSoundStream()
{
if (g_sound_stream)
{
g_sound_stream->SetVolume(SConfig::GetInstance().m_Volume);
int volume = SConfig::GetInstance().m_IsMuted ? 0 : SConfig::GetInstance().m_Volume;
g_sound_stream->SetVolume(volume);
}
}
@ -191,4 +196,31 @@ namespace AudioCommon
g_sound_stream->GetMixer()->StopLogDSPAudio();
s_audio_dump_start = false;
}
void IncreaseVolume(unsigned short offset)
{
SConfig::GetInstance().m_IsMuted = false;
int& currentVolume = SConfig::GetInstance().m_Volume;
currentVolume += offset;
if (currentVolume > AUDIO_VOLUME_MAX)
currentVolume = AUDIO_VOLUME_MAX;
UpdateSoundStream();
}
void DecreaseVolume(unsigned short offset)
{
SConfig::GetInstance().m_IsMuted = false;
int& currentVolume = SConfig::GetInstance().m_Volume;
currentVolume -= offset;
if (currentVolume < AUDIO_VOLUME_MIN)
currentVolume = AUDIO_VOLUME_MIN;
UpdateSoundStream();
}
void ToggleMuteVolume()
{
bool& isMuted = SConfig::GetInstance().m_IsMuted;
isMuted = !isMuted;
UpdateSoundStream();
}
}

3
Source/Core/AudioCommon/AudioCommon.h
View File

@ -23,4 +23,7 @@ namespace AudioCommon
void SendAIBuffer(short* samples, unsigned int num_samples);
void StartAudioDump();
void StopAudioDump();
void IncreaseVolume(unsigned short offset);
void DecreaseVolume(unsigned short offset);
void ToggleMuteVolume();
}