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

Add support for gapless looping music.

Browse Source
This commit is contained in:
Matthias Mailänder
2021-08-22 20:59:13 +02:00
committed by abcdefg30
parent 9916e4c4ac
commit 9b1cec7712
6 changed files with 43 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
OpenRA.Mods.Common/Traits/World/MusicPlaylist.cs
View File

@@ -162,13 +162,15 @@ namespace OpenRA.Mods.Common.Traits
if (!SongExists(currentSong) || (CurrentSongIsBackground && IsBackgroundMusicMuted))
return;
Game.Sound.PlayMusicThen(currentSong, () =>
{
if (!CurrentSongIsBackground && !Game.Settings.Sound.Repeat)
currentSong = GetNextSong();
Game.Sound.PlayMusicThen(currentSong, PlayNextSong);
}
Play();
});
void PlayNextSong()
{
if (!CurrentSongIsBackground)
currentSong = GetNextSong();
Play();
}
public void Play(MusicInfo music)

2
OpenRA.Mods.Common/Widgets/Logic/MusicPlayerLogic.cs
View File

@@ -78,7 +78,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
var repeatCheckbox = panel.Get<CheckboxWidget>("REPEAT");
repeatCheckbox.IsChecked = () => Game.Settings.Sound.Repeat;
repeatCheckbox.OnClick = () => Game.Settings.Sound.Repeat ^= true;
repeatCheckbox.OnClick = () => Game.Sound.SetMusicLooped(!Game.Settings.Sound.Repeat);
repeatCheckbox.IsDisabled = () => musicPlaylist.CurrentSongIsBackground;
panel.Get<LabelWidget>("TIME_LABEL").GetText = () =>