empathicqubit/Mesen-X
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

UI: Added shortcuts to increase/decrease master volume

Browse source
This commit is contained in:
Sour 2020-04-21 21:58:07 -04:00
parent 642f92a514
commit 243ffef4fc
17 changed files with 53 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Core/EmulationSettings.h
View file

@ -415,7 +415,6 @@ enum class EmulatorShortcut
VsServiceButton2,
ToggleCheats,
ToggleAudio,
ToggleFastForward,
ToggleRewind,
ToggleKeyboardMode,
@ -462,6 +461,9 @@ enum class EmulatorShortcut
ToggleSprites,
ToggleBackground,
ToggleDebugInfo,
ToggleAudio,
IncreaseVolume,
DecreaseVolume,
LoadRandomGame,
SaveStateSlot1,

4
Core/ShortcutKeyHandler.cpp
View file

@ -206,10 +206,6 @@ void ShortcutKeyHandler::CheckMappedKeys()
_console->GetNotificationManager()->SendNotification(ConsoleNotificationType::ExecuteShortcut, (void*)EmulatorShortcut::ToggleCheats);
}
if(DetectKeyPress(EmulatorShortcut::ToggleAudio)) {
_console->GetNotificationManager()->SendNotification(ConsoleNotificationType::ExecuteShortcut, (void*)EmulatorShortcut::ToggleAudio);
}
if(DetectKeyPress(EmulatorShortcut::RunSingleFrame)) {
ProcessRunSingleFrame();
}

3
GUI.NET/Config/PreferenceInfo.cs
View file

@ -112,6 +112,9 @@ namespace Mesen.GUI.Config
ShortcutKeys1.Add(new ShortcutKeyInfo(EmulatorShortcut.DecreaseSpeed, new KeyCombination() { Key1 = InteropEmu.GetKeyCode("-") }));
ShortcutKeys1.Add(new ShortcutKeyInfo(EmulatorShortcut.MaxSpeed, new KeyCombination() { Key1 = InteropEmu.GetKeyCode("F9") }));
ShortcutKeys1.Add(new ShortcutKeyInfo(EmulatorShortcut.IncreaseVolume, new KeyCombination() { Key1 = InteropEmu.GetKeyCode("Ctrl"), Key2 = InteropEmu.GetKeyCode("=") }));
ShortcutKeys1.Add(new ShortcutKeyInfo(EmulatorShortcut.DecreaseVolume, new KeyCombination() { Key1 = InteropEmu.GetKeyCode("Ctrl"), Key2 = InteropEmu.GetKeyCode("-") }));
ShortcutKeys1.Add(new ShortcutKeyInfo(EmulatorShortcut.ToggleFps, new KeyCombination() { Key1 = InteropEmu.GetKeyCode("F10") }));
ShortcutKeys1.Add(new ShortcutKeyInfo(EmulatorShortcut.ToggleFullscreen, new KeyCombination() { Key1 = InteropEmu.GetKeyCode("F11") }));
ShortcutKeys1.Add(new ShortcutKeyInfo(EmulatorShortcut.ToggleKeyboardMode, new KeyCombination() { Key1 = InteropEmu.GetKeyCode("Scroll Lock") }));

2
GUI.NET/Controls/ctrlNsfPlayer.cs
View file

@ -191,6 +191,8 @@ namespace Mesen.GUI.Controls
lblSlowMotion.Visible = lblSlowMotionIcon.Visible = InteropEmu.GetEmulationSpeed() < 100 && InteropEmu.GetEmulationSpeed() > 0 && !InteropEmu.CheckFlag(EmulationFlags.Turbo) && !rewinding;
lblTime.Text = label;
trkVolume.Value = (int)ConfigManager.Config.AudioInfo.MasterVolume;
}
private TimeSpan GetTrackLength(NsfHeader header, int track)

2
GUI.NET/Dependencies/resources.ca.xml
View file

@ -895,6 +895,8 @@
<Message ID="EmulatorShortcutMappings_LoadState">Carrega la partida guardada seleccionada</Message>
<Message ID="EmulatorShortcutMappings_ToggleCheats">Activa/Desactiva els trucs</Message>
<Message ID="EmulatorShortcutMappings_ToggleAudio">Activa/Desactiva el so</Message>
<Message ID="EmulatorShortcutMappings_IncreaseVolume">Increase Volume</Message>
<Message ID="EmulatorShortcutMappings_DecreaseVolume">Decrease Volume</Message>
<Message ID="EmulatorShortcutMappings_RunSingleFrame">Avança un sol fotograma</Message>
<Message ID="EmulatorShortcutMappings_EjectDisk">FDS - Expulsa el disc</Message>

2
GUI.NET/Dependencies/resources.en.xml
View file

@ -928,6 +928,8 @@
<Message ID="EmulatorShortcutMappings_LoadState">Load State</Message>
<Message ID="EmulatorShortcutMappings_ToggleCheats">Enable/Disable Cheat Codes</Message>
<Message ID="EmulatorShortcutMappings_ToggleAudio">Enable/Disable Audio</Message>
<Message ID="EmulatorShortcutMappings_IncreaseVolume">Increase Volume</Message>
<Message ID="EmulatorShortcutMappings_DecreaseVolume">Decrease Volume</Message>
<Message ID="EmulatorShortcutMappings_RunSingleFrame">Run Single Frame</Message>
<Message ID="EmulatorShortcutMappings_EjectDisk">FDS - Eject Disk</Message>

2
GUI.NET/Dependencies/resources.es.xml
View file

@ -912,6 +912,8 @@
<Message ID="EmulatorShortcutMappings_LoadState">Cargar partida en la posición actual</Message>
<Message ID="EmulatorShortcutMappings_ToggleCheats">Habilitar/Deshabilitar códigos de trucos</Message>
<Message ID="EmulatorShortcutMappings_ToggleAudio">Habilitar/Deshabilitar sonido</Message>
<Message ID="EmulatorShortcutMappings_IncreaseVolume">Increase Volume</Message>
<Message ID="EmulatorShortcutMappings_DecreaseVolume">Decrease Volume</Message>
<Message ID="EmulatorShortcutMappings_RunSingleFrame">Ejecutar un solo fotograma</Message>
<Message ID="EmulatorShortcutMappings_EjectDisk">FDS - Expulsar disco</Message>

2
GUI.NET/Dependencies/resources.fr.xml
View file

@ -926,6 +926,8 @@
<Message ID="EmulatorShortcutMappings_LoadState">Charger l'état de la position courante</Message>
<Message ID="EmulatorShortcutMappings_ToggleCheats">Activer/désactiver tous les codes</Message>
<Message ID="EmulatorShortcutMappings_ToggleAudio">Activer/désactiver l'audio</Message>
<Message ID="EmulatorShortcutMappings_IncreaseVolume">Augmenter le volume</Message>
<Message ID="EmulatorShortcutMappings_DecreaseVolume">Diminuer le volume</Message>
<Message ID="EmulatorShortcutMappings_RunSingleFrame">Avancer d'une seule image</Message>
<Message ID="EmulatorShortcutMappings_EjectDisk">FDS - Éjecter le disque</Message>

2
GUI.NET/Dependencies/resources.it.xml
View file

@ -927,6 +927,8 @@
<Message ID="EmulatorShortcutMappings_LoadState">Carica Stato</Message>
<Message ID="EmulatorShortcutMappings_ToggleCheats">Attiva/Disattiva Cheat</Message>
<Message ID="EmulatorShortcutMappings_ToggleAudio">Attiva/Disattiva Audio</Message>
<Message ID="EmulatorShortcutMappings_IncreaseVolume">Increase Volume</Message>
<Message ID="EmulatorShortcutMappings_DecreaseVolume">Decrease Volume</Message>
<Message ID="EmulatorShortcutMappings_RunSingleFrame">Avanti Singolo Frame</Message>
<Message ID="EmulatorShortcutMappings_EjectDisk">FDS - Espelli Disco</Message>

2
GUI.NET/Dependencies/resources.ja.xml
View file

@ -914,6 +914,8 @@
<Message ID="EmulatorShortcutMappings_LoadState">選択中スロットからクイックロード</Message>
<Message ID="EmulatorShortcutMappings_ToggleCheats">チートコードを無効・有効にする</Message>
<Message ID="EmulatorShortcutMappings_ToggleAudio">音声を無効・有効にする</Message>
<Message ID="EmulatorShortcutMappings_IncreaseVolume">音量を上げる</Message>
<Message ID="EmulatorShortcutMappings_DecreaseVolume">音量を下げる</Message>
<Message ID="EmulatorShortcutMappings_RunSingleFrame">次のフレームを表す</Message>
<Message ID="EmulatorShortcutMappings_EjectDisk">FDS - ディスクを取り出す</Message>

2
GUI.NET/Dependencies/resources.pt.xml
View file

@ -928,6 +928,8 @@
<Message ID="EmulatorShortcutMappings_LoadState">Carregar estado</Message>
<Message ID="EmulatorShortcutMappings_ToggleCheats">Ativar/desativar códigos de trapaça</Message>
<Message ID="EmulatorShortcutMappings_ToggleAudio">Ativar/desativar áudio</Message>
<Message ID="EmulatorShortcutMappings_IncreaseVolume">Increase Volume</Message>
<Message ID="EmulatorShortcutMappings_DecreaseVolume">Decrease Volume</Message>
<Message ID="EmulatorShortcutMappings_RunSingleFrame">Executar um só quadro</Message>
<Message ID="EmulatorShortcutMappings_EjectDisk">FDS - Ejetar disco</Message>

2
GUI.NET/Dependencies/resources.ru.xml
View file

@ -914,6 +914,8 @@
<Message ID="EmulatorShortcutMappings_LoadState">Загрузить</Message>
<Message ID="EmulatorShortcutMappings_ToggleCheats">Enable/Disable Cheat Codes</Message>
<Message ID="EmulatorShortcutMappings_ToggleAudio">Enable/Disable Audio</Message>
<Message ID="EmulatorShortcutMappings_IncreaseVolume">Increase Volume</Message>
<Message ID="EmulatorShortcutMappings_DecreaseVolume">Decrease Volume</Message>
<Message ID="EmulatorShortcutMappings_RunSingleFrame">Run Single Frame</Message>
<Message ID="EmulatorShortcutMappings_EjectDisk">FDS - Eject Disk</Message>

2
GUI.NET/Dependencies/resources.uk.xml
View file

@ -914,6 +914,8 @@
<Message ID="EmulatorShortcutMappings_LoadState">Завантажити</Message>
<Message ID="EmulatorShortcutMappings_ToggleCheats">Увімкнути/Вимкнути всі коди</Message>
<Message ID="EmulatorShortcutMappings_ToggleAudio">Увімкнути/Вимкнути звук</Message>
<Message ID="EmulatorShortcutMappings_IncreaseVolume">Increase Volume</Message>
<Message ID="EmulatorShortcutMappings_DecreaseVolume">Decrease Volume</Message>
<Message ID="EmulatorShortcutMappings_RunSingleFrame">Перемістити вперед один кадр</Message>
<Message ID="EmulatorShortcutMappings_EjectDisk">FDS - Витягти диск</Message>

2
GUI.NET/Dependencies/resources.zh.xml
View file

@ -940,6 +940,8 @@
<Message ID="EmulatorShortcutMappings_LoadState">载入进度</Message>
<Message ID="EmulatorShortcutMappings_ToggleCheats">启用/禁用作弊码</Message>
<Message ID="EmulatorShortcutMappings_ToggleAudio">静音</Message>
<Message ID="EmulatorShortcutMappings_IncreaseVolume">Increase Volume</Message>
<Message ID="EmulatorShortcutMappings_DecreaseVolume">Decrease Volume</Message>
<Message ID="EmulatorShortcutMappings_RunSingleFrame">帧进</Message>
<Message ID="EmulatorShortcutMappings_EjectDisk">弹出磁盘</Message>

5
GUI.NET/Forms/Config/ctrlEmulatorShortcuts.cs
View file

@ -79,8 +79,11 @@ namespace Mesen.GUI.Forms.Config
EmulatorShortcut.ToggleBackground,
EmulatorShortcut.ToggleSprites,
EmulatorShortcut.ToggleCheats,
EmulatorShortcut.ToggleAudio,
EmulatorShortcut.ToggleKeyboardMode,
EmulatorShortcut.ToggleAudio,
EmulatorShortcut.IncreaseVolume,
EmulatorShortcut.DecreaseVolume,
EmulatorShortcut.MaxSpeed,
EmulatorShortcut.IncreaseSpeed,

19
GUI.NET/Forms/frmMain.cs
View file

@ -945,7 +945,6 @@ namespace Mesen.GUI.Forms
case EmulatorShortcut.Exit: this.Close(); break;
case EmulatorShortcut.ToggleCheats: ToggleCheats(); break;
case EmulatorShortcut.ToggleAudio: ToggleAudio(); break;
case EmulatorShortcut.ToggleFps: ToggleFps(); break;
case EmulatorShortcut.ToggleBackground: ToggleBackground(); break;
case EmulatorShortcut.ToggleSprites: ToggleSprites(); break;
@ -957,6 +956,10 @@ namespace Mesen.GUI.Forms
case EmulatorShortcut.ToggleDebugInfo: ToggleDebugInfo(); break;
case EmulatorShortcut.MaxSpeed: ToggleMaxSpeed(); break;
case EmulatorShortcut.ToggleFullscreen: ToggleFullscreen(); restoreFullscreen = false; break;
case EmulatorShortcut.ToggleAudio: ToggleAudio(); break;
case EmulatorShortcut.IncreaseVolume: IncreaseVolume(); break;
case EmulatorShortcut.DecreaseVolume: DecreaseVolume(); break;
case EmulatorShortcut.OpenFile: OpenFile(); break;
case EmulatorShortcut.IncreaseSpeed: InteropEmu.IncreaseEmulationSpeed(); break;
@ -1064,6 +1067,20 @@ namespace Mesen.GUI.Forms
ConfigManager.ApplyChanges();
}
private void IncreaseVolume()
{
ConfigManager.Config.AudioInfo.MasterVolume = (uint)Math.Min(100, (int)ConfigManager.Config.AudioInfo.MasterVolume + 10);
AudioInfo.ApplyConfig();
ConfigManager.ApplyChanges();
}
private void DecreaseVolume()
{
ConfigManager.Config.AudioInfo.MasterVolume = (uint)Math.Max(0, (int)ConfigManager.Config.AudioInfo.MasterVolume - 10);
AudioInfo.ApplyConfig();
ConfigManager.ApplyChanges();
}
private void ToggleFrameCounter()
{
ConfigManager.Config.PreferenceInfo.ShowFrameCounter = !ConfigManager.Config.PreferenceInfo.ShowFrameCounter;

4
GUI.NET/InteropEmu.cs
View file

@ -1895,7 +1895,6 @@ namespace Mesen.GUI
VsServiceButton2,
ToggleCheats,
ToggleAudio,
ToggleFastForward,
ToggleRewind,
ToggleKeyboardMode,
@ -1942,6 +1941,9 @@ namespace Mesen.GUI
ToggleSprites,
ToggleBackground,
ToggleDebugInfo,
ToggleAudio,
IncreaseVolume,
DecreaseVolume,
LoadRandomGame,
SaveStateSlot1,