Merge pull request #8876 from pchote/music

Refine the music playlist code.

OpenRA.Mods.Common/OpenRA.Mods.Common.csproj

@@ -702,6 +702,7 @@
     <Compile Include="Traits\RevealsShroud.cs" />
     <Compile Include="Lint\CheckRevealFootprint.cs" />
     <Compile Include="Traits\ThrowsShrapnel.cs" />
+    <Compile Include="Traits\World\MusicPlaylist.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>

OpenRA.Mods.Common/Scripting/Global/MediaGlobal.cs

@@ -17,6 +17,7 @@ using OpenRA.FileFormats;
 using OpenRA.FileSystem;
 using OpenRA.Graphics;
 using OpenRA.Mods.Common.Effects;
+using OpenRA.Mods.Common.Traits;
 using OpenRA.Scripting;
 using OpenRA.Traits;
 

OpenRA.Mods.Common/Traits/World/MusicPlaylist.cs

@@ -0,0 +1,214 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see COPYING.
+ */
+#endregion
+
+using System;
+using System.Linq;
+using OpenRA.GameRules;
+using OpenRA.Traits;
+
+namespace OpenRA.Mods.Common.Traits
+{
+	[Desc("Trait for music handling. Attach this to the world actor.")]
+	public class MusicPlaylistInfo : ITraitInfo
+	{
+		[Desc("Music to play when the map starts.", "Plays the first song on the playlist when undefined.")]
+		public readonly string StartingMusic = null;
+
+		[Desc("Music to play when the game has been won.")]
+		public readonly string VictoryMusic = null;
+
+		[Desc("Music to play when the game has been lost.")]
+		public readonly string DefeatMusic = null;
+
+		[Desc("This track is played when no other music is playing.",
+			"It cannot be paused, but can be overridden by selecting a new track.")]
+		public readonly string BackgroundMusic = null;
+
+		public object Create(ActorInitializer init) { return new MusicPlaylist(init.World, this); }
+	}
+
+	public class MusicPlaylist : INotifyActorDisposing, IGameOver
+	{
+		readonly MusicPlaylistInfo info;
+		readonly World world;
+
+		readonly MusicInfo[] random;
+		readonly MusicInfo[] playlist;
+
+		public readonly bool IsMusicInstalled;
+		public readonly bool IsMusicAvailable;
+		public bool CurrentSongIsBackground { get; private set; }
+
+		MusicInfo currentSong;
+		MusicInfo currentBackgroundSong;
+
+		public MusicPlaylist(World world, MusicPlaylistInfo info)
+		{
+			this.info = info;
+			this.world = world;
+
+			IsMusicInstalled = world.Map.Rules.InstalledMusic.Any();
+			if (!IsMusicInstalled)
+				return;
+
+			playlist = world.Map.Rules.InstalledMusic
+				.Where(a => !a.Value.Hidden)
+				.Select(a => a.Value)
+				.ToArray();
+
+			random = playlist.Shuffle(Game.CosmeticRandom).ToArray();
+			IsMusicAvailable = playlist.Any();
+
+			if (SongExists(info.StartingMusic))
+				currentSong = world.Map.Rules.Music[info.StartingMusic];
+			else if (SongExists(info.BackgroundMusic))
+			{
+				currentSong = currentBackgroundSong = world.Map.Rules.Music[info.BackgroundMusic];
+				CurrentSongIsBackground = true;
+			}
+			else
+			{
+				// Start playback with a random song, but only if the player has installed more music
+				var installData = Game.ModData.Manifest.Get<ContentInstaller>();
+				if (playlist.Length > installData.ShippedSoundtracks)
+					currentSong = random.FirstOrDefault();
+			}
+
+			Play();
+		}
+
+		bool SongExists(string song)
+		{
+			return !string.IsNullOrEmpty(song)
+				&& world.Map.Rules.Music.ContainsKey(song)
+				&& world.Map.Rules.Music[song].Exists;
+		}
+
+		bool SongExists(MusicInfo song)
+		{
+			return song != null && song.Exists;
+		}
+
+		public MusicInfo CurrentSong()
+		{
+			return currentSong;
+		}
+
+		public MusicInfo[] AvailablePlaylist()
+		{
+			// TO-DO: add filter options for Race-specific music
+			return playlist;
+		}
+
+		public void GameOver(World world)
+		{
+			if (world.LocalPlayer != null && world.LocalPlayer.WinState == WinState.Won)
+			{
+				if (SongExists(info.VictoryMusic))
+				{
+					currentBackgroundSong = world.Map.Rules.Music[info.VictoryMusic];
+					Stop();
+				}
+			}
+			else
+			{
+				// Most RTS treats observers losing the game,
+				// no need for a special handling involving them here.
+				if (SongExists(info.DefeatMusic))
+				{
+					currentBackgroundSong = world.Map.Rules.Music[info.DefeatMusic];
+					Stop();
+				}
+			}
+		}
+
+		void Play()
+		{
+			if (!SongExists(currentSong))
+				return;
+
+			Sound.PlayMusicThen(currentSong, () =>
+			{
+				if (!CurrentSongIsBackground && !Game.Settings.Sound.Repeat)
+					currentSong = GetNextSong();
+
+				Play();
+			});
+		}
+
+		public void Play(MusicInfo music)
+		{
+			if (music == null)
+				return;
+
+			currentSong = music;
+			CurrentSongIsBackground = false;
+
+			Play();
+		}
+
+		public void Play(MusicInfo music, Action onComplete)
+		{
+			if (music == null)
+				return;
+
+			currentSong = music;
+			CurrentSongIsBackground = false;
+			Sound.PlayMusicThen(music, onComplete);
+		}
+
+		public MusicInfo GetNextSong()
+		{
+			return GetSong(false);
+		}
+
+		public MusicInfo GetPrevSong()
+		{
+			return GetSong(true);
+		}
+
+		MusicInfo GetSong(bool reverse)
+		{
+			if (!IsMusicAvailable)
+				return null;
+
+			var songs = Game.Settings.Sound.Shuffle ? random : playlist;
+
+			var next = reverse ? songs.Reverse().SkipWhile(m => m != currentSong)
+				.Skip(1).FirstOrDefault() ?? songs.Reverse().FirstOrDefault() :
+				songs.SkipWhile(m => m != currentSong)
+				.Skip(1).FirstOrDefault() ?? songs.FirstOrDefault();
+
+			if (SongExists(next))
+				return next;
+
+			return null;
+		}
+
+		public void Stop()
+		{
+			currentSong = null;
+			Sound.StopMusic();
+
+			if (currentBackgroundSong != null)
+			{
+				currentSong = currentBackgroundSong;
+				CurrentSongIsBackground = true;
+				Play();
+			}
+		}
+
+		public void Disposing(Actor self)
+		{
+			if (currentSong != null)
+				Sound.StopMusic();
+		}
+	}
+}

OpenRA.Mods.Common/Widgets/Logic/Lobby/LobbyLogic.cs

@@ -560,7 +560,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
 				musicButton.OnClick = () => Ui.OpenWindow("MUSIC_PANEL", new WidgetArgs
 				{
 					{ "onExit", DoNothing },
-					{ "world", orderManager.World }
+					{ "world", worldRenderer.World }
 				});
 
 			var settingsButton = lobby.GetOrNull<ButtonWidget>("SETTINGS_BUTTON");

OpenRA.Mods.Common/Widgets/Logic/MusicPlayerLogic.cs

@@ -11,7 +11,7 @@
 using System;
 using System.Linq;
 using OpenRA.GameRules;
-using OpenRA.Traits;
+using OpenRA.Mods.Common.Traits;
 using OpenRA.Widgets;
 
 namespace OpenRA.Mods.Common.Widgets.Logic
@@ -35,8 +35,8 @@ namespace OpenRA.Mods.Common.Widgets.Logic
 
 			BuildMusicTable();
 
-			Func<bool> noMusic = () => !musicPlaylist.IsMusicAvailable;
-			panel.Get("NO_MUSIC_LABEL").IsVisible = noMusic;
+			Func<bool> noMusic = () => !musicPlaylist.IsMusicAvailable || musicPlaylist.CurrentSongIsBackground || currentSong == null;
+			panel.Get("NO_MUSIC_LABEL").IsVisible = () => !musicPlaylist.IsMusicAvailable;
 
 			var playButton = panel.Get<ButtonWidget>("BUTTON_PLAY");
 			playButton.OnClick = Play;
@@ -63,14 +63,25 @@ namespace OpenRA.Mods.Common.Widgets.Logic
 			var shuffleCheckbox = panel.Get<CheckboxWidget>("SHUFFLE");
 			shuffleCheckbox.IsChecked = () => Game.Settings.Sound.Shuffle;
 			shuffleCheckbox.OnClick = () => Game.Settings.Sound.Shuffle ^= true;
+			shuffleCheckbox.IsDisabled = () => musicPlaylist.CurrentSongIsBackground;
 
 			var repeatCheckbox = panel.Get<CheckboxWidget>("REPEAT");
 			repeatCheckbox.IsChecked = () => Game.Settings.Sound.Repeat;
 			repeatCheckbox.OnClick = () => Game.Settings.Sound.Repeat ^= true;
+			repeatCheckbox.IsDisabled = () => musicPlaylist.CurrentSongIsBackground;
 
-			panel.Get<LabelWidget>("TIME_LABEL").GetText = () => (currentSong == null) ? "" :
-				"{0:D2}:{1:D2} / {2:D2}:{3:D2}".F((int)Sound.MusicSeekPosition / 60, (int)Sound.MusicSeekPosition % 60,
-					currentSong.Length / 60, currentSong.Length % 60);
+			panel.Get<LabelWidget>("TIME_LABEL").GetText = () =>
+			{
+				if (currentSong == null || musicPlaylist.CurrentSongIsBackground)
+					return "";
+
+				var minutes = (int)Sound.MusicSeekPosition / 60;
+				var seconds = (int)Sound.MusicSeekPosition % 60;
+				var totalMinutes = currentSong.Length / 60;
+				var totalSeconds = currentSong.Length % 60;
+
+				return "{0:D2}:{1:D2} / {2:D2}:{3:D2}".F(minutes, seconds, totalMinutes, totalSeconds);
+			};
 
 			var musicSlider = panel.Get<SliderWidget>("MUSIC_SLIDER");
 			musicSlider.OnChange += x => Sound.MusicVolume = x;
@@ -94,7 +105,10 @@ namespace OpenRA.Mods.Common.Widgets.Logic
 			{
 				songWatcher.OnTick = () =>
 				{
-					if (Sound.CurrentMusic == null || currentSong == Sound.CurrentMusic)
+					if (musicPlaylist.CurrentSongIsBackground && currentSong != null)
+						currentSong = null;
+
+					if (Sound.CurrentMusic == null || currentSong == Sound.CurrentMusic || musicPlaylist.CurrentSongIsBackground)
 						return;
 
 					currentSong = Sound.CurrentMusic;
@@ -111,23 +125,18 @@ namespace OpenRA.Mods.Common.Widgets.Logic
 
 			var music = musicPlaylist.AvailablePlaylist();
 			currentSong = musicPlaylist.CurrentSong();
-			if (currentSong == null && music.Any())
-				currentSong = musicPlaylist.GetNextSong();
 
 			musicList.RemoveChildren();
 			foreach (var s in music)
 			{
 				var song = s;
-				if (currentSong == null)
-					currentSong = song;
-
 				var item = ScrollItemWidget.Setup(song.Filename, itemTemplate, () => currentSong == song, () => { currentSong = song; Play(); }, () => { });
 				item.Get<LabelWidget>("TITLE").GetText = () => song.Title;
 				item.Get<LabelWidget>("LENGTH").GetText = () => SongLengthLabel(song);
 				musicList.AddChild(item);
 			}
 
-			if (currentSong != null)
+			if (currentSong != null && !musicPlaylist.CurrentSongIsBackground)
 				musicList.ScrollToItem(currentSong.Filename);
 		}