epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Disable sound controls when no audio device is available.

Browse Source
This commit is contained in:
Paul Chote
2019-12-28 10:40:23 +00:00
committed by reaperrr
parent 4052620f94
commit a7ae93978a
3 changed files with 144 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
OpenRA.Mods.Common/Widgets/Logic/SettingsLogic.cs
View File

@@ -352,6 +352,9 @@ namespace OpenRA.Mods.Common.Widgets.Logic
var muteCheckbox = panel.Get<CheckboxWidget>("MUTE_SOUND"); var muteCheckbox = panel.Get<CheckboxWidget>("MUTE_SOUND");
var muteCheckboxOnClick = muteCheckbox.OnClick; var muteCheckboxOnClick = muteCheckbox.OnClick;
var muteCheckboxIsChecked = muteCheckbox.IsChecked;
muteCheckbox.IsChecked = () => muteCheckboxIsChecked() || Game.Sound.DummyEngine;
muteCheckbox.IsDisabled = () => Game.Sound.DummyEngine;
muteCheckbox.OnClick = () => muteCheckbox.OnClick = () =>
{ {
muteCheckboxOnClick(); muteCheckboxOnClick();
@@ -362,12 +365,23 @@ namespace OpenRA.Mods.Common.Widgets.Logic
Game.Sound.UnmuteAudio(); Game.Sound.UnmuteAudio();
}; };
if (!ss.Mute) // Replace controls with a warning label if sound is disabled
{ var noDeviceLabel = panel.GetOrNull("NO_AUDIO_DEVICE");
panel.Get<SliderWidget>("SOUND_VOLUME").OnChange += x => Game.Sound.SoundVolume = x; if (noDeviceLabel != null)
panel.Get<SliderWidget>("MUSIC_VOLUME").OnChange += x => Game.Sound.MusicVolume = x; noDeviceLabel.Visible = Game.Sound.DummyEngine;
panel.Get<SliderWidget>("VIDEO_VOLUME").OnChange += x => Game.Sound.VideoVolume = x;
} var controlsContainer = panel.GetOrNull("AUDIO_CONTROLS");
if (controlsContainer != null)
controlsContainer.Visible = !Game.Sound.DummyEngine;
var soundVolumeSlider = panel.Get<SliderWidget>("SOUND_VOLUME");
soundVolumeSlider.OnChange += x => Game.Sound.SoundVolume = x;
var musicVolumeSlider = panel.Get<SliderWidget>("MUSIC_VOLUME");
musicVolumeSlider.OnChange += x => Game.Sound.MusicVolume = x;
var videoVolumeSlider = panel.Get<SliderWidget>("VIDEO_VOLUME");
videoVolumeSlider.OnChange += x => Game.Sound.VideoVolume = x;
var devices = Game.Sound.AvailableDevices(); var devices = Game.Sound.AvailableDevices();
soundDevice = devices.FirstOrDefault(d => d.Device == ss.Device) ?? devices.First(); soundDevice = devices.FirstOrDefault(d => d.Device == ss.Device) ?? devices.First();

9
mods/cnc/chrome/settings.yaml
View File

@@ -282,6 +282,15 @@ Container@SETTINGS_PANEL:
Font: Bold Font: Bold
Text: Audio Text: Audio
Align: Center Align: Center
Label@NO_AUDIO_DEVICE:
Y: 50
Width: PARENT_RIGHT
Align: Center
Text: Audio controls require an active sound device
Container@AUDIO_CONTROLS:
Width: PARENT_RIGHT
Height: PARENT_BOTTOM
Children:
Label@SOUND_LABEL: Label@SOUND_LABEL:
X: PARENT_RIGHT - WIDTH - 270 X: PARENT_RIGHT - WIDTH - 270
Y: 38 Y: 38

9
mods/common/chrome/settings.yaml
View File

@@ -291,6 +291,15 @@ Background@SETTINGS_PANEL:
Y: 50 Y: 50
Width: PARENT_RIGHT - 10 Width: PARENT_RIGHT - 10
Height: PARENT_BOTTOM Height: PARENT_BOTTOM
Children:
Label@NO_AUDIO_DEVICE:
Y: 50
Width: PARENT_RIGHT
Align: Center
Text: Audio controls require an active sound device
Container@AUDIO_CONTROLS:
Width: PARENT_RIGHT
Height: PARENT_BOTTOM
Children: Children:
Label@SOUND_LABEL: Label@SOUND_LABEL:
X: PARENT_RIGHT - WIDTH - 270 X: PARENT_RIGHT - WIDTH - 270