Compare commits

...

3 Commits

Author SHA1 Message Date
shinra-electric
06bff0159c Correctly set filetypes in Info.plist (#6023)
Currently the filetype association is not working. 

This should hopefully fix it.
2023-12-11 21:49:07 +01:00
Mary Guillemard
04ed8c1f83 infra: Fix labeler.yml after labeler@v5 update 2023-12-11 21:43:05 +01:00
rmg-x
ad8d5b9b56 Ava UI: Fix temporary volume not being set after unmute (#5833) 2023-12-11 21:26:11 +01:00
5 changed files with 57 additions and 30 deletions

42
.github/labeler.yml vendored
View File

@@ -1,33 +1,35 @@
audio: 'src/Ryujinx.Audio*/**' audio:
- changed-files:
- any-glob-to-any-file: 'src/Ryujinx.Audio*/**'
cpu: cpu:
- 'src/ARMeilleure/**' - changed-files:
- 'src/Ryujinx.Cpu/**' - any-glob-to-any-file: ['src/ARMeilleure/**', 'src/Ryujinx.Cpu/**', 'src/Ryujinx.Memory/**']
- 'src/Ryujinx.Memory/**'
gpu: gpu:
- 'src/Ryujinx.Graphics.*/**' - changed-files:
- 'src/Spv.Generator/**' - any-glob-to-any-file: ['src/Ryujinx.Graphics.*/**', 'src/Spv.Generator/**', 'src/Ryujinx.ShaderTools/**']
- 'src/Ryujinx.ShaderTools/**'
'graphics-backend:opengl':
- changed-files:
- any-glob-to-any-file: 'src/Ryujinx.Graphics.OpenGL/**'
'graphics-backend:opengl': 'src/Ryujinx.Graphics.OpenGL/**'
'graphics-backend:vulkan': 'graphics-backend:vulkan':
- 'src/Ryujinx.Graphics.Vulkan/**' - changed-files:
- 'src/Spv.Generator/**' - any-glob-to-any-file: ['src/Ryujinx.Graphics.Vulkan/**', 'src/Spv.Generator/**']
gui: gui:
- 'src/Ryujinx/**' - changed-files:
- 'src/Ryujinx.Ui.Common/**' - any-glob-to-any-file: ['src/Ryujinx/**', 'src/Ryujinx.Ui.Common/**', 'src/Ryujinx.Ui.LocaleGenerator/**', 'src/Ryujinx.Ava/**']
- 'src/Ryujinx.Ui.LocaleGenerator/**'
- 'src/Ryujinx.Ava/**'
horizon: horizon:
- 'src/Ryujinx.HLE/**' - changed-files:
- 'src/Ryujinx.Horizon*/**' - any-glob-to-any-file: ['src/Ryujinx.HLE/**', 'src/Ryujinx.Horizon/**']
kernel: 'src/Ryujinx.HLE/HOS/Kernel/**' kernel:
- changed-files:
- any-glob-to-any-file: 'src/Ryujinx.HLE/HOS/Kernel/**'
infra: infra:
- '.github/**' - changed-files:
- 'distribution/**' - any-glob-to-any-file: ['.github/**', 'distribution/**', 'Directory.Packages.props']
- 'Directory.Packages.props'

View File

@@ -10,14 +10,25 @@
<string>Ryujinx</string> <string>Ryujinx</string>
<key>CFBundleIconFile</key> <key>CFBundleIconFile</key>
<string>Ryujinx.icns</string> <string>Ryujinx.icns</string>
<key>CFBundleTypeExtensions</key> <key>CFBundleDocumentTypes</key>
<array> <array>
<string>nca</string> <dict>
<string>nro</string> <key>CFBundleTypeExtensions</key>
<string>nso</string> <array>
<string>nsp</string> <string>nca</string>
<string>xci</string> <string>nro</string>
</array> <string>nso</string>
<string>nsp</string>
<string>xci</string>
</array>
<key>CFBundleTypeName</key>
<string>Nintendo Switch File</string>
<key>CFBundleTypeRole</key>
<string>Viewer</string>
<key>LSHandlerRank</key>
<string>Default</string>
</dict>
</array>
<key>CFBundleIdentifier</key> <key>CFBundleIdentifier</key>
<string>org.ryujinx.Ryujinx</string> <string>org.ryujinx.Ryujinx</string>
<key>CFBundleInfoDictionaryVersion</key> <key>CFBundleInfoDictionaryVersion</key>

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);
} }

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;

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);
} }