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

Add VolumeModifier support to music.

Browse Source
This commit is contained in:
Paul Chote
2019-01-29 19:15:28 +00:00
committed by Oliver Brakmann
parent 810aa744bf
commit b71c080285
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRA.Game/GameRules/MusicInfo.cs
View File

@@ -19,6 +19,7 @@ namespace OpenRA.GameRules
public readonly string Filename; public readonly string Filename;
public readonly string Title; public readonly string Title;
public readonly bool Hidden; public readonly bool Hidden;
public readonly float VolumeModifier = 1f;
public int Length { get; private set; } // seconds public int Length { get; private set; } // seconds
public bool Exists { get; private set; } public bool Exists { get; private set; }
@@ -31,6 +32,9 @@ namespace OpenRA.GameRules
if (nd.ContainsKey("Hidden")) if (nd.ContainsKey("Hidden"))
bool.TryParse(nd["Hidden"].Value, out Hidden); bool.TryParse(nd["Hidden"].Value, out Hidden);
if (nd.ContainsKey("VolumeModifier"))
VolumeModifier = FieldLoader.GetValue<float>("VolumeModifier", nd["VolumeModifier"].Value);
var ext = nd.ContainsKey("Extension") ? nd["Extension"].Value : "aud"; var ext = nd.ContainsKey("Extension") ? nd["Extension"].Value : "aud";
Filename = (nd.ContainsKey("Filename") ? nd["Filename"].Value : key) + "." + ext; Filename = (nd.ContainsKey("Filename") ? nd["Filename"].Value : key) + "." + ext;
} }

2
OpenRA.Game/Sound/Sound.cs
View File

@@ -214,7 +214,7 @@ namespace OpenRA
Func<ISoundFormat, ISound> stream = soundFormat => soundEngine.Play2DStream( Func<ISoundFormat, ISound> stream = soundFormat => soundEngine.Play2DStream(
soundFormat.GetPCMInputStream(), soundFormat.Channels, soundFormat.SampleBits, soundFormat.SampleRate, soundFormat.GetPCMInputStream(), soundFormat.Channels, soundFormat.SampleBits, soundFormat.SampleRate,
false, true, WPos.Zero, MusicVolume); false, true, WPos.Zero, MusicVolume * m.VolumeModifier);
music = LoadSound(m.Filename, stream); music = LoadSound(m.Filename, stream);
if (music == null) if (music == null)