From 5a7a69a8756d1a9f2f3df8ca42dba959241836af Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Mon, 1 Aug 2016 19:05:38 +0100 Subject: [PATCH] Tidy muting code. --- OpenRA.Game/Sound/Sound.cs | 9 +++------ OpenRA.Platforms.Default/OpenAlSoundEngine.cs | 3 --- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/OpenRA.Game/Sound/Sound.cs b/OpenRA.Game/Sound/Sound.cs index 4d82607cc3..4c2ce54884 100644 --- a/OpenRA.Game/Sound/Sound.cs +++ b/OpenRA.Game/Sound/Sound.cs @@ -43,6 +43,9 @@ namespace OpenRA public Sound(IPlatform platform, SoundSettings soundSettings) { soundEngine = platform.CreateSound(soundSettings.Device); + + if (soundSettings.Mute) + MuteAudio(); } ISoundSource LoadSound(ISoundLoader[] loaders, IReadOnlyFileSystem fileSystem, string filename) @@ -223,12 +226,6 @@ namespace OpenRA soundEngine.PauseSound(music, true); } - public float GlobalVolume - { - get { return soundEngine.Volume; } - set { soundEngine.Volume = value; } - } - float soundVolumeModifier = 1.0f; public float SoundVolumeModifier { diff --git a/OpenRA.Platforms.Default/OpenAlSoundEngine.cs b/OpenRA.Platforms.Default/OpenAlSoundEngine.cs index 3d6f541af1..b39f79da15 100644 --- a/OpenRA.Platforms.Default/OpenAlSoundEngine.cs +++ b/OpenRA.Platforms.Default/OpenAlSoundEngine.cs @@ -207,9 +207,6 @@ namespace OpenRA.Platforms.Default if (!TryGetSourceFromPool(out source)) return null; - if (Game.Settings.Sound.Mute) - Game.Sound.MuteAudio(); - var slot = sourcePool[source]; slot.Pos = pos; slot.FrameStarted = currFrame;