mirrors/Cemu
0
0
Fork 0
mirror of https://github.com/cemu-project/Cemu.git synced 2025-12-13 13:37:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'refs/heads/main' into gamma

Browse source
This commit is contained in:
goeiecool9999 2025-11-02 10:49:52 +01:00
commit 40cbff5360
19 changed files with 281 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/gui/wxgui/GeneralSettings2.cpp
View file

@ -1216,10 +1216,9 @@ void GeneralSettings2::OnVolumeChanged(wxCommandEvent& event)
if(event.GetEventObject() == m_pad_volume)
{
if (g_padAudio)
{
g_padAudio->SetVolume(event.GetInt());
g_padVolume = event.GetInt();
}
g_padVolume = event.GetInt();
}
else if (event.GetEventObject() == m_tv_volume)
{
@ -1241,11 +1240,8 @@ void GeneralSettings2::OnInputVolumeChanged(wxCommandEvent& event)
{
std::shared_lock lock(g_audioMutex);
if (g_padAudio)
{
g_padAudio->SetInputVolume(event.GetInt());
g_padVolume = event.GetInt();
}
event.Skip();
}
@ -1947,11 +1943,12 @@ void GeneralSettings2::UpdateAudioDevice()
else
channels = CemuConfig::AudioChannelsToNChannels(config.pad_channels);
g_padVolume = m_pad_volume->GetValue();
try
{
g_padAudio = IAudioAPI::CreateDevice((IAudioAPI::AudioAPI)config.audio_api, description->GetDescription(), 48000, channels, snd_core::AX_SAMPLES_PER_3MS_48KHZ * AX_FRAMES_PER_GROUP, 16);
g_padAudio->SetVolume(m_pad_volume->GetValue());
g_padVolume = m_pad_volume->GetValue();
}
catch (std::runtime_error& ex)
{