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

fixed #994 - use FormatTimeSeconds in MusicPlayerLogic

Browse Source
This commit is contained in:
Chris Forbes
2011-07-08 21:37:24 +12:00
committed by Paul Chote
parent 8610222e2c
commit 0cb1f98e7e
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -81,8 +81,9 @@ namespace OpenRA.Mods.RA.Widgets.Logic
{ {
if (CurrentSong == null) if (CurrentSong == null)
return ""; return "";
return "{0:D2}:{1:D2} / {2:D2}:{3:D2}".F((int)Sound.MusicSeekPosition / 60, (int)Sound.MusicSeekPosition % 60, return "{0} / {1}".F(
Rules.Music[CurrentSong].Length / 60, Rules.Music[CurrentSong].Length % 60); WidgetUtils.FormatTimeSeconds( (int)Sound.MusicSeekPosition ),
WidgetUtils.FormatTimeSeconds( Rules.Music[CurrentSong].Length ));
}; };
var ml = bg.GetWidget<ScrollPanelWidget>("MUSIC_LIST"); var ml = bg.GetWidget<ScrollPanelWidget>("MUSIC_LIST");
@@ -105,7 +106,8 @@ namespace OpenRA.Mods.RA.Widgets.Logic
() => CurrentSong == song, () => CurrentSong == song,
() => { CurrentSong = song; bg.GetWidget<ButtonWidget>("BUTTON_PLAY").OnClick(); }); () => { CurrentSong = song; bg.GetWidget<ButtonWidget>("BUTTON_PLAY").OnClick(); });
item.GetWidget<LabelWidget>("TITLE").GetText = () => Rules.Music[song].Title; item.GetWidget<LabelWidget>("TITLE").GetText = () => Rules.Music[song].Title;
item.GetWidget<LabelWidget>("LENGTH").GetText = () => "{0:D1}:{1:D2}".F(Rules.Music[song].Length / 60, Rules.Music[song].Length % 60); item.GetWidget<LabelWidget>("LENGTH").GetText =
() => WidgetUtils.FormatTimeSeconds( Rules.Music[song].Length );
ml.AddChild(item); ml.AddChild(item);
} }
} }