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

fixed #995 - remove duplication in next/prev song in MusicPlayerLogic.cs

Browse Source
This commit is contained in:
Chris Forbes
2011-07-08 21:19:18 +12:00
committed by Paul Chote
parent b71e8bfe85
commit 1a2dc8ec1c
1 changed files with 10 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
OpenRA.Mods.RA/Widgets/Logic/MusicPlayerLogic.cs
View File

@@ -8,6 +8,7 @@
*/ */
#endregion #endregion
using System.Collections.Generic;
using System.Drawing; using System.Drawing;
using System.Linq; using System.Linq;
using OpenRA.FileFormats; using OpenRA.FileFormats;
@@ -108,36 +109,27 @@ namespace OpenRA.Mods.RA.Widgets.Logic
ml.AddChild(item); ml.AddChild(item);
} }
} }
string GetNextSong() string ChooseSong( IEnumerable<string> songs )
{ {
var songs = Rules.Music.Where(a => a.Value.Exists)
.Select(a => a.Key);
if (!songs.Any()) if (!songs.Any())
return null; return null;
if (Game.Settings.Sound.Shuffle) if (Game.Settings.Sound.Shuffle)
return songs.Random(Game.CosmeticRandom); return songs.Random(Game.CosmeticRandom);
return songs.SkipWhile(m => m != CurrentSong) return songs.SkipWhile(m => m != CurrentSong)
.Skip(1).FirstOrDefault() ?? songs.FirstOrDefault(); .Skip(1).FirstOrDefault() ?? songs.FirstOrDefault();
}
string GetNextSong()
{
return ChooseSong( Rules.Music.Where( a => a.Value.Exists ).Select( a => a.Key ) );
} }
string GetPrevSong() string GetPrevSong()
{ {
var songs = Rules.Music.Where(a => a.Value.Exists) return ChooseSong( Rules.Music.Where( a => a.Value.Exists ).Select( a => a.Key ).Reverse() );
.Select(a => a.Key).Reverse();
if (!songs.Any())
return null;
if (Game.Settings.Sound.Shuffle)
return songs.Random(Game.CosmeticRandom);
return songs.SkipWhile(m => m != CurrentSong)
.Skip(1).FirstOrDefault() ?? songs.FirstOrDefault();
} }
} }
} }