lenght -> length

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@964 b956fd51-792f-4845-bead-9b4dfca2ff2c

4 files changed, 42 insertions, 30 deletions

diff --git a/Game/Code/Screens/UScreenEditConvert.pas b/Game/Code/Screens/UScreenEditConvert.pas
index ed99e63e..6eb79d1c 100644
--- a/Game/Code/Screens/UScreenEditConvert.pas
+++ b/Game/Code/Screens/UScreenEditConvert.pas
@@ -341,7 +341,7 @@ begin
 
     // dopisuje
     Lines.Line[C].Note[N].Start := Note[Nu].Start;
-    Lines.Line[C].Note[N].Lenght := Note[Nu].Len;
+    Lines.Line[C].Note[N].Length := Note[Nu].Len;
     Lines.Line[C].Note[N].Tone := Note[Nu].Tone;
     Lines.Line[C].Note[N].Text := Note[Nu].Lyric;
     //All Notes are Freestyle when Converted Fix:
diff --git a/Game/Code/Screens/UScreenEditSub.pas b/Game/Code/Screens/UScreenEditSub.pas
index b9b76db6..33acd8fb 100644
--- a/Game/Code/Screens/UScreenEditSub.pas
+++ b/Game/Code/Screens/UScreenEditSub.pas
@@ -134,7 +134,7 @@ begin
       SDLK_BACKQUOTE:
         begin
           // Increase Note Length (same as Alt + Right)
-          Inc(Lines[0].Line[Lines[0].Current].Note[CurrentNote].Lenght);
+          Inc(Lines[0].Line[Lines[0].Current].Note[CurrentNote].Length);
           if CurrentNote = Lines[0].Line[Lines[0].Current].HighNote then
             Inc(Lines[0].Line[Lines[0].Current].End_);
         end;
@@ -367,7 +367,7 @@ begin
           AudioPlayback.Position := GetTimeFromBeat(Lines[0].Line[Lines[0].Current].Note[CurrentNote].Start);
           PlayStopTime := (GetTimeFromBeat(
             Lines[0].Line[Lines[0].Current].Note[CurrentNote].Start +
-            Lines[0].Line[Lines[0].Current].Note[CurrentNote].Lenght));
+            Lines[0].Line[Lines[0].Current].Note[CurrentNote].Length));
           AudioPlayback.Play;
           LastClick := -100;
         end;
@@ -407,8 +407,8 @@ begin
 
           // ctrl + right
           if SDL_ModState = KMOD_LCTRL then begin
-            if Lines[0].Line[Lines[0].Current].Note[CurrentNote].Lenght > 1 then begin
-              Dec(Lines[0].Line[Lines[0].Current].Note[CurrentNote].Lenght);
+            if Lines[0].Line[Lines[0].Current].Note[CurrentNote].Length > 1 then begin
+              Dec(Lines[0].Line[Lines[0].Current].Note[CurrentNote].Length);
               Inc(Lines[0].Line[Lines[0].Current].Note[CurrentNote].Start);
               if CurrentNote = 0 then begin
                 Inc(Lines[0].Line[Lines[0].Current].Start);
@@ -430,7 +430,7 @@ begin
 
           // alt + right
           if SDL_ModState = KMOD_LALT then begin
-            Inc(Lines[0].Line[Lines[0].Current].Note[CurrentNote].Lenght);
+            Inc(Lines[0].Line[Lines[0].Current].Note[CurrentNote].Length);
             if CurrentNote = Lines[0].Line[Lines[0].Current].HighNote then
               Inc(Lines[0].Line[Lines[0].Current].End_);
           end;
@@ -456,7 +456,7 @@ begin
           // ctrl + left
           if SDL_ModState = KMOD_LCTRL then begin
             Dec(Lines[0].Line[Lines[0].Current].Note[CurrentNote].Start);
-            Inc(Lines[0].Line[Lines[0].Current].Note[CurrentNote].Lenght);
+            Inc(Lines[0].Line[Lines[0].Current].Note[CurrentNote].Length);
             if CurrentNote = 0 then begin
               Dec(Lines[0].Line[Lines[0].Current].Start);
               Dec(Lines[0].Line[Lines[0].Current].StartNote);
@@ -480,8 +480,8 @@ begin
 
           // alt + left
           if SDL_ModState = KMOD_LALT then begin
-            if Lines[0].Line[Lines[0].Current].Note[CurrentNote].Lenght > 1 then begin
-              Dec(Lines[0].Line[Lines[0].Current].Note[CurrentNote].Lenght);
+            if Lines[0].Line[Lines[0].Current].Note[CurrentNote].Length > 1 then begin
+              Dec(Lines[0].Line[Lines[0].Current].Note[CurrentNote].Length);
               if CurrentNote = Lines[0].Line[Lines[0].Current].HighNote then
                 Dec(Lines[0].Line[Lines[0].Current].End_);
             end;
@@ -664,7 +664,7 @@ begin
     Lines[0].Line[C].End_ :=    Lines[0].Line[C].End_ div 2;
     for N := 0 to Lines[0].Line[C].HighNote do begin
       Lines[0].Line[C].Note[N].Start :=   Lines[0].Line[C].Note[N].Start div 2;
-      Lines[0].Line[C].Note[N].Lenght := Round(Lines[0].Line[C].Note[N].Lenght / 2);
+      Lines[0].Line[C].Note[N].Length := Round(Lines[0].Line[C].Note[N].Length / 2);
     end; // N
   end; // C
 end;
@@ -681,7 +681,7 @@ begin
     Lines[0].Line[C].End_ :=    Lines[0].Line[C].End_ * 2;
     for N := 0 to Lines[0].Line[C].HighNote do begin
       Lines[0].Line[C].Note[N].Start :=   Lines[0].Line[C].Note[N].Start * 2;
-      Lines[0].Line[C].Note[N].Lenght := Lines[0].Line[C].Note[N].Lenght * 2;
+      Lines[0].Line[C].Note[N].Length := Lines[0].Line[C].Note[N].Length * 2;
     end; // N
   end; // C
 end;
@@ -757,7 +757,7 @@ var
 begin
   for C := 1 to Lines[0].High do begin
     with Lines[0].Line[C-1] do begin
-      Min := Note[HighNote].Start + Note[HighNote].Lenght;
+      Min := Note[HighNote].Start + Note[HighNote].Length;
       Max := Lines[0].Line[C].StartNote;
       case (Max - Min) of
         0:    S := Max;
@@ -822,14 +822,14 @@ begin
     Inc(Lines[0].Line[CNew].IlNut);
     Inc(Lines[0].Line[CNew].HighNote);
     Lines[0].Line[CNew].End_ := Lines[0].Line[CNew].Note[NNewL].Start +
-      Lines[0].Line[CNew].Note[NNewL].Lenght;
+      Lines[0].Line[CNew].Note[NNewL].Length;
   end;
 
   // clear old notes and set sentence counters
   Lines[0].Line[CStart].HighNote := NStart - 1;
   Lines[0].Line[CStart].IlNut := Lines[0].Line[CStart].HighNote + 1;
   Lines[0].Line[CStart].End_ := Lines[0].Line[CStart].Note[NStart-1].Start +
-    Lines[0].Line[CStart].Note[NStart-1].Lenght;
+    Lines[0].Line[CStart].Note[NStart-1].Length;
   SetLength(Lines[0].Line[CStart].Note, Lines[0].Line[CStart].IlNut);
 
   // 0.5.0: modify BaseNote
@@ -869,7 +869,7 @@ begin
   // increase sentence counters
   NDst := Lines[0].Line[C].HighNote;
   Lines[0].Line[C].End_ := Lines[0].Line[C].Note[NDst].Start +
-    Lines[0].Line[C].Note[NDst].Lenght;
+    Lines[0].Line[C].Note[NDst].Length;
 
   // move needed sentences to one backward.
   for C := Lines[0].Current + 1 to Lines[0].High - 1 do
@@ -900,9 +900,9 @@ begin
   end;
 
   // me slightly modify new note
-  Lines[0].Line[C].Note[CurrentNote].Lenght := 1;
+  Lines[0].Line[C].Note[CurrentNote].Length := 1;
   Inc(Lines[0].Line[C].Note[CurrentNote+1].Start);
-  Dec(Lines[0].Line[C].Note[CurrentNote+1].Lenght);
+  Dec(Lines[0].Line[C].Note[CurrentNote+1].Length);
   Lines[0].Line[C].Note[CurrentNote+1].Text := '- ';
   Lines[0].Line[C].Note[CurrentNote+1].Color := 0;
 end;
@@ -1060,12 +1060,12 @@ begin
   Lines[0].Line[Dst].HighNote := Lines[0].Line[Src].HighNote;
   for N := 0 to Lines[0].Line[Src].HighNote do begin
     Lines[0].Line[Dst].Note[N].Text := Lines[0].Line[Src].Note[N].Text;
-    Lines[0].Line[Dst].Note[N].Lenght := Lines[0].Line[Src].Note[N].Lenght;
+    Lines[0].Line[Dst].Note[N].Length := Lines[0].Line[Src].Note[N].Length;
     Lines[0].Line[Dst].Note[N].Tone := Lines[0].Line[Src].Note[N].Tone;
     Lines[0].Line[Dst].Note[N].Start := Lines[0].Line[Src].Note[N].Start + TD;
   end;
   N := Lines[0].Line[Src].HighNote;
-  Lines[0].Line[Dst].End_ := Lines[0].Line[Dst].Note[N].Start + Lines[0].Line[Dst].Note[N].Lenght;
+  Lines[0].Line[Dst].End_ := Lines[0].Line[Dst].Note[N].Start + Lines[0].Line[Dst].Note[N].Length;
 end;
 
 procedure TScreenEditSub.CopySentences(Src, Dst, Num: integer);
@@ -1091,7 +1091,7 @@ begin
     Lines[0].Line[Dst + C].IlNut := 1;
     Lines[0].Line[Dst + C].HighNote := 0;
     Lines[0].Line[Dst + C].Note[0].Start := Lines[0].Line[Dst + C].Start;
-    Lines[0].Line[Dst + C].Note[0].Lenght := 1;
+    Lines[0].Line[Dst + C].Note[0].Length := 1;
     Lines[0].Line[Dst + C].StartNote := Lines[0].Line[Dst + C].Start;
     Lines[0].Line[Dst + C].End_ := Lines[0].Line[Dst + C].Start + 1;
   end;
@@ -1303,7 +1303,7 @@ begin
   begin
     // Note info
     Text[TextNStart].Text :=    IntToStr(Lines[0].Line[Lines[0].Current].Note[CurrentNote].Start);
-    Text[TextNDlugosc].Text :=  IntToStr(Lines[0].Line[Lines[0].Current].Note[CurrentNote].Lenght);
+    Text[TextNDlugosc].Text :=  IntToStr(Lines[0].Line[Lines[0].Current].Note[CurrentNote].Length);
     Text[TextNTon].Text :=      IntToStr(Lines[0].Line[Lines[0].Current].Note[CurrentNote].Tone) + ' ( ' + GetNoteName(Lines[0].Line[Lines[0].Current].Note[CurrentNote].Tone) + ' )';
     Text[TextNText].Text :=              Lines[0].Line[Lines[0].Current].Note[CurrentNote].Text;
   end;
diff --git a/Game/Code/Screens/UScreenSing.pas b/Game/Code/Screens/UScreenSing.pas
index 5c7916e4..23e9cb1e 100644
--- a/Game/Code/Screens/UScreenSing.pas
+++ b/Game/Code/Screens/UScreenSing.pas
@@ -223,7 +223,10 @@ begin
       LineState.CurrentTime := PauseTime; //Position of Notes
 
       // Position of Music
+      // FIXME: remove this and provide LineState.CurrentTime as sync-source instead
+      // so every stream can synch itself
       AudioPlayback.Position := PauseTime;
+
       // Play Music
       AudioPlayback.Play;
 
@@ -544,26 +547,32 @@ begin
         Lyrics.LineColor_act.B := 210/256;
         Lyrics.LineColor_act.A := 1;
 
-{        LyricSub.FontStyle := 0;
+        {
+        LyricSub.FontStyle := 0;
         LyricMain.Size := 14; // 13
         LyricSub.Size := 14; // 13
         LyricMain.ColR := Skin_FontR;
         LyricMain.ColG := Skin_FontG;
         LyricMain.ColB := Skin_FontB; //Change für Crazy Joker
-        {LyricMain.ColSR := Skin_FontHighlightR;
+        }
+        {
+        LyricMain.ColSR := Skin_FontHighlightR;
         LyricMain.ColSG := Skin_FontHighlightG;
-        LyricMain.ColSB := Skin_FontHighlightB;1aa5dc}{
+        LyricMain.ColSB := Skin_FontHighlightB;
+        }{
         LyricMain.ColSR := 5/255; //26
         LyricMain.ColSG := 163/255; //165
         LyricMain.ColSB := 210/255;  //220
 
         LyricSub.ColR := 0.4; //0.6
         LyricSub.ColG := 0.4; //0.6
-        LyricSub.ColB := 0.4; //0.6   }
+        LyricSub.ColB := 0.4; //0.6
+        }
       end;
     1:
       begin
- {       LyricMain.FontStyle := 2;
+        {
+        LyricMain.FontStyle := 2;
         LyricSub.FontStyle := 2;
         LyricMain.Size := 14;
         LyricSub.Size := 14;
@@ -575,7 +584,8 @@ begin
         LyricMain.ColSB := 1;
         LyricSub.ColR := 0.8;
         LyricSub.ColG := 0.8;
-        LyricSub.ColB := 0.8;   }
+        LyricSub.ColB := 0.8;
+        }
 
         Lyrics.UpperLineSize := 14;
         Lyrics.LowerLineSize := 14;
@@ -616,7 +626,8 @@ begin
         Lyrics.LineColor_act.G := 0.5;
         Lyrics.LineColor_act.B := 1;
         Lyrics.LineColor_act.A := 1;
-{        LyricSub.FontStyle := 3;
+        {
+        LyricSub.FontStyle := 3;
         LyricMain.Size := 12;
         LyricSub.Size := 12;
         LyricMain.ColR := 0.75;
@@ -627,7 +638,8 @@ begin
         LyricMain.ColSB := 1;
         LyricSub.ColR := 0.8;
         LyricSub.ColG := 0.8;
-        LyricSub.ColB := 0.8;}
+        LyricSub.ColB := 0.8;
+        }
       end;
   end; // case
 
diff --git a/Game/Code/Screens/UScreenSingModi.pas b/Game/Code/Screens/UScreenSingModi.pas
index c2b1be79..e22934cf 100644
--- a/Game/Code/Screens/UScreenSingModi.pas
+++ b/Game/Code/Screens/UScreenSingModi.pas
@@ -156,7 +156,7 @@ begin
     begin
       Result.Sentence[I].Note[J].Color     := Lines.Line[I].Note[J].Color;
       Result.Sentence[I].Note[J].Start     := Lines.Line[I].Note[J].Start;
-      Result.Sentence[I].Note[J].Length    := Lines.Line[I].Note[J].Lenght;
+      Result.Sentence[I].Note[J].Length    := Lines.Line[I].Note[J].Length;
       Result.Sentence[I].Note[J].Tone      := Lines.Line[I].Note[J].Tone;
       Result.Sentence[I].Note[J].ToneGamus := Lines.Line[I].Note[J].ToneGamus;
       //Result.Sentence[I].Note[J].Text      := Lines.Line[I].Note[J].Tekst;