aboutsummaryrefslogtreecommitdiffstats
path: root/Game/Code/Screens
diff options
context:
space:
mode:
authortobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c>2008-07-19 13:23:22 +0000
committertobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c>2008-07-19 13:23:22 +0000
commit1c3f711aea601fc0c19481ba0edfcc3d96c8abc8 (patch)
tree889c4f73883bdfd6610cf3dd58abbe04889a3365 /Game/Code/Screens
parentce53ddee9cbf4bd064fd84615cf3fef239142407 (diff)
downloadusdx-1c3f711aea601fc0c19481ba0edfcc3d96c8abc8.tar.gz
usdx-1c3f711aea601fc0c19481ba0edfcc3d96c8abc8.tar.xz
usdx-1c3f711aea601fc0c19481ba0edfcc3d96c8abc8.zip
renamed TLineState to TLyricsState
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1214 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to 'Game/Code/Screens')
-rw-r--r--Game/Code/Screens/UScreenSing.pas20
-rw-r--r--Game/Code/Screens/UScreenSingModi.pas4
2 files changed, 12 insertions, 12 deletions
diff --git a/Game/Code/Screens/UScreenSing.pas b/Game/Code/Screens/UScreenSing.pas
index a78c7ce0..d7050bf5 100644
--- a/Game/Code/Screens/UScreenSing.pas
+++ b/Game/Code/Screens/UScreenSing.pas
@@ -220,7 +220,7 @@ begin
// pause Time
Paused := true;
- LineState.Pause();
+ LyricsState.Pause();
// pause Music
AudioPlayback.Pause;
@@ -232,7 +232,7 @@ begin
end
else //disable Pause
begin
- LineState.Resume();
+ LyricsState.Resume();
// Play Music
AudioPlayback.Play;
@@ -510,14 +510,14 @@ begin
Tex_Background.TexNum := 0;
// prepare lyrics timer
- LineState.Reset();
- LineState.SetCurrentTime(CurrentSong.Start);
- LineState.StartTime := CurrentSong.Gap;
+ LyricsState.Reset();
+ LyricsState.SetCurrentTime(CurrentSong.Start);
+ LyricsState.StartTime := CurrentSong.Gap;
if (CurrentSong.Finish > 0) then
- LineState.TotalTime := CurrentSong.Finish / 1000
+ LyricsState.TotalTime := CurrentSong.Finish / 1000
else
- LineState.TotalTime := AudioPlayback.Length;
- LineState.UpdateBeats();
+ LyricsState.TotalTime := AudioPlayback.Length;
+ LyricsState.UpdateBeats();
// prepare music
AudioPlayback.Stop();
@@ -911,7 +911,7 @@ end;
procedure TScreenSing.onShowFinish;
begin
// start lyrics
- LineState.Resume();
+ LyricsState.Resume();
// start music
AudioPlayback.Play();
@@ -1069,7 +1069,7 @@ begin
// retrieve current lyrics time, we have to store the value to avoid
// that min- and sec-values do not match
- CurLyricsTime := LineState.GetCurrentTime();
+ CurLyricsTime := LyricsState.GetCurrentTime();
Min := Round(CurLyricsTime) div 60;
Sec := Round(CurLyricsTime) mod 60;
diff --git a/Game/Code/Screens/UScreenSingModi.pas b/Game/Code/Screens/UScreenSingModi.pas
index 3eeb0374..616ba1c1 100644
--- a/Game/Code/Screens/UScreenSingModi.pas
+++ b/Game/Code/Screens/UScreenSingModi.pas
@@ -512,7 +512,7 @@ begin
if DLLMan.Selected.LoadSong then
begin
// update static menu with time ...
- CurLyricsTime := LineState.GetCurrentTime();
+ CurLyricsTime := LyricsState.GetCurrentTime();
Min := Round(CurLyricsTime) div 60;
Sec := Round(CurLyricsTime) mod 60;
@@ -543,7 +543,7 @@ begin
if ShowFinish then begin
if DllMan.Selected.LoadSong then
begin
- if (not AudioPlayback.Finished) and ((CurrentSong.Finish = 0) or (LineState.GetCurrentTime*1000 <= CurrentSong.Finish)) then begin
+ if (not AudioPlayback.Finished) and ((CurrentSong.Finish = 0) or (LyricsState.GetCurrentTime*1000 <= CurrentSong.Finish)) then begin
//Pause Mod:
if not Paused then
Sing(Self); // analyze song