alexx009/jinx
Archived
1
0
Fork 0
forked from Mirror/Ryujinx
Code Pull requests Activity

Ava UI: Fix temporary volume not being set after unmute (#5833)

Browse source
This commit is contained in:
rmg-x 2023-12-11 20:26:11 +00:00 committed by GitHub
parent 1df6c07f78
commit ad8d5b9b56
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/Ryujinx.Ava/AppHost.cs
View file

@ -1088,10 +1088,11 @@ namespace Ryujinx.Ava
case KeyboardHotkeyState.ToggleMute: case KeyboardHotkeyState.ToggleMute:
if (Device.IsAudioMuted()) if (Device.IsAudioMuted())
{ {
Device.SetVolume(ConfigurationState.Instance.System.AudioVolume); Device.SetVolume(_viewModel.VolumeBeforeMute);
} }
else else
{ {
_viewModel.VolumeBeforeMute = Device.GetVolume();
Device.SetVolume(0); Device.SetVolume(0);
} }

12
src/Ryujinx.Ava/UI/ViewModels/MainWindowViewModel.cs
View file

@ -90,6 +90,7 @@ namespace Ryujinx.Ava.UI.ViewModels
private string _pauseKey = "F5"; private string _pauseKey = "F5";
private string _screenshotKey = "F8"; private string _screenshotKey = "F8";
private float _volume; private float _volume;
private float _volumeBeforeMute;
private string _backendText; private string _backendText;
private bool _canUpdate = true; private bool _canUpdate = true;
@ -554,6 +555,17 @@ namespace Ryujinx.Ava.UI.ViewModels
} }
} }
public float VolumeBeforeMute
{
get => _volumeBeforeMute;
set
{
_volumeBeforeMute = value;
OnPropertyChanged();
}
}
public bool ShowStatusSeparator public bool ShowStatusSeparator
{ {
get => _showStatusSeparator; get => _showStatusSeparator;

3
src/Ryujinx.Ava/UI/Windows/MainWindow.axaml.cs
View file

@ -436,10 +436,11 @@ namespace Ryujinx.Ava.UI.Windows
{ {
if (!volumeSplitButton.IsChecked) if (!volumeSplitButton.IsChecked)
{ {
ViewModel.AppHost.Device.SetVolume(ConfigurationState.Instance.System.AudioVolume); ViewModel.AppHost.Device.SetVolume(ViewModel.VolumeBeforeMute);
} }
else else
{ {
ViewModel.VolumeBeforeMute = ViewModel.AppHost.Device.GetVolume();
ViewModel.AppHost.Device.SetVolume(0); ViewModel.AppHost.Device.SetVolume(0);
} }