tried to make songloading working with the old loader and keep all changes that were made since

starting to work on a new one *hope that worked*

you may delete your existing cover.cache (the cover cache is still NOT working)


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

6 files changed, 838 insertions, 841 deletions

diff --git a/Game/Code/Screens/UScreenEditSub.pas b/Game/Code/Screens/UScreenEditSub.pas
index 8ca1c3f3..8d4a3335 100644
--- a/Game/Code/Screens/UScreenEditSub.pas
+++ b/Game/Code/Screens/UScreenEditSub.pas
@@ -128,11 +128,10 @@ begin
       'S':
         begin
           // Save Song
-          // to - do : new Song management
-          {if SDL_ModState = KMOD_LSHIFT then
+          if SDL_ModState = KMOD_LSHIFT then
             SaveSong(CurrentSong, Lines[0], CurrentSong.Path + CurrentSong.FileName, true)
           else
-            SaveSong(CurrentSong, Lines[0], CurrentSong.Path + CurrentSong.FileName, false);}
+            SaveSong(CurrentSong, Lines[0], CurrentSong.Path + CurrentSong.FileName, false);
 
           {if SDL_ModState = KMOD_LSHIFT or KMOD_LCTRL + KMOD_LALT then
             // Save Song
@@ -1143,14 +1142,14 @@ begin
 
   ResetSingTemp;
 
-  {try  // to - do : new Song management
+  try 
   //Check if File is XML
    if copy(CurrentSong.FileName,length(CurrentSong.FileName)-3,4) = '.xml'
     then Error := not CurrentSong.LoadXMLSong()
     else Error := not CurrentSong.LoadSong();
-  except }
+  except
     Error := True;
-  //end;
+  end;
 
   if Error then
   begin
@@ -1173,8 +1172,7 @@ begin
     Lines[0].Current := 0;
     CurrentNote := 0;
     Lines[0].Line[0].Note[0].Color := 1;
-    // to - do : new Song management
-    AudioPlayback.Open({CurrentSong.Path + }CurrentSong.Mp3);
+    AudioPlayback.Open(CurrentSong.Path + CurrentSong.Mp3);
     //Set Down Music Volume for Better hearability of Midi Sounds
     //Music.SetVolume(40);
 
diff --git a/Game/Code/Screens/UScreenPartyOptions.pas b/Game/Code/Screens/UScreenPartyOptions.pas
index 52e1671f..bd05e653 100644
--- a/Game/Code/Screens/UScreenPartyOptions.pas
+++ b/Game/Code/Screens/UScreenPartyOptions.pas
@@ -98,12 +98,12 @@ begin
           PartySession.Teams.Teaminfo[0].NumPlayers := NumPlayer1+1;
           PartySession.Teams.Teaminfo[1].NumPlayers := NumPlayer2+1;
           PartySession.Teams.Teaminfo[2].NumPlayers := NumPlayer3+1;}
-           // to - do : new Song management
+
           //Save Playlist
           PlaylistMan.Mode := TSingMode( Playlist );
           PlaylistMan.CurPlayList := High(Cardinal);
           //If Category Selected Search Category ID
-          {if Playlist = 1 then
+          if Playlist = 1 then
           begin
             J := -1;
             For I := 0 to high(CatSongs.Song) do
@@ -123,7 +123,7 @@ begin
               Exit;
           end
           else
-            PlaylistMan.CurPlayList := Playlist2;}
+            PlaylistMan.CurPlayList := Playlist2;
 
           //Start Party
           // to-do : Party
@@ -216,7 +216,7 @@ end;
 
 procedure TScreenPartyOptions.SetPlaylist2;
 var I: Integer;
-begin    // to - do : new Song management
+begin
   Case Playlist of
     0:
       begin
@@ -226,14 +226,14 @@ begin    // to - do : new Song management
     1:
       begin
         SetLength(IPlaylist2, 0);
-        {For I := 0 to high(CatSongs.Song) do
+        For I := 0 to high(CatSongs.Song) do
         begin
           If (CatSongs.Song[I].Main) then
           begin
             SetLength(IPlaylist2, Length(IPlaylist2) + 1);
             IPlaylist2[high(IPlaylist2)] := CatSongs.Song[I].Artist;
           end;
-        end; }
+        end;
 
         If (Length(IPlaylist2) = 0) then
         begin
@@ -243,16 +243,16 @@ begin    // to - do : new Song management
       end;
     2:
       begin
-        {if (Length(PlaylistMan.Playlists) > 0) then
+        if (Length(PlaylistMan.Playlists) > 0) then
         begin
           SetLength(IPlaylist2, Length(PlaylistMan.Playlists));
           PlaylistMan.GetNames(IPlaylist2);
         end
         else
-        begin}
+        begin
           SetLength(IPlaylist2, 1);
           IPlaylist2[0] := 'No Playlists found';
-        //end;
+        end;
       end;
   end;
 
diff --git a/Game/Code/Screens/UScreenSing.pas b/Game/Code/Screens/UScreenSing.pas
index ccf75441..f6b5a3c2 100644
--- a/Game/Code/Screens/UScreenSing.pas
+++ b/Game/Code/Screens/UScreenSing.pas
@@ -222,9 +222,9 @@ begin
       // pause Music
       AudioPlayback.Pause;
 
-      // pause Video   // to - do : new Song management
-      {if (CurrentSong.Video <> '') and FileExists(CurrentSong.Path + CurrentSong.Video) then
-        fCurrentVideoPlaybackEngine.Pause;}
+      // pause Video
+      if (CurrentSong.Video <> '') and FileExists(CurrentSong.Path + CurrentSong.Video) then
+        fCurrentVideoPlaybackEngine.Pause;
 
     end
   else              //disable Pause
@@ -239,9 +239,9 @@ begin
       // Play Music
       AudioPlayback.Play;
 
-      // Video    // to - do : new Song management
-      {if (CurrentSong.Video <> '') and FileExists(CurrentSong.Path + CurrentSong.Video) then
-        fCurrentVideoPlaybackEngine.Pause; }
+      // Video
+      if (CurrentSong.Video <> '') and FileExists(CurrentSong.Path + CurrentSong.Video) then
+        fCurrentVideoPlaybackEngine.Pause;
 
       Paused := false;
     end;
@@ -461,14 +461,14 @@ begin
   CurrentSong := CatSongs.Song[CatSongs.Selected];
 
   // FIXME: bad style, put the try-except into LoadSong() and not here
-  {try        // to - do : new Song management
+  try
   //Check if File is XML
   if copy(CurrentSong.FileName,length(CurrentSong.FileName)-3,4) = '.xml'
    then success := CurrentSong.LoadXMLSong()
    else success := CurrentSong.LoadSong();
-  except    }
+  except
     success := false;
-  //end;
+  end;
 
   if (not success) then
   begin
@@ -479,7 +479,7 @@ begin
       ScreenSong.SelectRandomSong();
     ScreenPopupError.ShowPopup (Language.Translate('ERROR_CORRUPT_SONG'));
     // FIXME: do we need this?
-    //CurrentSong.Path := CatSongs.Song[CatSongs.Selected].Path;
+    CurrentSong.Path := CatSongs.Song[CatSongs.Selected].Path;
     Exit;
   end;
 
@@ -492,8 +492,8 @@ begin
   fCurrentVideoPlaybackEngine.Close;
   fCurrentVideoPlaybackEngine := VideoPlayback;
 
-  // set movie  // to - do : new Song management
-  {CurrentSong.VideoLoaded := false;
+  // set movie
+  CurrentSong.VideoLoaded := false;
   fShowVisualization      := false;
   if (CurrentSong.Video <> '') and FileExists(CurrentSong.Path + CurrentSong.Video) then
   begin
@@ -504,14 +504,14 @@ begin
     fCurrentVideoPlaybackEngine.position := CurrentSong.VideoGAP + CurrentSong.Start;
 
     CurrentSong.VideoLoaded := true;
-  end; }
+  end;
 
   // set background
-  if (CurrentSong.Background <> '') { and (CurrentSong.VideoLoaded = false)} then
+  if (CurrentSong.Background <> '')  and (CurrentSong.VideoLoaded = false) then
     try
-      Tex_Background := Texture.LoadTexture({CurrentSong.Path + }CurrentSong.Background);
+      Tex_Background := Texture.LoadTexture(CurrentSong.Path + CurrentSong.Background);
     except
-      log.LogError('Background could not be loaded: ' + {CurrentSong.Path + }CurrentSong.Background);
+      log.LogError('Background could not be loaded: ' + CurrentSong.Path + CurrentSong.Background);
       Tex_Background.TexNum := -1;
     end
   else
@@ -914,8 +914,8 @@ end;
 procedure TScreenSing.onShowFinish;
 begin
   // play movie (II)
-    // to - do : new Song management
-  {if CurrentSong.VideoLoaded then
+
+  if CurrentSong.VideoLoaded then
   begin
     try
       fCurrentVideoPlaybackEngine.GetFrame(LineState.CurrentTime);
@@ -939,7 +939,7 @@ begin
        end;
      end;
     end;
-  end; }
+  end;
 
 
   // play music (II)
@@ -1184,8 +1184,8 @@ begin
   SingDrawBackground;
   // update and draw movie
   
-  if ShowFinish and    // to - do : new Song management
-     ( {CurrentSong.VideoLoaded or }fShowVisualization ) then
+  if ShowFinish and
+     ( CurrentSong.VideoLoaded or fShowVisualization ) then
 //  if ShowFinish then
   begin
 //    try
@@ -1303,13 +1303,13 @@ begin
     Log.BenchmarkEnd(0);
     Log.LogBenchmark('Creating files', 0);
   end;
-   // to - do : new Song management
-  {if CurrentSong.VideoLoaded then
+
+  if CurrentSong.VideoLoaded then
   begin
 //    CloseSmpeg;
     fCurrentVideoPlaybackEngine.Close;
     CurrentSong.VideoLoaded := false; // to prevent drawing closed video
-  end; }
+  end;
 
   SetFontItalic (False);
 end;
diff --git a/Game/Code/Screens/UScreenSingModi.pas b/Game/Code/Screens/UScreenSingModi.pas
index e1441684..480b9e11 100644
--- a/Game/Code/Screens/UScreenSingModi.pas
+++ b/Game/Code/Screens/UScreenSingModi.pas
@@ -1,700 +1,699 @@
-unit UScreenSingModi;

-

-interface

-

-{$IFDEF FPC}

-  {$MODE Delphi}

-{$ENDIF}

-

-{$I switches.inc}

-

-

-uses UMenu,

-     UMusic,

-     SDL,

-     SysUtils,

-     UFiles,

-     UTime,

-     USongs,

-     UIni,

-     ULog,

-     UTexture,

-     ULyrics,

-     TextGL,

-     OpenGL12,

-

-     UThemes,

-     //ULCD, //TODO: maybe LCD Support as Plugin?

-     UScreenSing,

-     ModiSDK;

-

-type

-  TScreenSingModi = class(TScreenSing)

-    protected

-    //paused: boolean; //Pause Mod

-    //PauseTime: Real;

-    //NumEmptySentences: integer;

-    public

-      //TextTime:           integer;

-

-      //StaticP1:           integer;

-      //StaticP1ScoreBG:    integer;

-      //TextP1:             integer;

-      //TextP1Score:        integer;

-

-      //StaticP2R:          integer;

-      //StaticP2RScoreBG:   integer;

-      //TextP2R:            integer;

-      //TextP2RScore:       integer;

-

-      //StaticP2M:          integer;

-      //StaticP2MScoreBG:   integer;

-      //TextP2M:            integer;

-      //TextP2MScore:       integer;

-

-      //StaticP3R:          integer;

-      //StaticP3RScoreBG:   integer;

-      //TextP3R:            integer;

-      //TextP3RScore:       integer;

-

-      //Tex_Background:     TTexture;

-      //FadeOut:            boolean;

-      //LyricMain:          TLyric;

-      //LyricSub:           TLyric;

-      Winner: Byte; //Who Wins

-      PlayerInfo: TPlayerInfo;

-      TeamInfo:   TTeamInfo;

-

-      constructor Create; override;

-      procedure onShow; override;

-      //procedure onShowFinish; override;

-      function ParseInput(PressedKey: Cardinal; CharCode: WideChar; PressedDown: Boolean): Boolean; override;

-      function Draw: boolean; override;

-      procedure Finish; override;

-      //procedure UpdateLCD; //TODO: maybe LCD Support as Plugin?

-      //procedure Pause; //Pause Mod(Toggles Pause)

-  end;

-

-type

+unit UScreenSingModi;
+
+interface
+
+{$IFDEF FPC}
+  {$MODE Delphi}
+{$ENDIF}
+
+{$I switches.inc}
+
+
+uses UMenu,
+     UMusic,
+     SDL,
+     SysUtils,
+     UFiles,
+     UTime,
+     USongs,
+     UIni,
+     ULog,
+     UTexture,
+     ULyrics,
+     TextGL,
+     OpenGL12,
+
+     UThemes,
+     //ULCD, //TODO: maybe LCD Support as Plugin?
+     UScreenSing,
+     ModiSDK;
+
+type
+  TScreenSingModi = class(TScreenSing)
+    protected
+    //paused: boolean; //Pause Mod
+    //PauseTime: Real;
+    //NumEmptySentences: integer;
+    public
+      //TextTime:           integer;
+
+      //StaticP1:           integer;
+      //StaticP1ScoreBG:    integer;
+      //TextP1:             integer;
+      //TextP1Score:        integer;
+
+      //StaticP2R:          integer;
+      //StaticP2RScoreBG:   integer;
+      //TextP2R:            integer;
+      //TextP2RScore:       integer;
+
+      //StaticP2M:          integer;
+      //StaticP2MScoreBG:   integer;
+      //TextP2M:            integer;
+      //TextP2MScore:       integer;
+
+      //StaticP3R:          integer;
+      //StaticP3RScoreBG:   integer;
+      //TextP3R:            integer;
+      //TextP3RScore:       integer;
+
+      //Tex_Background:     TTexture;
+      //FadeOut:            boolean;
+      //LyricMain:          TLyric;
+      //LyricSub:           TLyric;
+      Winner: Byte; //Who Wins
+      PlayerInfo: TPlayerInfo;
+      TeamInfo:   TTeamInfo;
+
+      constructor Create; override;
+      procedure onShow; override;
+      //procedure onShowFinish; override;
+      function ParseInput(PressedKey: Cardinal; CharCode: WideChar; PressedDown: Boolean): Boolean; override;
+      function Draw: boolean; override;
+      procedure Finish; override;
+      //procedure UpdateLCD; //TODO: maybe LCD Support as Plugin?
+      //procedure Pause; //Pause Mod(Toggles Pause)
+  end;
+
+type
   TCustomSoundEntry = record

     Filename : String;

     Stream   : TAudioPlaybackStream;

   end;

 

-var

-  //Custom Sounds

-  CustomSounds: array of TCustomSoundEntry;

-

-//Procedured for Plugin

-function LoadTex   (const Name: PChar; Typ: TTextureType): TsmallTexture; stdcall;

-//function Translate (const Name: PChar): PChar; stdcall;

-procedure Print (const Style, Size: Byte; const X, Y: Real; const Text: PChar); stdcall;       //Procedure to Print Text

-function LoadSound  (const Name: PChar): Cardinal; stdcall;       //Procedure that loads a Custom Sound

-procedure PlaySound (const Index: Cardinal); stdcall;       //Plays a Custom Sound

-

-//Utilys

-function ToSentences(Const Lines: TLines): TSentences;

-

-implementation

-uses UGraphic, UDraw, UMain, Classes, URecord, ULanguage, math, UDLLManager, USkins, UGraphicClasses;

-

-// Method for input parsing. If False is returned, GetNextWindow

-// should be checked to know the next window to load;

-function TScreenSingModi.ParseInput(PressedKey: Cardinal; CharCode: WideChar; PressedDown: Boolean): Boolean;

-begin

-  Result := true;

-  If (PressedDown) Then

-  begin // Key Down

-    case PressedKey of

-

-      SDLK_ESCAPE,

-      SDLK_BACKSPACE :

-        begin

-          Finish;

-          AudioPlayback.PlaySound(SoundLib.Back);

-          FadeTo(@ScreenPartyScore);

-        end;

-

-      else

-        Result := inherited ParseInput(PressedKey, CharCode, PressedDown);

-    end;

-  end;

-end;

-

-constructor TScreenSingModi.Create;

-begin

-  inherited Create;

-

-end;

-

-function ToSentences(Const Lines: TLines): TSentences;

-var

-  I, J: Integer;

-begin

-  Result.Current     := Lines.Current;

-  Result.High        := Lines.High;

-  Result.Number      := Lines.Number;

-  Result.Resolution  := Lines.Resolution;

-  Result.NotesGAP    := Lines.NotesGAP;

-  Result.TotalLength := Lines.ScoreValue;

-

-  SetLength(Result.Sentence, Length(Lines.Line));

-  for I := low(Result.Sentence) to high(Result.Sentence) do

-  begin

-    Result.Sentence[I].Start      := Lines.Line[I].Start;

-    Result.Sentence[I].StartNote  := Lines.Line[I].Note[0].Start;

-    Result.Sentence[I].Lyric      := Lines.Line[I].Lyric;

-    Result.Sentence[I].LyricWidth := Lines.Line[I].LyricWidth;

-    Result.Sentence[I].End_       := Lines.Line[I].End_;

-    Result.Sentence[I].BaseNote   := Lines.Line[I].BaseNote;

-    Result.Sentence[I].HighNote   := Lines.Line[I].HighNote;

-    Result.Sentence[I].TotalNotes := Lines.Line[I].TotalNotes;

-

-    SetLength(Result.Sentence[I].Note, Length(Lines.Line[I].Note));

-    for J := low(Result.Sentence[I].Note) to high(Result.Sentence[I].Note) do

-    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].Length;

-      Result.Sentence[I].Note[J].Tone      := Lines.Line[I].Note[J].Tone;

-      //Result.Sentence[I].Note[J].Text      := Lines.Line[I].Note[J].Tekst;

-      Result.Sentence[I].Note[J].FreeStyle := (Lines.Line[I].Note[J].NoteType = ntFreestyle);

-      Result.Sentence[I].Note[J].Typ       := Ord(Lines.Line[I].Note[J].NoteType);

-    end;

-  end;

-end;

-

-procedure TScreenSingModi.onShow;

-var

-  I: Integer;

-begin

-  inherited;

-

-  PlayersPlay := TeamInfo.NumTeams;

-

-  if DLLMan.Selected.LoadSong then //Start with Song

-  begin

-    inherited;

-  end

-  else //Start Without Song

-  begin

-    AudioInput.CaptureStart;

-  end;

-

-//Set Playerinfo

-  PlayerInfo.NumPlayers := PlayersPlay;

-  for I := 0 to PlayerInfo.NumPlayers-1 do

-  begin

-    PlayerInfo.Playerinfo[I].Name    := PChar(Ini.Name[I]);

-    PlayerInfo.Playerinfo[I].Score   := 0;

-    PlayerInfo.Playerinfo[I].Bar     := 50;

-    PlayerInfo.Playerinfo[I].Enabled := True;

-  end;

-

-  for I := PlayerInfo.NumPlayers to high(PlayerInfo.Playerinfo) do

-  begin

-    PlayerInfo.Playerinfo[I].Score:=  0;

-    PlayerInfo.Playerinfo[I].Bar :=  0;

-    PlayerInfo.Playerinfo[I].Enabled := False;

-  end;

-

-  {Case PlayersPlay of

-    1: begin

-      PlayerInfo.Playerinfo[0].PosX := Static[StaticP1ScoreBG].Texture.X;

-      PlayerInfo.Playerinfo[0].PosY := Static[StaticP1ScoreBG].Texture.Y + Static[StaticP1ScoreBG].Texture.H;

-    end;

-    2,4: begin

-      PlayerInfo.Playerinfo[0].PosX := Static[StaticP1TwoPScoreBG].Texture.X;

-      PlayerInfo.Playerinfo[0].PosY := Static[StaticP1TwoPScoreBG].Texture.Y + Static[StaticP1TwoPScoreBG].Texture.H;

-      PlayerInfo.Playerinfo[2].PosX := Static[StaticP1TwoPScoreBG].Texture.X;

-      PlayerInfo.Playerinfo[2].PosY := Static[StaticP1TwoPScoreBG].Texture.Y + Static[StaticP1TwoPScoreBG].Texture.H;

-      PlayerInfo.Playerinfo[1].PosX := Static[StaticP2RScoreBG].Texture.X;

-      PlayerInfo.Playerinfo[1].PosY := Static[StaticP2RScoreBG].Texture.Y + Static[StaticP2RScoreBG].Texture.H;

-      PlayerInfo.Playerinfo[3].PosX := Static[StaticP2RScoreBG].Texture.X;

-      PlayerInfo.Playerinfo[3].PosY := Static[StaticP2RScoreBG].Texture.Y + Static[StaticP2RScoreBG].Texture.H;

-    end;

-    3,6: begin

-      PlayerInfo.Playerinfo[0].PosX := Static[StaticP1ThreePScoreBG].Texture.X;

-      PlayerInfo.Playerinfo[0].PosY := Static[StaticP1ThreePScoreBG].Texture.Y + Static[StaticP1ThreePScoreBG].Texture.H;

-      PlayerInfo.Playerinfo[3].PosX := Static[StaticP1ThreePScoreBG].Texture.X;

-      PlayerInfo.Playerinfo[3].PosY := Static[StaticP1ThreePScoreBG].Texture.Y + Static[StaticP1ThreePScoreBG].Texture.H;

-      PlayerInfo.Playerinfo[1].PosX := Static[StaticP2MScoreBG].Texture.X;

-      PlayerInfo.Playerinfo[1].PosY := Static[StaticP2MScoreBG].Texture.Y + Static[StaticP2MScoreBG].Texture.H;

-      PlayerInfo.Playerinfo[4].PosX := Static[StaticP2MScoreBG].Texture.X;

-      PlayerInfo.Playerinfo[4].PosY := Static[StaticP2MScoreBG].Texture.Y + Static[StaticP2MScoreBG].Texture.H;

-      PlayerInfo.Playerinfo[2].PosX := Static[StaticP3RScoreBG].Texture.X;

-      PlayerInfo.Playerinfo[2].PosY := Static[StaticP3RScoreBG].Texture.Y + Static[StaticP3RScoreBG].Texture.H;

-      PlayerInfo.Playerinfo[5].PosX := Static[StaticP3RScoreBG].Texture.X;

-      PlayerInfo.Playerinfo[5].PosY := Static[StaticP3RScoreBG].Texture.Y + Static[StaticP3RScoreBG].Texture.H;

-    end;

-  end;       }

-

-  // play music (I)

-  //Music.CaptureStart;

-  //Music.MoveTo(AktSong.Start);

-

-  //Init Plugin

-  if not DLLMan.PluginInit(TeamInfo, PlayerInfo, ToSentences(Lines[0]), LoadTex, Print, LoadSound, PlaySound) then

-  begin

-    //Fehler

-    Log.LogError('Could not Init Plugin');

-    Halt;

-  end;

-

-  // Set Background (Little Workaround, maybe change sometime)

-  if (DLLMan.Selected.LoadBack) AND (DLLMan.Selected.LoadSong) then

-    ScreenSing.Tex_Background := Tex_Background;

-

-  Winner := 0;

-

-  //Set Score Visibility

-  {if PlayersPlay = 1 then begin

-    Text[TextP1Score].Visible := DLLMan.Selected.ShowScore;

-    Static[StaticP1ScoreBG].Visible := DLLMan.Selected.ShowScore;

-  end;

-

-  if (PlayersPlay = 2) OR (PlayersPlay = 4) then begin

-    Text[TextP1TwoPScore].Visible := DLLMan.Selected.ShowScore;

-    Static[StaticP1TwoPScoreBG].Visible := DLLMan.Selected.ShowScore;

-

-    Text[TextP2RScore].Visible := DLLMan.Selected.ShowScore;

-    Static[StaticP2RScoreBG].Visible := DLLMan.Selected.ShowScore;

-  end;

-

-  if (PlayersPlay = 3) OR (PlayersPlay = 6) then begin

-    Text[TextP1ThreePScore].Visible := DLLMan.Selected.ShowScore;

-    Static[StaticP1ThreePScoreBG].Visible := DLLMan.Selected.ShowScore;

-

-    Text[TextP2MScore].Visible := DLLMan.Selected.ShowScore;

-    Static[StaticP2MScoreBG].Visible := DLLMan.Selected.ShowScore;

-

-    Text[TextP3RScore].Visible := DLLMan.Selected.ShowScore;

-    Static[StaticP3RScoreBG].Visible := DLLMan.Selected.ShowScore;

-  end; }

-end;

-

-function TScreenSingModi.Draw: boolean;

-var

-  Min:    integer;

-  Sec:    integer;

-  Tekst:  string;

-  S, I:      integer;

-  T:      integer;

-begin

-  Result := false;

-

-  //Set Playerinfo

-  PlayerInfo.NumPlayers := PlayersPlay;

-  for I := 0 to PlayerInfo.NumPlayers-1 do

-  begin

-    PlayerInfo.Playerinfo[I].Name := PChar(Player[I].Name);

-    if PlayerInfo.Playerinfo[I].Enabled then

-    begin

-      if (Player[I].ScoreTotalI<=10000) then

-        PlayerInfo.Playerinfo[I].Score:=  Player[I].ScoreTotalI;

-      PlayerInfo.Playerinfo[I].Bar :=  Round(Scores.Players[I].RBPos * 100);

-    end;

-  end;

-

-  //Show Score

-  if DLLMan.Selected.ShowScore then

-  begin

-    {//ScoreBG Mod

-    // set player colors

-    if PlayersPlay = 4 then begin

-      if ScreenAct = 1 then begin

-        LoadColor(Static[StaticP1TwoP].Texture.ColR, Static[StaticP1TwoP].Texture.ColG,

-        Static[StaticP1TwoP].Texture.ColB, 'P1Dark');

-        LoadColor(Static[StaticP2R].Texture.ColR, Static[StaticP2R].Texture.ColG,

-        Static[StaticP2R].Texture.ColB, 'P2Dark');

-

-

-

-        LoadColor(Static[StaticP1TwoPScoreBG].Texture.ColR, Static[StaticP1TwoPScoreBG].Texture.ColG,

-        Static[StaticP1TwoPScoreBG].Texture.ColB, 'P1Dark');

-        LoadColor(Static[StaticP2RScoreBG].Texture.ColR, Static[StaticP2RScoreBG].Texture.ColG,

-        Static[StaticP2RScoreBG].Texture.ColB, 'P2Dark');

-

-

-

-      end;

-      if ScreenAct = 2 then begin

-        LoadColor(Static[StaticP1TwoP].Texture.ColR, Static[StaticP1TwoP].Texture.ColG,

-          Static[StaticP1TwoP].Texture.ColB, 'P3Dark');

-        LoadColor(Static[StaticP2R].Texture.ColR, Static[StaticP2R].Texture.ColG,

-          Static[StaticP2R].Texture.ColB, 'P4Dark');

-

-

-

-        LoadColor(Static[StaticP1TwoPScoreBG].Texture.ColR, Static[StaticP1TwoPScoreBG].Texture.ColG,

-          Static[StaticP1TwoPScoreBG].Texture.ColB, 'P3Dark');

-        LoadColor(Static[StaticP2RScoreBG].Texture.ColR, Static[StaticP2RScoreBG].Texture.ColG,

-          Static[StaticP2RScoreBG].Texture.ColB, 'P4Dark');

-

-

-

-       end;

-    end;

-

-    if PlayersPlay = 6 then begin

-      if ScreenAct = 1 then begin

-        LoadColor(Static[StaticP1ThreeP].Texture.ColR, Static[StaticP1ThreeP].Texture.ColG,

-          Static[StaticP1ThreeP].Texture.ColB, 'P1Dark');

-        LoadColor(Static[StaticP2M].Texture.ColR, Static[StaticP2M].Texture.ColG,

-          Static[StaticP2R].Texture.ColB, 'P2Dark');

-        LoadColor(Static[StaticP3R].Texture.ColR, Static[StaticP3R].Texture.ColG,

-          Static[StaticP3R].Texture.ColB, 'P3Dark');

-

-

-

-        LoadColor(Static[StaticP1ThreePScoreBG].Texture.ColR, Static[StaticP1ThreePScoreBG].Texture.ColG,

-          Static[StaticP1ThreePScoreBG].Texture.ColB, 'P1Dark');

-        LoadColor(Static[StaticP2MScoreBG].Texture.ColR, Static[StaticP2MScoreBG].Texture.ColG,

-          Static[StaticP2RScoreBG].Texture.ColB, 'P2Dark');

-        LoadColor(Static[StaticP3RScoreBG].Texture.ColR, Static[StaticP3RScoreBG].Texture.ColG,

-          Static[StaticP3RScoreBG].Texture.ColB, 'P3Dark');

-

-

-

-      end;

-      if ScreenAct = 2 then begin

-        LoadColor(Static[StaticP1ThreeP].Texture.ColR, Static[StaticP1ThreeP].Texture.ColG,

-          Static[StaticP1ThreeP].Texture.ColB, 'P4Dark');

-        LoadColor(Static[StaticP2M].Texture.ColR, Static[StaticP2M].Texture.ColG,

-          Static[StaticP2R].Texture.ColB, 'P5Dark');

-        LoadColor(Static[StaticP3R].Texture.ColR, Static[StaticP3R].Texture.ColG,

-          Static[StaticP3R].Texture.ColB, 'P6Dark');

-

-

-

-

-        LoadColor(Static[StaticP1ThreePScoreBG].Texture.ColR, Static[StaticP1ThreePScoreBG].Texture.ColG,

-          Static[StaticP1ThreePScoreBG].Texture.ColB, 'P4Dark');

-        LoadColor(Static[StaticP2MScoreBG].Texture.ColR, Static[StaticP2MScoreBG].Texture.ColG,

-          Static[StaticP2RScoreBG].Texture.ColB, 'P5Dark');

-        LoadColor(Static[StaticP3RScoreBG].Texture.ColR, Static[StaticP3RScoreBG].Texture.ColG,

-          Static[StaticP3RScoreBG].Texture.ColB, 'P6Dark');

-

-

-

-

-      end;

-    end;

-    //end ScoreBG Mod }

-

-    // set player names (for 2 screens and only Singstar skin)

-    if ScreenAct = 1 then begin

-      Text[TextP1].Text       := 'P1';

-      Text[TextP1TwoP].Text   := 'P1'; // added for ps3 skin

-      Text[TextP1ThreeP].Text := 'P1'; // added for ps3 skin

-      Text[TextP2R].Text      := 'P2';

-      Text[TextP2M].Text      := 'P2';

-      Text[TextP3R].Text      := 'P3';

-    end;

-

-    if ScreenAct = 2 then begin

-      case PlayersPlay of

-        4:  begin

-              Text[TextP1TwoP].Text := 'P3';

-              Text[TextP2R].Text := 'P4';

-            end;

-        6:  begin

-              Text[TextP1ThreeP].Text := 'P4';

-              Text[TextP2M].Text := 'P5';

-              Text[TextP3R].Text := 'P6';

-            end;

-      end; // case

-    end; // if

-

-

-    // stereo   <- and where iss P2M? or P3?

-    Static[StaticP1].Texture.X := Static[StaticP1].Texture.X + 10*ScreenX;

-    Text[TextP1].X := Text[TextP1].X + 10*ScreenX;

-

-    {Static[StaticP1ScoreBG].Texture.X := Static[StaticP1ScoreBG].Texture.X + 10*ScreenX;

-    Text[TextP1Score].X := Text[TextP1Score].X + 10*ScreenX;}

-

-    Static[StaticP2R].Texture.X := Static[StaticP2R].Texture.X + 10*ScreenX;

-    Text[TextP2R].X := Text[TextP2R].X + 10*ScreenX;

-

-    {Static[StaticP2RScoreBG].Texture.X := Static[StaticP2RScoreBG].Texture.X + 10*ScreenX;

-    Text[TextP2RScore].X := Text[TextP2RScore].X + 10*ScreenX;}

-

-    // .. and scores

-    {if PlayersPlay = 1 then begin

-      Tekst := IntToStr(Player[0].ScoreTotalI);

-      while Length(Tekst) < 5 do Tekst := '0' + Tekst;

-      Text[TextP1Score].Text := Tekst;

-    end;

-

-    if PlayersPlay = 2 then begin

-      Tekst := IntToStr(Player[0].ScoreTotalI);

-      while Length(Tekst) < 5 do Tekst := '0' + Tekst;

-      Text[TextP1TwoPScore].Text := Tekst;

-

-      Tekst := IntToStr(Player[1].ScoreTotalI);

-      while Length(Tekst) < 5 do Tekst := '0' + Tekst;

-      Text[TextP2RScore].Text := Tekst;

-    end;

-

-    if PlayersPlay = 3 then begin

-      Tekst := IntToStr(Player[0].ScoreTotalI);

-      while Length(Tekst) < 5 do Tekst := '0' + Tekst;

-      Text[TextP1ThreePScore].Text := Tekst;

-

-      Tekst := IntToStr(Player[1].ScoreTotalI);

-      while Length(Tekst) < 5 do Tekst := '0' + Tekst;

-      Text[TextP2MScore].Text := Tekst;

-

-      Tekst := IntToStr(Player[2].ScoreTotalI);

-      while Length(Tekst) < 5 do Tekst := '0' + Tekst;

-      Text[TextP3RScore].Text := Tekst;

-    end;

-

-    if PlayersPlay = 4 then begin

-      if ScreenAct = 1 then begin

-        Tekst := IntToStr(Player[0].ScoreTotalI);

-        while Length(Tekst) < 5 do Tekst := '0' + Tekst;

-        Text[TextP1TwoPScore].Text := Tekst;

-

-        Tekst := IntToStr(Player[1].ScoreTotalI);

-        while Length(Tekst) < 5 do Tekst := '0' + Tekst;

-        Text[TextP2RScore].Text := Tekst;

-      end;

-      if ScreenAct = 2 then begin

-        Tekst := IntToStr(Player[2].ScoreTotalI);

-        while Length(Tekst) < 5 do Tekst := '0' + Tekst;

-        Text[TextP1TwoPScore].Text := Tekst;

-

-        Tekst := IntToStr(Player[3].ScoreTotalI);

-        while Length(Tekst) < 5 do Tekst := '0' + Tekst;

-        Text[TextP2RScore].Text := Tekst;

-      end;

-    end;

-

-    if PlayersPlay = 6 then begin

-      if ScreenAct = 1 then begin

-        Tekst := IntToStr(Player[0].ScoreTotalI);

-        while Length(Tekst) < 5 do Tekst := '0' + Tekst;

-        Text[TextP1ThreePScore].Text := Tekst;

-

-        Tekst := IntToStr(Player[1].ScoreTotalI);

-        while Length(Tekst) < 5 do Tekst := '0' + Tekst;

-        Text[TextP2MScore].Text := Tekst;

-

-        Tekst := IntToStr(Player[2].ScoreTotalI);

-        while Length(Tekst) < 5 do Tekst := '0' + Tekst;

-        Text[TextP3RScore].Text := Tekst;

-      end;

-      if ScreenAct = 2 then begin

-        Tekst := IntToStr(Player[3].ScoreTotalI);

-        while Length(Tekst) < 5 do Tekst := '0' + Tekst;

-        Text[TextP1ThreePScore].Text := Tekst;

-

-        Tekst := IntToStr(Player[4].ScoreTotalI);

-        while Length(Tekst) < 5 do Tekst := '0' + Tekst;

-        Text[TextP2MScore].Text := Tekst;

-

-        Tekst := IntToStr(Player[5].ScoreTotalI);

-        while Length(Tekst) < 5 do Tekst := '0' + Tekst;

-        Text[TextP3RScore].Text := Tekst;

-      end;

-    end;   }

-

-  end; //ShowScore

-

-  for S := 1 to 1 do

-    Static[S].Texture.X := Static[S].Texture.X + 10*ScreenX;

-

-  for T := 0 to 1 do

-    Text[T].X := Text[T].X + 10*ScreenX;

-

-  if DLLMan.Selected.LoadSong then

-  begin

-    // update static menu with time ...

-    Min := Round(LineState.CurrentTime) div 60;

-    Sec := Round(LineState.CurrentTime) mod 60;

-    Text[TextTimeText].Text := '';

-    if Min < 10 then Text[TextTimeText].Text := '0';

-    Text[TextTimeText].Text := Text[TextTimeText].Text + IntToStr(Min) + ':';

-    if Sec < 10 then Text[TextTimeText].Text := Text[TextTimeText].Text + '0';

-    Text[TextTimeText].Text := Text[TextTimeText].Text + IntToStr(Sec);

-  end;

-

-  // draw static menu (BG)

-  DrawBG;

-

-  //Draw Background

-  if (DllMan.Selected.LoadSong) AND (DllMan.Selected.LoadBack) then

-    SingDrawBackground;

-

-  // comment by blindy: wo zum henker wird denn in diesem screen ein video abgespielt?

-  // update and draw movie

-  // <mog> wie wo wadd? also in der selben funktion in der uscreensing kommt des video in der zeile 995, oder was wollteste wissen? :X

-{  if ShowFinish and CurrentSong.VideoLoaded AND DllMan.Selected.LoadVideo then begin

-    UpdateSmpeg; // this only draws

-  end;}

-

-  // draw static menu (FG)

-  DrawFG;

-

-  if ShowFinish then begin

-    if DllMan.Selected.LoadSong then

-    begin

-      if (not AudioPlayback.Finished) and ((CurrentSong.Finish = 0) or (LineState.CurrentTime*1000 <= CurrentSong.Finish)) then begin

-        //Pause Mod:

-        if not Paused then

-          Sing(Self);       // analyze song

-      end else begin

-        if not FadeOut then begin

-          Finish;

-          FadeOut := true;

-          FadeTo(@ScreenPartyScore);

-        end;

-      end;

-    end;

-  end;

-

-  // draw custom items

-  SingModiDraw(PlayerInfo);  // always draw

-

-  //GoldenNoteStarsTwinkle Mod

-    GoldenRec.SpawnRec;

-  //GoldenNoteStarsTwinkle Mod

-

-  //Update PlayerInfo

-  for I := 0 to PlayerInfo.NumPlayers-1 do

-  begin

-    if PlayerInfo.Playerinfo[I].Enabled then

-    begin

-      //PlayerInfo.Playerinfo[I].Bar :=  Player[I].ScorePercent;

-      PlayerInfo.Playerinfo[I].Score := Player[I].ScoreTotalI;

-    end;

-  end;

-

-  if ((ShowFinish) AND (NOT Paused)) then

-  begin

-    if not DLLMan.PluginDraw(Playerinfo, Lines[0].Current) then

-    begin

-      if not FadeOut then begin

-          Finish;

-          FadeOut := true;

-          FadeTo(@ScreenPartyScore);

-      end;

-    end;   

-  end;

-

-  //Change PlayerInfo/Changeables

-  for I := 0 to PlayerInfo.NumPlayers-1 do

-  begin

-    if (Player[I].ScoreTotalI <> PlayerInfo.Playerinfo[I].Score) then

-    begin

-      //Player[I].ScoreTotal   := Player[I].ScoreTotal + (PlayerInfo.Playerinfo[I].Score - Player[I].ScoreTotalI);

-      Player[I].ScoreTotalI := PlayerInfo.Playerinfo[I].Score;

-    end;

-    {if (PlayerInfo.Playerinfo[I].Bar <> Player[I].ScorePercent) then

-      Player[I].ScorePercentTarget := PlayerInfo.Playerinfo[I].Bar; }

-  end;

-

-  // back stereo

-  Static[StaticP1].Texture.X := Static[StaticP1].Texture.X - 10*ScreenX;

-  Text[TextP1].X := Text[TextP1].X - 10*ScreenX;

-

-  {Static[StaticP1ScoreBG].Texture.X := Static[StaticP1ScoreBG].Texture.X - 10*ScreenX;

-  Text[TextP1Score].X := Text[TextP1Score].X - 10*ScreenX;}

-

-

-  Static[StaticP2R].Texture.X := Static[StaticP2R].Texture.X - 10*ScreenX;

-  Text[TextP2R].X := Text[TextP2R].X - 10*ScreenX;

-

-  {Static[StaticP2RScoreBG].Texture.X := Static[StaticP2RScoreBG].Texture.X - 10*ScreenX;

-  Text[TextP2RScore].X := Text[TextP2RScore].X - 10*ScreenX;}

-

-

-  for S := 1 to 1 do

-    Static[S].Texture.X := Static[S].Texture.X - 10*ScreenX;

-

-  for T := 0 to 1 do

-    Text[T].X := Text[T].X - 10*ScreenX;

-

-  Result := true;

-end;

-

-procedure TScreenSingModi.Finish;

-begin

-inherited Finish;

-

-Winner := DllMan.PluginFinish(PlayerInfo);

-

-//Log.LogError('Winner: ' + InttoStr(Winner));

-

-//DLLMan.UnLoadPlugin;

-end;

-

-function LoadTex (const Name: PChar; Typ: TTextureType): TsmallTexture; stdcall;

-var

-  Texname, EXT: String;

-  Tex: TTexture;

-begin

-  //Get texture Name

-  TexName := Skin.GetTextureFileName(String(Name));

-  //Get File Typ

-  Ext := ExtractFileExt(TexName);

-  if (uppercase(Ext) = '.JPG') then

-    Ext := 'JPG'

-  else

-    Ext := 'BMP';

-

-  Tex := Texture.LoadTexture(TexName, UTexture.TTextureType(Typ), 0);

-

-  Result.TexNum := Tex.TexNum;

-  Result.W := Tex.W;

-  Result.H := Tex.H;

-end;

-{

-function Translate (const Name: PChar): PChar; stdcall;

-begin

-  Result := PChar(Language.Translate(String(Name)));

-end; }

-

-procedure Print (const Style, Size: Byte; const X, Y: Real; const Text: PChar); stdcall;       //Procedure to Print Text

-begin

-  SetFontItalic ((Style and 128) = 128);

-  SetFontStyle(Style and 7);

-  SetFontSize(Size);

-  SetFontPos (X, Y);

-  glPrint (PChar(Language.Translate(String(Text))));

-end;

-

-function LoadSound  (const Name: PChar): Cardinal; stdcall;       //Procedure that loads a Custom Sound

-var

-  S: TAudioPlaybackStream;

-  I: Integer;

-  F: String;

-begin

-  //Search for Sound in already loaded Sounds

-  F := UpperCase(SoundPath + FileName);

-  For I := 0 to High(CustomSounds) do

-  begin

-    if (UpperCase(CustomSounds[I].Filename) = F) then

-    begin

-      Result := I;

-      Exit;

-    end;

-  end;

-

-  S := AudioPlayback.OpenSound(SoundPath + String(Name));

-  if (S <> nil) then

-    Result := High(CustomSounds)

-  else

-    Result := 0;

-end;

-

-procedure PlaySound (const Index: Cardinal); stdcall;       //Plays a Custom Sound

-begin

-  if (Index <= High(CustomSounds)) then

-    AudioPlayback.PlaySound(CustomSounds[Index].Stream);

-end;

-

-end.

-

+var
+  //Custom Sounds
+  CustomSounds: array of TCustomSoundEntry;
+
+//Procedured for Plugin
+function LoadTex   (const Name: PChar; Typ: TTextureType): TsmallTexture; stdcall;
+//function Translate (const Name: PChar): PChar; stdcall;
+procedure Print (const Style, Size: Byte; const X, Y: Real; const Text: PChar); stdcall;       //Procedure to Print Text
+function LoadSound  (const Name: PChar): Cardinal; stdcall;       //Procedure that loads a Custom Sound
+procedure PlaySound (const Index: Cardinal); stdcall;       //Plays a Custom Sound
+
+//Utilys
+function ToSentences(Const Lines: TLines): TSentences;
+
+implementation
+uses UGraphic, UDraw, UMain, Classes, URecord, ULanguage, math, UDLLManager, USkins, UGraphicClasses;
+
+// Method for input parsing. If False is returned, GetNextWindow
+// should be checked to know the next window to load;
+function TScreenSingModi.ParseInput(PressedKey: Cardinal; CharCode: WideChar; PressedDown: Boolean): Boolean;
+begin
+  Result := true;
+  If (PressedDown) Then
+  begin // Key Down
+    case PressedKey of
+
+      SDLK_ESCAPE,
+      SDLK_BACKSPACE :
+        begin
+          Finish;
+          AudioPlayback.PlaySound(SoundLib.Back);
+          FadeTo(@ScreenPartyScore);
+        end;
+
+      else
+        Result := inherited ParseInput(PressedKey, CharCode, PressedDown);
+    end;
+  end;
+end;
+
+constructor TScreenSingModi.Create;
+begin
+  inherited Create;
+
+end;
+
+function ToSentences(Const Lines: TLines): TSentences;
+var
+  I, J: Integer;
+begin
+  Result.Current     := Lines.Current;
+  Result.High        := Lines.High;
+  Result.Number      := Lines.Number;
+  Result.Resolution  := Lines.Resolution;
+  Result.NotesGAP    := Lines.NotesGAP;
+  Result.TotalLength := Lines.ScoreValue;
+
+  SetLength(Result.Sentence, Length(Lines.Line));
+  for I := low(Result.Sentence) to high(Result.Sentence) do
+  begin
+    Result.Sentence[I].Start      := Lines.Line[I].Start;
+    Result.Sentence[I].StartNote  := Lines.Line[I].Note[0].Start;
+    Result.Sentence[I].Lyric      := Lines.Line[I].Lyric;
+    Result.Sentence[I].LyricWidth := Lines.Line[I].LyricWidth;
+    Result.Sentence[I].End_       := Lines.Line[I].End_;
+    Result.Sentence[I].BaseNote   := Lines.Line[I].BaseNote;
+    Result.Sentence[I].HighNote   := Lines.Line[I].HighNote;
+    Result.Sentence[I].TotalNotes := Lines.Line[I].TotalNotes;
+
+    SetLength(Result.Sentence[I].Note, Length(Lines.Line[I].Note));
+    for J := low(Result.Sentence[I].Note) to high(Result.Sentence[I].Note) do
+    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].Length;
+      Result.Sentence[I].Note[J].Tone      := Lines.Line[I].Note[J].Tone;
+      //Result.Sentence[I].Note[J].Text      := Lines.Line[I].Note[J].Tekst;
+      Result.Sentence[I].Note[J].FreeStyle := (Lines.Line[I].Note[J].NoteType = ntFreestyle);
+    end;
+  end;
+end;
+
+procedure TScreenSingModi.onShow;
+var
+  I: Integer;
+begin
+  inherited;
+
+  PlayersPlay := TeamInfo.NumTeams;
+
+  if DLLMan.Selected.LoadSong then //Start with Song
+  begin
+    inherited;
+  end
+  else //Start Without Song
+  begin
+    AudioInput.CaptureStart;
+  end;
+
+//Set Playerinfo
+  PlayerInfo.NumPlayers := PlayersPlay;
+  for I := 0 to PlayerInfo.NumPlayers-1 do
+  begin
+    PlayerInfo.Playerinfo[I].Name    := PChar(Ini.Name[I]);
+    PlayerInfo.Playerinfo[I].Score   := 0;
+    PlayerInfo.Playerinfo[I].Bar     := 50;
+    PlayerInfo.Playerinfo[I].Enabled := True;
+  end;
+
+  for I := PlayerInfo.NumPlayers to high(PlayerInfo.Playerinfo) do
+  begin
+    PlayerInfo.Playerinfo[I].Score:=  0;
+    PlayerInfo.Playerinfo[I].Bar :=  0;
+    PlayerInfo.Playerinfo[I].Enabled := False;
+  end;
+
+  {Case PlayersPlay of
+    1: begin
+      PlayerInfo.Playerinfo[0].PosX := Static[StaticP1ScoreBG].Texture.X;
+      PlayerInfo.Playerinfo[0].PosY := Static[StaticP1ScoreBG].Texture.Y + Static[StaticP1ScoreBG].Texture.H;
+    end;
+    2,4: begin
+      PlayerInfo.Playerinfo[0].PosX := Static[StaticP1TwoPScoreBG].Texture.X;
+      PlayerInfo.Playerinfo[0].PosY := Static[StaticP1TwoPScoreBG].Texture.Y + Static[StaticP1TwoPScoreBG].Texture.H;
+      PlayerInfo.Playerinfo[2].PosX := Static[StaticP1TwoPScoreBG].Texture.X;
+      PlayerInfo.Playerinfo[2].PosY := Static[StaticP1TwoPScoreBG].Texture.Y + Static[StaticP1TwoPScoreBG].Texture.H;
+      PlayerInfo.Playerinfo[1].PosX := Static[StaticP2RScoreBG].Texture.X;
+      PlayerInfo.Playerinfo[1].PosY := Static[StaticP2RScoreBG].Texture.Y + Static[StaticP2RScoreBG].Texture.H;
+      PlayerInfo.Playerinfo[3].PosX := Static[StaticP2RScoreBG].Texture.X;
+      PlayerInfo.Playerinfo[3].PosY := Static[StaticP2RScoreBG].Texture.Y + Static[StaticP2RScoreBG].Texture.H;
+    end;
+    3,6: begin
+      PlayerInfo.Playerinfo[0].PosX := Static[StaticP1ThreePScoreBG].Texture.X;
+      PlayerInfo.Playerinfo[0].PosY := Static[StaticP1ThreePScoreBG].Texture.Y + Static[StaticP1ThreePScoreBG].Texture.H;
+      PlayerInfo.Playerinfo[3].PosX := Static[StaticP1ThreePScoreBG].Texture.X;
+      PlayerInfo.Playerinfo[3].PosY := Static[StaticP1ThreePScoreBG].Texture.Y + Static[StaticP1ThreePScoreBG].Texture.H;
+      PlayerInfo.Playerinfo[1].PosX := Static[StaticP2MScoreBG].Texture.X;
+      PlayerInfo.Playerinfo[1].PosY := Static[StaticP2MScoreBG].Texture.Y + Static[StaticP2MScoreBG].Texture.H;
+      PlayerInfo.Playerinfo[4].PosX := Static[StaticP2MScoreBG].Texture.X;
+      PlayerInfo.Playerinfo[4].PosY := Static[StaticP2MScoreBG].Texture.Y + Static[StaticP2MScoreBG].Texture.H;
+      PlayerInfo.Playerinfo[2].PosX := Static[StaticP3RScoreBG].Texture.X;
+      PlayerInfo.Playerinfo[2].PosY := Static[StaticP3RScoreBG].Texture.Y + Static[StaticP3RScoreBG].Texture.H;
+      PlayerInfo.Playerinfo[5].PosX := Static[StaticP3RScoreBG].Texture.X;
+      PlayerInfo.Playerinfo[5].PosY := Static[StaticP3RScoreBG].Texture.Y + Static[StaticP3RScoreBG].Texture.H;
+    end;
+  end;       }
+
+  // play music (I)
+  //Music.CaptureStart;
+  //Music.MoveTo(AktSong.Start);
+
+  //Init Plugin
+  if not DLLMan.PluginInit(TeamInfo, PlayerInfo, ToSentences(Lines[0]), LoadTex, Print, LoadSound, PlaySound) then
+  begin
+    //Fehler
+    Log.LogError('Could not Init Plugin');
+    Halt;
+  end;
+
+  // Set Background (Little Workaround, maybe change sometime)
+  if (DLLMan.Selected.LoadBack) AND (DLLMan.Selected.LoadSong) then
+    ScreenSing.Tex_Background := Tex_Background;
+
+  Winner := 0;
+
+  //Set Score Visibility
+  {if PlayersPlay = 1 then begin
+    Text[TextP1Score].Visible := DLLMan.Selected.ShowScore;
+    Static[StaticP1ScoreBG].Visible := DLLMan.Selected.ShowScore;
+  end;
+
+  if (PlayersPlay = 2) OR (PlayersPlay = 4) then begin
+    Text[TextP1TwoPScore].Visible := DLLMan.Selected.ShowScore;
+    Static[StaticP1TwoPScoreBG].Visible := DLLMan.Selected.ShowScore;
+
+    Text[TextP2RScore].Visible := DLLMan.Selected.ShowScore;
+    Static[StaticP2RScoreBG].Visible := DLLMan.Selected.ShowScore;
+  end;
+
+  if (PlayersPlay = 3) OR (PlayersPlay = 6) then begin
+    Text[TextP1ThreePScore].Visible := DLLMan.Selected.ShowScore;
+    Static[StaticP1ThreePScoreBG].Visible := DLLMan.Selected.ShowScore;
+
+    Text[TextP2MScore].Visible := DLLMan.Selected.ShowScore;
+    Static[StaticP2MScoreBG].Visible := DLLMan.Selected.ShowScore;
+
+    Text[TextP3RScore].Visible := DLLMan.Selected.ShowScore;
+    Static[StaticP3RScoreBG].Visible := DLLMan.Selected.ShowScore;
+  end; }
+end;
+
+function TScreenSingModi.Draw: boolean;
+var
+  Min:    integer;
+  Sec:    integer;
+  Tekst:  string;
+  S, I:      integer;
+  T:      integer;
+begin
+  Result := false;
+
+  //Set Playerinfo
+  PlayerInfo.NumPlayers := PlayersPlay;
+  for I := 0 to PlayerInfo.NumPlayers-1 do
+  begin
+    PlayerInfo.Playerinfo[I].Name := PChar(Player[I].Name);
+    if PlayerInfo.Playerinfo[I].Enabled then
+    begin
+      if (Player[I].ScoreTotalI<=10000) then
+        PlayerInfo.Playerinfo[I].Score:=  Player[I].ScoreTotalI;
+      PlayerInfo.Playerinfo[I].Bar :=  Round(Scores.Players[I].RBPos * 100);
+    end;
+  end;
+
+  //Show Score
+  if DLLMan.Selected.ShowScore then
+  begin
+    {//ScoreBG Mod
+    // set player colors
+    if PlayersPlay = 4 then begin
+      if ScreenAct = 1 then begin
+        LoadColor(Static[StaticP1TwoP].Texture.ColR, Static[StaticP1TwoP].Texture.ColG,
+        Static[StaticP1TwoP].Texture.ColB, 'P1Dark');
+        LoadColor(Static[StaticP2R].Texture.ColR, Static[StaticP2R].Texture.ColG,
+        Static[StaticP2R].Texture.ColB, 'P2Dark');
+
+
+
+        LoadColor(Static[StaticP1TwoPScoreBG].Texture.ColR, Static[StaticP1TwoPScoreBG].Texture.ColG,
+        Static[StaticP1TwoPScoreBG].Texture.ColB, 'P1Dark');
+        LoadColor(Static[StaticP2RScoreBG].Texture.ColR, Static[StaticP2RScoreBG].Texture.ColG,
+        Static[StaticP2RScoreBG].Texture.ColB, 'P2Dark');
+
+
+
+      end;
+      if ScreenAct = 2 then begin
+        LoadColor(Static[StaticP1TwoP].Texture.ColR, Static[StaticP1TwoP].Texture.ColG,
+          Static[StaticP1TwoP].Texture.ColB, 'P3Dark');
+        LoadColor(Static[StaticP2R].Texture.ColR, Static[StaticP2R].Texture.ColG,
+          Static[StaticP2R].Texture.ColB, 'P4Dark');
+
+
+
+        LoadColor(Static[StaticP1TwoPScoreBG].Texture.ColR, Static[StaticP1TwoPScoreBG].Texture.ColG,
+          Static[StaticP1TwoPScoreBG].Texture.ColB, 'P3Dark');
+        LoadColor(Static[StaticP2RScoreBG].Texture.ColR, Static[StaticP2RScoreBG].Texture.ColG,
+          Static[StaticP2RScoreBG].Texture.ColB, 'P4Dark');
+
+
+
+       end;
+    end;
+
+    if PlayersPlay = 6 then begin
+      if ScreenAct = 1 then begin
+        LoadColor(Static[StaticP1ThreeP].Texture.ColR, Static[StaticP1ThreeP].Texture.ColG,
+          Static[StaticP1ThreeP].Texture.ColB, 'P1Dark');
+        LoadColor(Static[StaticP2M].Texture.ColR, Static[StaticP2M].Texture.ColG,
+          Static[StaticP2R].Texture.ColB, 'P2Dark');
+        LoadColor(Static[StaticP3R].Texture.ColR, Static[StaticP3R].Texture.ColG,
+          Static[StaticP3R].Texture.ColB, 'P3Dark');
+
+
+
+        LoadColor(Static[StaticP1ThreePScoreBG].Texture.ColR, Static[StaticP1ThreePScoreBG].Texture.ColG,
+          Static[StaticP1ThreePScoreBG].Texture.ColB, 'P1Dark');
+        LoadColor(Static[StaticP2MScoreBG].Texture.ColR, Static[StaticP2MScoreBG].Texture.ColG,
+          Static[StaticP2RScoreBG].Texture.ColB, 'P2Dark');
+        LoadColor(Static[StaticP3RScoreBG].Texture.ColR, Static[StaticP3RScoreBG].Texture.ColG,
+          Static[StaticP3RScoreBG].Texture.ColB, 'P3Dark');
+
+
+
+      end;
+      if ScreenAct = 2 then begin
+        LoadColor(Static[StaticP1ThreeP].Texture.ColR, Static[StaticP1ThreeP].Texture.ColG,
+          Static[StaticP1ThreeP].Texture.ColB, 'P4Dark');
+        LoadColor(Static[StaticP2M].Texture.ColR, Static[StaticP2M].Texture.ColG,
+          Static[StaticP2R].Texture.ColB, 'P5Dark');
+        LoadColor(Static[StaticP3R].Texture.ColR, Static[StaticP3R].Texture.ColG,
+          Static[StaticP3R].Texture.ColB, 'P6Dark');
+
+
+
+
+        LoadColor(Static[StaticP1ThreePScoreBG].Texture.ColR, Static[StaticP1ThreePScoreBG].Texture.ColG,
+          Static[StaticP1ThreePScoreBG].Texture.ColB, 'P4Dark');
+        LoadColor(Static[StaticP2MScoreBG].Texture.ColR, Static[StaticP2MScoreBG].Texture.ColG,
+          Static[StaticP2RScoreBG].Texture.ColB, 'P5Dark');
+        LoadColor(Static[StaticP3RScoreBG].Texture.ColR, Static[StaticP3RScoreBG].Texture.ColG,
+          Static[StaticP3RScoreBG].Texture.ColB, 'P6Dark');
+
+
+
+
+      end;
+    end;
+    //end ScoreBG Mod }
+
+    // set player names (for 2 screens and only Singstar skin)
+    if ScreenAct = 1 then begin
+      Text[TextP1].Text       := 'P1';
+      Text[TextP1TwoP].Text   := 'P1'; // added for ps3 skin
+      Text[TextP1ThreeP].Text := 'P1'; // added for ps3 skin
+      Text[TextP2R].Text      := 'P2';
+      Text[TextP2M].Text      := 'P2';
+      Text[TextP3R].Text      := 'P3';
+    end;
+
+    if ScreenAct = 2 then begin
+      case PlayersPlay of
+        4:  begin
+              Text[TextP1TwoP].Text := 'P3';
+              Text[TextP2R].Text := 'P4';
+            end;
+        6:  begin
+              Text[TextP1ThreeP].Text := 'P4';
+              Text[TextP2M].Text := 'P5';
+              Text[TextP3R].Text := 'P6';
+            end;
+      end; // case
+    end; // if
+
+
+    // stereo   <- and where iss P2M? or P3?
+    Static[StaticP1].Texture.X := Static[StaticP1].Texture.X + 10*ScreenX;
+    Text[TextP1].X := Text[TextP1].X + 10*ScreenX;
+
+    {Static[StaticP1ScoreBG].Texture.X := Static[StaticP1ScoreBG].Texture.X + 10*ScreenX;
+    Text[TextP1Score].X := Text[TextP1Score].X + 10*ScreenX;}
+
+    Static[StaticP2R].Texture.X := Static[StaticP2R].Texture.X + 10*ScreenX;
+    Text[TextP2R].X := Text[TextP2R].X + 10*ScreenX;
+
+    {Static[StaticP2RScoreBG].Texture.X := Static[StaticP2RScoreBG].Texture.X + 10*ScreenX;
+    Text[TextP2RScore].X := Text[TextP2RScore].X + 10*ScreenX;}
+
+    // .. and scores
+    {if PlayersPlay = 1 then begin
+      Tekst := IntToStr(Player[0].ScoreTotalI);
+      while Length(Tekst) < 5 do Tekst := '0' + Tekst;
+      Text[TextP1Score].Text := Tekst;
+    end;
+
+    if PlayersPlay = 2 then begin
+      Tekst := IntToStr(Player[0].ScoreTotalI);
+      while Length(Tekst) < 5 do Tekst := '0' + Tekst;
+      Text[TextP1TwoPScore].Text := Tekst;
+
+      Tekst := IntToStr(Player[1].ScoreTotalI);
+      while Length(Tekst) < 5 do Tekst := '0' + Tekst;
+      Text[TextP2RScore].Text := Tekst;
+    end;
+
+    if PlayersPlay = 3 then begin
+      Tekst := IntToStr(Player[0].ScoreTotalI);
+      while Length(Tekst) < 5 do Tekst := '0' + Tekst;
+      Text[TextP1ThreePScore].Text := Tekst;
+
+      Tekst := IntToStr(Player[1].ScoreTotalI);
+      while Length(Tekst) < 5 do Tekst := '0' + Tekst;
+      Text[TextP2MScore].Text := Tekst;
+
+      Tekst := IntToStr(Player[2].ScoreTotalI);
+      while Length(Tekst) < 5 do Tekst := '0' + Tekst;
+      Text[TextP3RScore].Text := Tekst;
+    end;
+
+    if PlayersPlay = 4 then begin
+      if ScreenAct = 1 then begin
+        Tekst := IntToStr(Player[0].ScoreTotalI);
+        while Length(Tekst) < 5 do Tekst := '0' + Tekst;
+        Text[TextP1TwoPScore].Text := Tekst;
+
+        Tekst := IntToStr(Player[1].ScoreTotalI);
+        while Length(Tekst) < 5 do Tekst := '0' + Tekst;
+        Text[TextP2RScore].Text := Tekst;
+      end;
+      if ScreenAct = 2 then begin
+        Tekst := IntToStr(Player[2].ScoreTotalI);
+        while Length(Tekst) < 5 do Tekst := '0' + Tekst;
+        Text[TextP1TwoPScore].Text := Tekst;
+
+        Tekst := IntToStr(Player[3].ScoreTotalI);
+        while Length(Tekst) < 5 do Tekst := '0' + Tekst;
+        Text[TextP2RScore].Text := Tekst;
+      end;
+    end;
+
+    if PlayersPlay = 6 then begin
+      if ScreenAct = 1 then begin
+        Tekst := IntToStr(Player[0].ScoreTotalI);
+        while Length(Tekst) < 5 do Tekst := '0' + Tekst;
+        Text[TextP1ThreePScore].Text := Tekst;
+
+        Tekst := IntToStr(Player[1].ScoreTotalI);
+        while Length(Tekst) < 5 do Tekst := '0' + Tekst;
+        Text[TextP2MScore].Text := Tekst;
+
+        Tekst := IntToStr(Player[2].ScoreTotalI);
+        while Length(Tekst) < 5 do Tekst := '0' + Tekst;
+        Text[TextP3RScore].Text := Tekst;
+      end;
+      if ScreenAct = 2 then begin
+        Tekst := IntToStr(Player[3].ScoreTotalI);
+        while Length(Tekst) < 5 do Tekst := '0' + Tekst;
+        Text[TextP1ThreePScore].Text := Tekst;
+
+        Tekst := IntToStr(Player[4].ScoreTotalI);
+        while Length(Tekst) < 5 do Tekst := '0' + Tekst;
+        Text[TextP2MScore].Text := Tekst;
+
+        Tekst := IntToStr(Player[5].ScoreTotalI);
+        while Length(Tekst) < 5 do Tekst := '0' + Tekst;
+        Text[TextP3RScore].Text := Tekst;
+      end;
+    end;   }
+
+  end; //ShowScore
+
+  for S := 1 to 1 do
+    Static[S].Texture.X := Static[S].Texture.X + 10*ScreenX;
+
+  for T := 0 to 1 do
+    Text[T].X := Text[T].X + 10*ScreenX;
+
+  if DLLMan.Selected.LoadSong then
+  begin
+    // update static menu with time ...
+    Min := Round(LineState.CurrentTime) div 60;
+    Sec := Round(LineState.CurrentTime) mod 60;
+    Text[TextTimeText].Text := '';
+    if Min < 10 then Text[TextTimeText].Text := '0';
+    Text[TextTimeText].Text := Text[TextTimeText].Text + IntToStr(Min) + ':';
+    if Sec < 10 then Text[TextTimeText].Text := Text[TextTimeText].Text + '0';
+    Text[TextTimeText].Text := Text[TextTimeText].Text + IntToStr(Sec);
+  end;
+
+  // draw static menu (BG)
+  DrawBG;
+
+  //Draw Background
+  if (DllMan.Selected.LoadSong) AND (DllMan.Selected.LoadBack) then
+    SingDrawBackground;
+
+  // comment by blindy: wo zum henker wird denn in diesem screen ein video abgespielt?
+  // update and draw movie
+  // <mog> wie wo wadd? also in der selben funktion in der uscreensing kommt des video in der zeile 995, oder was wollteste wissen? :X
+{  if ShowFinish and CurrentSong.VideoLoaded AND DllMan.Selected.LoadVideo then begin
+    UpdateSmpeg; // this only draws
+  end;}
+
+  // draw static menu (FG)
+  DrawFG;
+
+  if ShowFinish then begin
+    if DllMan.Selected.LoadSong then
+    begin
+      if (not AudioPlayback.Finished) and ((CurrentSong.Finish = 0) or (LineState.CurrentTime*1000 <= CurrentSong.Finish)) then begin
+        //Pause Mod:
+        if not Paused then
+          Sing(Self);       // analyze song
+      end else begin
+        if not FadeOut then begin
+          Finish;
+          FadeOut := true;
+          FadeTo(@ScreenPartyScore);
+        end;
+      end;
+    end;
+  end;
+
+  // draw custom items
+  SingModiDraw(PlayerInfo);  // always draw
+
+  //GoldenNoteStarsTwinkle Mod
+    GoldenRec.SpawnRec;
+  //GoldenNoteStarsTwinkle Mod
+
+  //Update PlayerInfo
+  for I := 0 to PlayerInfo.NumPlayers-1 do
+  begin
+    if PlayerInfo.Playerinfo[I].Enabled then
+    begin
+      //PlayerInfo.Playerinfo[I].Bar :=  Player[I].ScorePercent;
+      PlayerInfo.Playerinfo[I].Score := Player[I].ScoreTotalI;
+    end;
+  end;
+
+  if ((ShowFinish) AND (NOT Paused)) then
+  begin
+    if not DLLMan.PluginDraw(Playerinfo, Lines[0].Current) then
+    begin
+      if not FadeOut then begin
+          Finish;
+          FadeOut := true;
+          FadeTo(@ScreenPartyScore);
+      end;
+    end;   
+  end;
+
+  //Change PlayerInfo/Changeables
+  for I := 0 to PlayerInfo.NumPlayers-1 do
+  begin
+    if (Player[I].ScoreTotalI <> PlayerInfo.Playerinfo[I].Score) then
+    begin
+      //Player[I].ScoreTotal   := Player[I].ScoreTotal + (PlayerInfo.Playerinfo[I].Score - Player[I].ScoreTotalI);
+      Player[I].ScoreTotalI := PlayerInfo.Playerinfo[I].Score;
+    end;
+    {if (PlayerInfo.Playerinfo[I].Bar <> Player[I].ScorePercent) then
+      Player[I].ScorePercentTarget := PlayerInfo.Playerinfo[I].Bar; }
+  end;
+
+  // back stereo
+  Static[StaticP1].Texture.X := Static[StaticP1].Texture.X - 10*ScreenX;
+  Text[TextP1].X := Text[TextP1].X - 10*ScreenX;
+
+  {Static[StaticP1ScoreBG].Texture.X := Static[StaticP1ScoreBG].Texture.X - 10*ScreenX;
+  Text[TextP1Score].X := Text[TextP1Score].X - 10*ScreenX;}
+
+
+  Static[StaticP2R].Texture.X := Static[StaticP2R].Texture.X - 10*ScreenX;
+  Text[TextP2R].X := Text[TextP2R].X - 10*ScreenX;
+
+  {Static[StaticP2RScoreBG].Texture.X := Static[StaticP2RScoreBG].Texture.X - 10*ScreenX;
+  Text[TextP2RScore].X := Text[TextP2RScore].X - 10*ScreenX;}
+
+
+  for S := 1 to 1 do
+    Static[S].Texture.X := Static[S].Texture.X - 10*ScreenX;
+
+  for T := 0 to 1 do
+    Text[T].X := Text[T].X - 10*ScreenX;
+
+  Result := true;
+end;
+
+procedure TScreenSingModi.Finish;
+begin
+inherited Finish;
+
+Winner := DllMan.PluginFinish(PlayerInfo);
+
+//Log.LogError('Winner: ' + InttoStr(Winner));
+
+//DLLMan.UnLoadPlugin;
+end;
+
+function LoadTex (const Name: PChar; Typ: TTextureType): TsmallTexture; stdcall;
+var
+  Texname, EXT: String;
+  Tex: TTexture;
+begin
+  //Get texture Name
+  TexName := Skin.GetTextureFileName(String(Name));
+  //Get File Typ
+  Ext := ExtractFileExt(TexName);
+  if (uppercase(Ext) = '.JPG') then
+    Ext := 'JPG'
+  else
+    Ext := 'BMP';
+
+  Tex := Texture.LoadTexture(false, PChar(TexName), UTEXTURE.TTextureType(Typ), 0);
+
+  Result.TexNum := Tex.TexNum;
+  Result.W := Tex.W;
+  Result.H := Tex.H;
+end;
+{
+function Translate (const Name: PChar): PChar; stdcall;
+begin
+  Result := PChar(Language.Translate(String(Name)));
+end; }
+
+procedure Print (const Style, Size: Byte; const X, Y: Real; const Text: PChar); stdcall;       //Procedure to Print Text
+begin
+  SetFontItalic ((Style and 128) = 128);
+  SetFontStyle(Style and 7);
+  SetFontSize(Size);
+  SetFontPos (X, Y);
+  glPrint (PChar(Language.Translate(String(Text))));
+end;
+
+function LoadSound  (const Name: PChar): Cardinal; stdcall;       //Procedure that loads a Custom Sound
+var
+  S: TAudioPlaybackStream;
+  I: Integer;
+  F: String;
+begin
+  //Search for Sound in already loaded Sounds
+  F := UpperCase(SoundPath + FileName);
+  For I := 0 to High(CustomSounds) do
+  begin
+    if (UpperCase(CustomSounds[I].Filename) = F) then
+    begin
+      Result := I;
+      Exit;
+    end;
+  end;
+
+  S := AudioPlayback.OpenSound(SoundPath + String(Name));
+  if (S <> nil) then
+    Result := High(CustomSounds)
+  else
+    Result := 0;
+end;
+
+procedure PlaySound (const Index: Cardinal); stdcall;       //Plays a Custom Sound
+begin
+  if (Index <= High(CustomSounds)) then
+    AudioPlayback.PlaySound(CustomSounds[Index].Stream);
+end;
+
+end.
+
diff --git a/Game/Code/Screens/UScreenSong.pas b/Game/Code/Screens/UScreenSong.pas
index 27c137f7..609d46b1 100644
--- a/Game/Code/Screens/UScreenSong.pas
+++ b/Game/Code/Screens/UScreenSong.pas
@@ -144,7 +144,7 @@ uses UGraphic,
 procedure TScreenSong.FixSelected;

 var I, I2: Integer;

   begin

-    {if CatSongs.VisibleSongs > 0 then

+    if CatSongs.VisibleSongs > 0 then

     begin

       I2:= 0;

       for I := low(CatSongs.Song) to High(Catsongs.Song) do

@@ -158,13 +158,13 @@ var I, I2: Integer;
 

       SongCurrent := I2;

       SongTarget  := I2;

-    end;  }

+    end;

   end;

 

 procedure TScreenSong.FixSelected2;

 var I, I2: Integer;

-  begin          // to - do : new Song management

-   { if CatSongs.VisibleSongs > 0 then

+  begin

+    if CatSongs.VisibleSongs > 0 then

     begin

       I2:= 0;

       for I := low(CatSongs.Song) to High(Catsongs.Song) do

@@ -177,7 +177,7 @@ var I, I2: Integer;
       end;

 

       SongTarget  := I2;

-    end;}

+    end;

   end;

 //Show Wrong Song when Tabs on Fix End

 

@@ -262,7 +262,7 @@ begin
         begin

           For I := 1 to high(CatSongs.Song) do

           begin

-            {if (CatSongs.Song[(I + Interaction) mod I2].Visible) AND

+            if (CatSongs.Song[(I + Interaction) mod I2].Visible) AND

                (Length(CatSongs.Song[(I + Interaction) mod I2].Title)>0) AND

                (WideUpperCase(CatSongs.Song[(I + Interaction) mod I2].Title)[1] = Letter) then

             begin

@@ -275,15 +275,15 @@ begin
               //UpdateLCD;   //TODO: maybe LCD Support as Plugin?

               //Break and Exit

               Exit;

-            end;  }

+            end;

           end;

         end

         //Jump to Artist

         else  if (SDL_ModState = KMOD_LALT) then

         begin

           For I := 1 to high(CatSongs.Song) do

-          begin    // to - do : new Song management

-            {if (CatSongs.Song[(I + Interaction) mod I2].Visible) AND

+          begin

+            if (CatSongs.Song[(I + Interaction) mod I2].Visible) AND

                (Length(CatSongs.Song[(I + Interaction) mod I2].Artist)>0) AND

                (WideUpperCase(CatSongs.Song[(I + Interaction) mod I2].Artist)[1] = Letter) then

             begin

@@ -297,7 +297,7 @@ begin
 

               //Break and Exit

               Exit;

-            end; }

+            end;

           end;

         end;

       end;

@@ -316,8 +316,8 @@ begin
       'M': //Show SongMenu

         begin

           if (Songs.SongList.Count > 0) then begin

-            if (Mode = smNormal) then begin     // to - do : new Song management

-              {if not CatSongs.Song[Interaction].Main then begin // clicked on Song

+            if (Mode = smNormal) then begin

+              if not CatSongs.Song[Interaction].Main then begin // clicked on Song

                 if CatSongs.CatNumShow = -3 then

                   ScreenSongMenu.MenuShow(SM_Playlist)

                 else

@@ -326,7 +326,7 @@ begin
               else

               begin

                 ScreenSongMenu.MenuShow(SM_Playlist_Load);

-              end;}

+              end;

             end //Party Mode -> Show Party Menu

             else ScreenSongMenu.MenuShow(SM_Party_Main);

           end;

@@ -362,16 +362,16 @@ begin
 

             if (SDL_ModState = KMOD_LSHIFT) AND (Ini.Tabs_at_startup = 1) then //Random Category

             begin

-            I2 := 0; //Count Cats      // to - do : new Song management

-            {for I:= low(CatSongs.Song) to high (CatSongs.Song) do

-              if CatSongs.Song[I].Main then Inc(I2);}

+            I2 := 0; //Count Cats

+            for I:= low(CatSongs.Song) to high (CatSongs.Song) do

+              if CatSongs.Song[I].Main then Inc(I2);

 

             I2 := Random (I2)+1; //Zufall

 

             //Find Cat:

             for I:= low(CatSongs.Song) to high (CatSongs.Song) do

               begin

-              {if CatSongs.Song[I].Main then

+              if CatSongs.Song[I].Main then

                 Dec(I2);

               if (I2<=0) then

                 begin

@@ -385,23 +385,23 @@ begin
                 SelectNext;

                 FixSelected;

                 break;

-                end; }

-              end;   // to - do : new Song management

+                end;

+              end;

 

 

             end

             else if (SDL_ModState = KMOD_LCTRL) AND (Ini.Tabs_at_startup = 1) then //random in All Categorys

             begin

-            {repeat

+            repeat

               I2 := Random(high(CatSongs.Song)+1) - low(CatSongs.Song)+1;

-            until CatSongs.Song[I2].Main = false;  }

+            until CatSongs.Song[I2].Main = false;

 

             //Search Cat

-            {for I := I2 downto low(CatSongs.Song) do

+            for I := I2 downto low(CatSongs.Song) do

               begin

               if CatSongs.Song[I].Main then

                 break;

-              end;    }

+              end;

             //In I is now the categorie in I2 the song

 

             //Choose Cat

@@ -446,12 +446,12 @@ begin
             begin

             //Find Category

             I := Interaction;

-            {while not catsongs.Song[I].Main  do

+            while not catsongs.Song[I].Main  do

               begin

               Dec (I);

               if (I < low(catsongs.Song)) then

                 break;

-              end;       }

+              end;

             if (I<= 1) then

             Interaction := high(catsongs.Song)

             else

@@ -514,8 +514,8 @@ begin
           begin

             {$IFDEF UseSerialPort}

               // PortWriteB($378, 0);

-            {$ENDIF}              // to - do : new Song management

-            {if CatSongs.Song[Interaction].Main then

+            {$ENDIF}

+            if CatSongs.Song[Interaction].Main then

             begin // clicked on Category Button

 

               //Show Cat in Top Left Mod

@@ -530,7 +530,7 @@ begin
             //  SetScroll4;

 

             //Show Wrong Song when Tabs on Fix

-{            SelectNext;

+            SelectNext;

             FixSelected;

 

             //Play Music:

@@ -560,7 +560,7 @@ begin
                 else

                   ScreenSong.StartSong;

               end;

-            end;  }

+            end;

           end;

         end;

 

@@ -577,12 +577,12 @@ begin
                 I := Interaction;

                 if I <= 0 then I := 1;

 

-                {while not catsongs.Song[I].Main do

+                while not catsongs.Song[I].Main do

                 begin

                   Inc (I);

                   if (I > high(catsongs.Song)) then

                     I := low(catsongs.Song);

-                end;  }

+                end;

 

                 Interaction := I;

 

@@ -618,14 +618,14 @@ begin
                 I2 := 0;

                 if I <= 0 then I := 1;

 

-                {while not catsongs.Song[I].Main or (I2 = 0) do

+                while not catsongs.Song[I].Main or (I2 = 0) do

                 begin

                   if catsongs.Song[I].Main then

                     Inc(I2);

                   Dec (I);

                   if (I < low(catsongs.Song)) then

                     I := high(catsongs.Song);

-                end; }

+                end;

 

                 Interaction := I;

 

@@ -790,7 +790,7 @@ var
   Pet: integer;  

 Label CreateSongButtons;  

 begin

-  {if (length(CatSongs.Song) > 0) then

+  if (length(CatSongs.Song) > 0) then

   begin

     //Set Length of Button Array one Time Instead of one time for every Song

     SetButtonLength(Length(CatSongs.Song));

@@ -803,30 +803,30 @@ begin
         // new

         Texture.Limit := 512;// 256 0.4.2 value, 512 in 0.5.0

 

-        if not FileExists({CatSongs.Song[Pet].Path + }{CatSongs.Song[Pet].Cover) then

+        if not FileExists(CatSongs.Song[Pet].Path + CatSongs.Song[Pet].Cover) then

           CatSongs.Song[Pet].Cover := ''; // 0.5.0: if cover not found then show 'no cover'

-          // to - do : new Song management

+

         if CatSongs.Song[Pet].Cover = '' then

           AddButton(300 + Pet*250, 140, 200, 200, Skin.GetTextureFileName('SongCover'), TEXTURE_TYPE_PLAIN, Theme.Song.Cover.Reflections)

         else begin

           // cache texture if there is a need to this

-          if not Covers.CoverExists({CatSongs.Song[Pet].Path + }{CatSongs.Song[Pet].Cover) then

+          if not Covers.CoverExists(CatSongs.Song[Pet].Path + CatSongs.Song[Pet].Cover) then

           begin

             Texture.CreateCacheMipmap := true;

-            Texture.GetTexture({CatSongs.Song[Pet].Path + }{CatSongs.Song[Pet].Cover, TEXTURE_TYPE_PLAIN, true); // preloads textures and creates cache mipmap

+            Texture.GetTexture(CatSongs.Song[Pet].Path + CatSongs.Song[Pet].Cover, TEXTURE_TYPE_PLAIN, true); // preloads textures and creates cache mipmap

             Texture.CreateCacheMipmap := false;

 

             // puts this texture to the cache file

-            Covers.AddCover({CatSongs.Song[Pet].Path + }{CatSongs.Song[Pet].Cover);

+            Covers.AddCover(CatSongs.Song[Pet].Path + CatSongs.Song[Pet].Cover);

 

             // unload full size texture

-            Texture.UnloadTexture({CatSongs.Song[Pet].Path + }{CatSongs.Song[Pet].Cover, TEXTURE_TYPE_PLAIN, false);

+            Texture.UnloadTexture(CatSongs.Song[Pet].Path + CatSongs.Song[Pet].Cover, TEXTURE_TYPE_PLAIN, false);

 

             // we should also add mipmap texture by calling createtexture and use mipmap cache as data source

           end;

 

           // and now load it from cache file (small place for the optimization by eliminating reading it from file, but not here)

-          AddButton(300 + Pet*250, 140, 200, 200,{ CatSongs.Song[Pet].Path + }{CatSongs.Song[Pet].Cover, TEXTURE_TYPE_PLAIN, Theme.Song.Cover.Reflections);

+          AddButton(300 + Pet*250, 140, 200, 200, CatSongs.Song[Pet].Path + CatSongs.Song[Pet].Cover, TEXTURE_TYPE_PLAIN, Theme.Song.Cover.Reflections);

         end;

         Texture.Limit := 1024*1024;

         I := -1;

@@ -848,7 +848,7 @@ begin
         try

           AddButton(300 + Pet*250, 140, 200, 200, '', TEXTURE_TYPE_PLAIN, Theme.Song.Cover.Reflections);

         except

-          ShowMessage('"No Cover" image is damaged. Ultrastar will exit now.');

+          ShowMessage('"No Cover" image is damaged. Ultrastar will exit now.');


           Halt;

         end;

         I := Pet + 1;

@@ -858,7 +858,7 @@ begin
     if (I <> -1) then

       GoTo CreateSongButtons;

 

-  end;    }

+  end;

 end;

 

 procedure TScreenSong.SetScroll;

@@ -886,7 +886,7 @@ begin
     //Set Texts:

     Text[TextArtist].Text := CatSongs.Song[Interaction].Artist;

     Text[TextTitle].Text  :=  CatSongs.Song[Interaction].Title;

-    {if (Ini.Tabs_at_startup = 1) And (CatSongs.CatNumShow = -1) then

+    if (Ini.Tabs_at_startup = 1) And (CatSongs.CatNumShow = -1) then

     begin

       Text[TextNumber].Text := IntToStr(CatSongs.Song[Interaction].OrderNum) + '/' + IntToStr(CatSongs.CatCount);

       Text[TextTitle].Text  := '(' + IntToStr(CatSongs.Song[Interaction].CatNumber) + ' ' + Language.Translate('SING_SONGS_IN_CAT') + ')';

@@ -898,15 +898,15 @@ begin
     else if (Ini.Tabs_at_startup = 1) then

       Text[TextNumber].Text := IntToStr(CatSongs.Song[Interaction].CatNumber) + '/' + IntToStr(CatSongs.Song[Interaction - CatSongs.Song[Interaction].CatNumber].CatNumber)

     else

-      Text[TextNumber].Text := IntToStr(Interaction+1) + '/' + IntToStr(Length(CatSongs.Song));}

+      Text[TextNumber].Text := IntToStr(Interaction+1) + '/' + IntToStr(Length(CatSongs.Song));

   end

   else

   begin

     Text[TextNumber].Text := '0/0';

     Text[TextArtist].Text := '';

     Text[TextTitle].Text  := '';

-    {for B := 0 to High(Button) do

-      Button[B].Visible := False; }

+    for B := 0 to High(Button) do

+      Button[B].Visible := False;

 

   end;

 end;

@@ -934,12 +934,12 @@ begin
   Placed := 0;

 

   VisCount := 0;

-  {for B := 0 to High(Button) do

-    if CatSongs.Song[B].Visible then Inc(VisCount);}

+  for B := 0 to High(Button) do

+    if CatSongs.Song[B].Visible then Inc(VisCount);

 

   VisInt := 0;

-  {for B := 0 to Interaction-1 do

-    if CatSongs.Song[B].Visible then Inc(VisInt);  }

+  for B := 0 to Interaction-1 do

+    if CatSongs.Song[B].Visible then Inc(VisInt);

 

 

   if VisCount <= 6 then begin

@@ -964,11 +964,11 @@ begin
   end;

 

 

-   // to - do : new Song management

+

   // hide all buttons

   for B := 0 to High(Button) do begin

     Button[B].Visible := false;

-    //Button[B].Selectable := CatSongs.Song[B].Visible;

+    Button[B].Selectable := CatSongs.Song[B].Visible;

   end;

 

 {  for B := Src to Dst do begin

@@ -979,7 +979,7 @@ begin
   end;}

 

 

-  {if Typ = 0 then begin

+  if Typ = 0 then begin

     for B := 0 to High(Button) do begin

       if CatSongs.Song[B].Visible then begin

         Button[B].Visible := true;

@@ -987,9 +987,9 @@ begin
         Inc(Placed);

       end;

     end;

-  end;    }

+  end;

 

-  {if Typ = 1 then begin

+  if Typ = 1 then begin

     B := 0;

     while (Count > 0) do begin

       if CatSongs.Song[B].Visible then begin

@@ -1000,9 +1000,9 @@ begin
       end;

       Inc(B);

     end;

-  end;  }

+  end;

 

-  {if Typ = 2 then begin

+  if Typ = 2 then begin

     B := High(Button);

     while (Count > 0) do begin

       if CatSongs.Song[B].Visible then begin

@@ -1044,7 +1044,7 @@ begin
   end;

 

   if Length(Button) > 0 then

-    Static[1].Texture.Y := Button[Interaction].Y - 5; // selection texture }

+    Static[1].Texture.Y := Button[Interaction].Y - 5; // selection texture

 end;

 

 procedure TScreenSong.SetScroll2;

@@ -1053,7 +1053,7 @@ var
 // Wsp:    integer; // wspolczynnik przesuniecia wzgledem srodka ekranu // Auto Removed, Unused Variable

 // Wsp2:   real; // Auto Removed, Unused Variable

 begin

-  {// liniowe

+  // liniowe

   for B := 0 to High(Button) do

     Button[B].X := 300 + (B - Interaction) * 260;

 

@@ -1080,7 +1080,7 @@ var
 // Wsp:    integer; // wspolczynnik przesuniecia wzgledem srodka ekranu // Auto Removed, Unused Variable

 // Wsp2:   real; // Auto Removed, Unused Variable

 begin

-  {SongTarget := Interaction;

+  SongTarget := Interaction;

 

   // liniowe

   for B := 0 to High(Button) do

@@ -1116,7 +1116,7 @@ var
   Z, Z2:      real;

   VS:     integer;

 begin

-  {VS := CatSongs.VisibleSongs; // 0.5.0 (I): cached, very important

+  VS := CatSongs.VisibleSongs; // 0.5.0 (I): cached, very important

 

   // kolowe

   for B := 0 to High(Button) do begin

@@ -1124,7 +1124,7 @@ begin
     if Button[B].Visible then begin // 0.5.0 optimization for 1000 songs - updates only visible songs, hiding in tabs becomes useful for maintaing good speed

 

     Wsp := 2 * pi * (CatSongs.VisibleIndex(B) - SongCurrent) /  VS {CatSongs.VisibleSongs};// 0.5.0 (II): takes another 16ms

-{

+

     Z := (1 + cos(Wsp)) / 2;

     Z2 := (1 + 2*Z) / 3;

 

@@ -1134,11 +1134,11 @@ begin
 

     Button[B].W := Theme.Song.Cover.H * Z2;

 

-//    Button[B].Y := {50 +}{ 140 + 50 - 50 * Z2;

-{    Button[B].Y := Theme.Song.Cover.Y  + (Theme.Song.Cover.H - Abs(Button[B].H)) * 0.7 ;

+//    Button[B].Y := {50 +} 140 + 50 - 50 * Z2;

+    Button[B].Y := Theme.Song.Cover.Y  + (Theme.Song.Cover.H - Abs(Button[B].H)) * 0.7 ;

     Button[B].H := Button[B].W;

     end;

-  end;}

+  end;

 end;

 

 (*

@@ -1234,7 +1234,7 @@ var
   X:        Real;

   helper: real;

 begin

-  {VS := CatSongs.VisibleSongs; // cache Visible Songs

+  VS := CatSongs.VisibleSongs; // cache Visible Songs

   {Vars

   Theme.Song.CoverW: Radius des Kreises

   Theme.Song.CoverX: X Pos Linke Kante des gewählten Covers

@@ -1242,7 +1242,7 @@ begin
   Theme.Song.CoverH: Höhe der Cover

 

   (CatSongs.VisibleIndex(B) - SongCurrent)/VS = Distance to middle Cover in %

-  }{

+  }

 

   //Change Pos of all Buttons

   for B := low(Button) to high(Button) do

@@ -1256,7 +1256,7 @@ begin
       else if (Pos > VS/2) then

         Pos := Pos - VS;

 

-      if (Abs(Pos) < 2.5) then {fixed Positions} {

+      if (Abs(Pos) < 2.5) then {fixed Positions}

       begin

       Angle := Pi * (Pos / 5);

 //      Button[B].Visible := False;

@@ -1281,7 +1281,7 @@ begin
 

       end

       else

-      begin {Behind the Front Covers}    {

+      begin {Behind the Front Covers}

 

         // limit-bg-covers hack

         if (abs(abs(Pos)-VS/2)>10) then Button[B].Visible:=False;

@@ -1322,7 +1322,7 @@ begin
 //      Button[B].Y := (Theme.Song.Cover.Y  + (Theme.Song.Cover.H - Button[B].H) * 0.7);

 

     end;

-  end;              }

+  end;

 end;

 

 procedure TScreenSong.SetScroll6; // rotate (slotmachine style)

@@ -1336,7 +1336,7 @@ var
   Wsp:    real;

   Z, Z2:      real;

 begin

-  {VS := CatSongs.VisibleSongs; // cache Visible Songs

+  VS := CatSongs.VisibleSongs; // cache Visible Songs

   if VS <=5 then begin

     // kolowe

     for B := 0 to High(Button) do

@@ -1345,7 +1345,7 @@ begin
       if Button[B].Visible then begin // 0.5.0 optimization for 1000 songs - updates only visible songs, hiding in tabs becomes useful for maintaing good speed

 

       Wsp := 2 * pi * (CatSongs.VisibleIndex(B) - SongCurrent) /  VS {CatSongs.VisibleSongs};// 0.5.0 (II): takes another 16ms

-      {

+

       Z := (1 + cos(Wsp)) / 2;

       Z2 := (1 + 2*Z) / 3;

 

@@ -1355,9 +1355,9 @@ begin
 

       Button[B].W := Theme.Song.Cover.H * Z2;

 

-//      Button[B].Y := {50 +}{ 140 + 50 - 50 * Z2;

+//      Button[B].Y := {50 +} 140 + 50 - 50 * Z2;

       Button[B].X := Theme.Song.Cover.X  + (Theme.Song.Cover.H - Abs(Button[B].H)) * 0.7 ;

-      Button[B].H := Button[B].W; {

+      Button[B].H := Button[B].W;

       end;

     end;

   end

@@ -1375,7 +1375,7 @@ begin
         else if (Pos > VS/2) then

           Pos := Pos - VS;

 

-        if (Abs(Pos) < 2.5) then {fixed Positions}  {

+        if (Abs(Pos) < 2.5) then {fixed Positions}

         begin

           Angle := Pi * (Pos / 5);

 //          Button[B].Visible := False;

@@ -1398,7 +1398,7 @@ begin
           Button[B].Y := Theme.Song.Cover.Y + Theme.Song.Cover.W * X - Diff;

         end

         else

-        begin {Behind the Front Covers}   {

+        begin {Behind the Front Covers}

 

           // limit-bg-covers hack

           if (abs(VS/2-abs(Pos))>10) then Button[B].Visible:=False;

@@ -1427,7 +1427,7 @@ begin
         end;

       end;

     end;

-  end;        }

+  end;

 end;

 

 

@@ -1453,8 +1453,8 @@ begin
   if Length(CatSongs.Song) > 0 then begin

     //Load Music only when Song Preview is activated

     if ( Ini.PreviewVolume   <> 0 ) then

-    begin                                            // to - do : new Song management

-      if(AudioPlayback.Open({CatSongs.Song[Interaction].Path + }CatSongs.Song[Interaction].Mp3)) then

+    begin

+      if(AudioPlayback.Open(CatSongs.Song[Interaction].Path + CatSongs.Song[Interaction].Mp3)) then

       begin

         AudioPlayback.SetLoop(false);

         AudioPlayback.Position := AudioPlayback.Length / 4;

@@ -1508,8 +1508,8 @@ begin
     AudioPlayback.SetMusicVolume(100);

 

   //If Preview is deactivated: Load MUsicfile now

-  If (Ini.PreviewVolume = 0) then        // to - do : new Song management

-    AudioPlayback.Open({Song[Interaction].Path + } CatSongs.Song[Interaction].Mp3);

+  If (Ini.PreviewVolume = 0) then

+    AudioPlayback.Open(CatSongs.Song[Interaction].Path + CatSongs.Song[Interaction].Mp3);

 

   //When hide then Stop Music (For Party Mode Popup on Exit)

   if (Display.NextScreen <> @ScreenSing) and (Display.NextScreen <> @ScreenSingModi) and (AudioPlayback <> nil) then

@@ -1565,9 +1565,9 @@ begin
       Button[Interaction].Texture2 := Texture.GetTexture(Button[Interaction].Texture.Name, TEXTURE_TYPE_PLAIN, false);

       Button[Interaction].Texture2.Alpha := 1;

     end;

-                                                         // to - do : new Song management

+

     //Song Fade

-    if (CatSongs.VisibleSongs > 0) AND (Ini.PreviewVolume <> 0) {AND (Not CatSongs.Song[Interaction].Main)} AND (Ini.PreviewFading <> 0) then

+    if (CatSongs.VisibleSongs > 0) AND (Ini.PreviewVolume <> 0) AND (Not CatSongs.Song[Interaction].Main) AND (Ini.PreviewFading <> 0) then

     begin

       //Start Song Fade after a little Time, to prevent Song to be Played on Scrolling

       if (CoverTime < 0.2) and (CoverTime + TimeSkip >= 0.2) then

@@ -1636,9 +1636,9 @@ begin
     Skip := 1;

 

     // this 1 could be changed by CatSongs.FindNextVisible

-    {while (not CatSongs.Song[(Interaction + Skip) mod Length(Interactions)].Visible) do Inc(Skip);

+    while (not CatSongs.Song[(Interaction + Skip) mod Length(Interactions)].Visible) do Inc(Skip);

 

-    }SongTarget := SongTarget + 1;//Skip;

+    SongTarget := SongTarget + 1;//Skip;

 

     Interaction := (Interaction + Skip) mod Length(Interactions);

 

@@ -1667,8 +1667,8 @@ begin
 

     Skip := 1;

 

-    {while (not CatSongs.Song[(Interaction - Skip + Length(Interactions)) mod Length(Interactions)].Visible) do Inc(Skip);

-    }SongTarget := SongTarget - 1;//Skip;

+    while (not CatSongs.Song[(Interaction - Skip + Length(Interactions)) mod Length(Interactions)].Visible) do Inc(Skip);

+    SongTarget := SongTarget - 1;//Skip;

 

     Interaction := (Interaction - Skip + Length(Interactions)) mod Length(Interactions);

 

@@ -1699,7 +1699,7 @@ begin
   //When Music Preview is avtivated -> then Change Music

   if (Ini.PreviewVolume <> 0) then

     begin

-    {if (NOT CatSongs.Song[Interaction].Main) AND(CatSongs.VisibleSongs > 0) then

+    if (NOT CatSongs.Song[Interaction].Main) AND(CatSongs.VisibleSongs > 0) then

     begin

       AudioPlayback.Close;

       if AudioPlayback.Open(CatSongs.Song[Interaction].Path + CatSongs.Song[Interaction].Mp3) then begin

@@ -1712,7 +1712,7 @@ begin
       end;

     end

     else

-      AudioPlayback.Stop; }

+      AudioPlayback.Stop;

   end;

 end;

 

@@ -1852,17 +1852,17 @@ begin
         begin

           //When Tabs are activated then use Tab Method

           if (Ini.Tabs_at_startup = 1) then

-          begin      // to - do : new Song management

-            {repeat

+          begin

+            repeat

               I2 := Random(high(CatSongs.Song)+1) - low(CatSongs.Song)+1;

-            until CatSongs.Song[I2].Main = false;}

+            until CatSongs.Song[I2].Main = false;

 

             //Search Cat

-            {for I := I2 downto low(CatSongs.Song) do

+            for I := I2 downto low(CatSongs.Song) do

             begin

               if CatSongs.Song[I].Main then

                 break;

-            end; }

+            end;

             //In I ist jetzt die Kategorie in I2 der Song

             //I is the CatNum, I2 is the No of the Song within this Cat

 

@@ -2040,14 +2040,14 @@ begin
 end;

 

 procedure TScreenSong.OpenEditor;

-begin   // to - do : new Song management

-  {if (Songs.SongList.Count > 0) and (not CatSongs.Song[Interaction].Main) AND (Mode = smNormal) then

+begin

+  if (Songs.SongList.Count > 0) and (not CatSongs.Song[Interaction].Main) AND (Mode = smNormal) then

   begin

     AudioPlayback.Stop;

     AudioPlayback.PlaySound(SoundLib.Start);

     CurrentSong := CatSongs.Song[Interaction];

     FadeTo(@ScreenEditSub);

-  end;  }

+  end;

 end;

 

 //Team No of Team (0-5)

diff --git a/Game/Code/Screens/UScreenTop5.pas b/Game/Code/Screens/UScreenTop5.pas
index 2a673880..7ad46d49 100644
--- a/Game/Code/Screens/UScreenTop5.pas
+++ b/Game/Code/Screens/UScreenTop5.pas
@@ -101,26 +101,26 @@ begin
   //ReadScore(CurrentSong);
 
   PMax := Ini.Players;
-  if Ini.Players = 4 then Ini.Players := 5;    // to - do : new Song management
-  {for I := 0 to PMax do
+  if Ini.Players = 4 then Ini.Players := 5;
+  for I := 0 to PMax do
     DataBase.AddScore(CurrentSong, Ini.Difficulty, Ini.Name[I], Round(Player[I].ScoreTotalI));
 
   DataBase.WriteScore(CurrentSong);
-  DataBase.ReadScore(CurrentSong); }
+  DataBase.ReadScore(CurrentSong);
 
   Text[TextArtistTitle].Text := CurrentSong.Artist + ' - ' + CurrentSong.Title;
 
-  for I := 1 to Length(CurrentSong.Score(Ini.Difficulty)) do begin
+  for I := 1 to Length(CurrentSong.Score[Ini.Difficulty]) do begin
     Static[StaticNumber[I]].Visible := true;
     Text[TextNumber[I]].Visible := true;
     Text[TextName[I]].Visible := true;
     Text[TextScore[I]].Visible := true;
 
-    Text[TextName[I]].Text := CurrentSong.Score(Ini.Difficulty)[I-1].Name;
-    Text[TextScore[I]].Text := IntToStr(CurrentSong.Score(Ini.Difficulty) [I-1].Score);
+    Text[TextName[I]].Text := CurrentSong.Score[Ini.Difficulty, I-1].Name;
+    Text[TextScore[I]].Text := IntToStr(CurrentSong.Score[Ini.Difficulty, I-1].Score);
   end;
 
-  for I := Length(CurrentSong.Score(Ini.Difficulty))+1 to 5 do begin
+  for I := Length(CurrentSong.Score[Ini.Difficulty])+1 to 5 do begin
     Static[StaticNumber[I]].Visible := false;
     Text[TextNumber[I]].Visible := false;
     Text[TextName[I]].Visible := false;