fixed a bunch of path delimiter issues on linux build :)

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

4 files changed, 1698 insertions, 1698 deletions

diff --git a/Game/Code/Classes/UDLLManager.pas b/Game/Code/Classes/UDLLManager.pas
index d25efb35..ff6c16a4 100644
--- a/Game/Code/Classes/UDLLManager.pas
+++ b/Game/Code/Classes/UDLLManager.pas
@@ -42,11 +42,11 @@ var
   DLLMan: TDLLMan;
 
 const
+  DLLPath = 'Plugins';
+
   {$IFDEF win32}
-     DLLPath = 'Plugins\';
      DLLExt  = '.dll';
   {$ELSE}
-     DLLPath = 'Plugins/';
      DLLExt  = '.so';
   {$ENDIF}
 
@@ -73,7 +73,7 @@ var
   SR:     TSearchRec;
 begin
 
-  if FindFirst(DLLPath + '*' + DLLExt, faAnyFile	, SR) = 0 then
+  if FindFirst(DLLPath +PathDelim+ '*' + DLLExt, faAnyFile	, SR) = 0 then
   begin
     repeat
       SetLength(Plugins, Length(Plugins)+1);
@@ -143,7 +143,7 @@ begin
       exit;  }
 
   //Load Libary
-  hLibg := LoadLibrary(PChar(DLLPath + Filename));
+  hLibg := LoadLibrary(PChar(DLLPath +PathDelim+ Filename));
   //If Loaded
   if (hLibg <> 0) then
   begin
@@ -170,7 +170,7 @@ function TDLLMan.LoadPlugin(No: Cardinal): boolean;
 begin
   Result := False;
   //Load Libary
-  hLib := LoadLibrary(PChar(DLLPath + PluginPaths[No]));
+  hLib := LoadLibrary(PChar(DLLPath +PathDelim+ PluginPaths[No]));
   //If Loaded
   if (hLib <> 0) then
   begin
diff --git a/Game/Code/Classes/UIni.pas b/Game/Code/Classes/UIni.pas
index cd5c3716..86ce7361 100644
--- a/Game/Code/Classes/UIni.pas
+++ b/Game/Code/Classes/UIni.pas
@@ -1,776 +1,776 @@
-unit UIni;

-

-interface

-

-{$IFDEF FPC}

-  {$MODE DELPHI}

-{$ENDIF}

-

-uses IniFiles, ULog, SysUtils;

-

-type

-  TIni = class

-    Name:           array[0..11] of string;

-

-    // Templates for Names Mod

-    NameTeam:       array[0..2] of string;

-    NameTemplate:   array[0..11] of string;

-

-    //Filename of the opened iniFile

-    Filename:       string;

-

-    // Game

-    Players:        integer;

-    Difficulty:     integer;

-    Language:       integer;

-    Tabs:           integer;

-    Tabs_at_startup:integer; //Tabs at Startup fix

-    Sorting:        integer;

-    Debug:          integer;

-

-    // Graphics

-    Screens:        integer;

-    Resolution:     integer;

-    Depth:          integer;

-    FullScreen:     integer;

-    TextureSize:    integer;

-    SingWindow:     integer;

-    Oscilloscope:   integer;

-    Spectrum:       integer;

-    Spectrograph:   integer;

-    MovieSize:      integer;

-

-    // Sound

-    MicBoost:       integer;

-    ClickAssist:    integer;

-    BeatClick:      integer;

-    SavePlayback:   integer;

-    Threshold:      integer;

-

-    //Song Preview

-    PreviewVolume: integer;

-    PreviewFading: integer;

-

-    // Lyrics

-    LyricsFont:     integer;

-    LyricsEffect:   integer;

-    Solmization:    integer;

-

-    // Themes

-    Theme:          integer;

-    SkinNo:           integer;

-    Color:          integer;

-

-    // Record

-    Card:           integer; // not saved in config.ini

-

-    CardList:       array of record

-      Name:           string;

-      Input:          integer;

-      ChannelL:       integer;

-      ChannelR:       integer;

-    end;

-

-    // Advanced

-    LoadAnimation:  integer;

-    EffectSing:     integer;

-    ScreenFade:     integer;

-    AskbeforeDel:   integer;

-    OnSongClick:    integer;

-    LineBonus:      integer;

-    PartyPopup:     integer;

-

-    // Controller

-    Joypad:         integer;

-

-    // Soundcards

-    SoundCard:      array[0..7, 1..2] of integer;

-

-    // Devices

-    LPT:            integer;

-

-    procedure Load;

-    procedure Save;

-    procedure SaveNames;

-    procedure SaveLevel;

-  end;

-

-

-var

-  Ini:    TIni;

-  IResolution:    array of string;

-  ILanguage:      array of string;

-  ITheme:         array of string;

-  ISkin:          array of string;

-  ICard:          array of string;

-  IInput:         array of string;

-

-const

-  IPlayers:       array[0..4] of string = ('1', '2', '3', '4', '6');

-  IDifficulty:    array[0..2] of string = ('Easy', 'Medium', 'Hard');

-  ITabs:          array[0..1] of string = ('Off', 'On');

-

-  ISorting:       array[0..7] of string = ('Edition', 'Genre', 'Language', 'Folder', 'Title', 'Artist', 'Title2', 'Artist2');

-  sEdition = 0;

-  sGenre = 1;

-  sLanguage = 2;

-  sFolder = 3;

-  sTitle = 4;

-  sArtist = 5;

-  sTitle2 = 6;

-  sArtist2 = 7;

-

-  IDebug:         array[0..1] of string = ('Off', 'On');

-

-  IScreens:       array[0..1] of string = ('1', '2');

-  IFullScreen:    array[0..1] of string = ('Off', 'On');

-  IDepth:         array[0..1] of string = ('16 bit', '32 bit');

-  ITextureSize:   array[0..2] of string = ('128', '256', '512');

-  ISingWindow:    array[0..1] of string = ('Small', 'Big');

-

-  //SingBar Mod

-  IOscilloscope:  array[0..2] of string = ('Off', 'Osci', 'Bar');

-  //IOscilloscope:  array[0..1] of string = ('Off', 'On');

-

-  ISpectrum:      array[0..1] of string = ('Off', 'On');

-  ISpectrograph:  array[0..1] of string = ('Off', 'On');

-  IMovieSize:     array[0..2] of string = ('Half', 'Full [Vid]', 'Full [BG+Vid]');

-

-  IMicBoost:      array[0..3] of string = ('Off', '+6dB', '+12dB', '+18dB');

-  IClickAssist:   array[0..1] of string = ('Off', 'On');

-  IBeatClick:     array[0..1] of string = ('Off', 'On');

-  ISavePlayback:  array[0..1] of string = ('Off', 'On');

-  IThreshold:     array[0..3] of string = ('5%', '10%', '15%', '20%');

-  //Song Preview

-  IPreviewVolume: array[0..10] of string = ('Off', '10%', '20%', '30%', '40%', '50%', '60%', '70%', '80%', '90%', '100%');

-  IPreviewFading: array[0..5] of string  = ('Off', '1 Sec', '2 Secs', '3 Secs', '4 Secs', '5 Secs');

-

-

-  ILyricsFont:    array[0..2] of string = ('Plain', 'OLine1', 'OLine2');

-  ILyricsEffect:  array[0..3] of string = ('Simple', 'Zoom', 'Slide', 'Ball');

-  ISolmization:   array[0..3] of string = ('Off', 'Euro', 'Jap', 'American');

-

-  IColor:         array[0..8] of string = ('Blue', 'Green', 'Pink', 'Red', 'Violet', 'Orange', 'Yellow', 'Brown', 'Black');

-

-  // Advanced

-  ILoadAnimation: array[0..1] of string = ('Off', 'On');

-  IEffectSing:    array[0..1] of string = ('Off', 'On');

-  IScreenFade: array [0..1] of String =('Off', 'On');

-  IAskbeforeDel:  array[0..1] of string = ('Off', 'On');

-  IOnSongClick:   array[0..2] of string = ('Sing', 'Select Players', 'Open Menu');

-  ILineBonus:  array[0..2] of string = ('Off', 'At Score', 'At Notes');

-  IPartyPopup: array[0..1] of string = ('Off', 'On');

-

-  IJoypad:        array[0..1] of string = ('Off', 'On');

-  ILPT:           array[0..2] of string = ('Off', 'LCD', 'Lights');

-

-  IChannel:       array[0..6] of string = ('0', '1', '2', '3', '4', '5', '6');

-

-implementation

-

-uses //UFiles,

-     UMain,

-     SDL,

-     ULanguage,

-     USkins,

-     URecord,

-     UCommandLine;

-

-procedure TIni.Load;

-var

-  IniFile:    TMemIniFile;

-  ThemeIni:   TMemIniFile;

-  Tekst:      string;

-  Pet:        integer;

-  B: boolean;

-  I, I2, I3:          integer;

-  S:          string;

-  Modes:      PPSDL_Rect;

-  SR: TSearchRec; //Skin List Patch

-

-  function GetFileName (S: String):String;

-  begin

-  //Result := copy (S,0,StrRScan (PChar(S),char('.'))+1);

-    Result := copy (S,0,Pos ('.ini',S)-1);

-  end;

-

-begin

-  GamePath := ExtractFilePath(ParamStr(0));

-  

-  if (Params.ConfigFile <> '') then

-    try

-      IniFile := TMemIniFile.Create(Params.ConfigFile);

-    except

-      IniFile := TMemIniFile.Create(GamePath + 'config.ini');

-    end

-  else

-    IniFile := TMemIniFile.Create(GamePath + 'config.ini');

-

-

-  // Name

-  for I := 0 to 11 do

-    Ini.Name[I] := IniFile.ReadString('Name', 'P'+IntToStr(I+1), 'Player'+IntToStr(I+1));

-

-

-  // Templates for Names Mod

-  for I := 0 to 2 do

-    Ini.NameTeam[I] := IniFile.ReadString('NameTeam', 'T'+IntToStr(I+1), 'Team'+IntToStr(I+1));

-  for I := 0 to 11 do

-    Ini.NameTemplate[I] := IniFile.ReadString('NameTemplate', 'Name'+IntToStr(I+1), 'Template'+IntToStr(I+1));

-

-  // Players

-  Tekst := IniFile.ReadString('Game', 'Players', IPlayers[0]);

-  for Pet := 0 to High(IPlayers) do

-    if Tekst = IPlayers[Pet] then Ini.Players := Pet;

-

-  // Difficulty

-  Tekst := IniFile.ReadString('Game', 'Difficulty', 'Easy');

-  for Pet := 0 to High(IDifficulty) do

-    if Tekst = IDifficulty[Pet] then Ini.Difficulty := Pet;

-

-  // Language

-  Tekst := IniFile.ReadString('Game', 'Language', 'English');

-  for Pet := 0 to High(ILanguage) do

-    if Tekst = ILanguage[Pet] then Ini.Language := Pet;

-

-//  Language.ChangeLanguage(ILanguage[Ini.Language]);

-

-  // Tabs

-  Tekst := IniFile.ReadString('Game', 'Tabs', ITabs[0]);

-  for Pet := 0 to High(ITabs) do

-    if Tekst = ITabs[Pet] then Ini.Tabs := Pet;

-

-  //Tabs at Startup fix

-  Ini.Tabs_at_startup := Ini.Tabs;

-

-  // Sorting

-  Tekst := IniFile.ReadString('Game', 'Sorting', ISorting[0]);

-  for Pet := 0 to High(ISorting) do

-    if Tekst = ISorting[Pet] then Ini.Sorting := Pet;

-

-  // Debug

-  Tekst := IniFile.ReadString('Game', 'Debug', IDebug[0]);

-  for Pet := 0 to High(IDebug) do

-    if Tekst = IDebug[Pet] then Ini.Debug := Pet;

-

-  //if Ini.Debug = 1 then SongPath := 'E:\UltraStar 03\Songs\';

-

-  // Screens

-  Tekst := IniFile.ReadString('Graphics', 'Screens', IScreens[0]);

-  for Pet := 0 to High(IScreens) do

-    if Tekst = IScreens[Pet] then Ini.Screens := Pet;

-

-  // Resolution

-  SetLength(IResolution, 0);

-  Modes := SDL_ListModes(nil, SDL_OPENGL or SDL_FULLSCREEN); // Check if there are any modes available

-  repeat

-//    Log.LogError(Format( ' %d x %d', [ modes^.w, modes^.h ] ) );

-    SetLength(IResolution, Length(IResolution) + 1);

-    IResolution[High(IResolution)] := IntToStr(Modes^.w) + 'x' + IntToStr(Modes^.h);

-    Inc(Modes);

-  until Modes^ = nil;

-

-  // reverse order

-  for I := 0 to (Length(IResolution) div 2) - 1 do begin

-    S := IResolution[I];

-    IResolution[I] := IResolution[High(IResolution)-I];

-    IResolution[High(IResolution)-I] := S;

-  end;

-

-  Tekst := IniFile.ReadString('Graphics', 'Resolution', '800x600');

-  for Pet := 0 to High(IResolution) do

-    if Tekst = IResolution[Pet] then Ini.Resolution := Pet;

-

-  // FullScreen

-  Tekst := IniFile.ReadString('Graphics', 'FullScreen', 'On');

-  for Pet := 0 to High(IFullScreen) do

-    if Tekst = IFullScreen[Pet] then Ini.FullScreen := Pet;

-

-  // Resolution

-  Tekst := IniFile.ReadString('Graphics', 'Depth', '32 bit');

-  for Pet := 0 to High(IDepth) do

-    if Tekst = IDepth[Pet] then Ini.Depth := Pet;

-

-  // Texture Size

-  Tekst := IniFile.ReadString('Graphics', 'TextureSize', ITextureSize[1]);

-  for Pet := 0 to High(ITextureSize) do

-    if Tekst = ITextureSize[Pet] then Ini.TextureSize := Pet;

-

-  // SingWindow

-  Tekst := IniFile.ReadString('Graphics', 'SingWindow', 'Big');

-  for Pet := 0 to High(ISingWindow) do

-    if Tekst = ISingWindow[Pet] then Ini.SingWindow := Pet;

-

-  // Oscilloscope

-  Tekst := IniFile.ReadString('Graphics', 'Oscilloscope', 'Bar');

-  for Pet := 0 to High(IOscilloscope) do

-    if Tekst = IOscilloscope[Pet] then Ini.Oscilloscope := Pet;

-

-  // Spectrum

-  Tekst := IniFile.ReadString('Graphics', 'Spectrum', 'Off');

-  for Pet := 0 to High(ISpectrum) do

-    if Tekst = ISpectrum[Pet] then Ini.Spectrum := Pet;

-

-  // Spectrograph

-  Tekst := IniFile.ReadString('Graphics', 'Spectrograph', 'Off');

-  for Pet := 0 to High(ISpectrograph) do

-    if Tekst = ISpectrograph[Pet] then Ini.Spectrograph := Pet;

-

-  // MovieSize

-  Tekst := IniFile.ReadString('Graphics', 'MovieSize', IMovieSize[2]);

-  for Pet := 0 to High(IMovieSize) do

-    if Tekst = IMovieSize[Pet] then Ini.MovieSize := Pet;

-

-  // MicBoost

-  Tekst := IniFile.ReadString('Sound',    'MicBoost',    'Off');

-  for Pet := 0 to High(IMicBoost) do

-    if Tekst = IMicBoost[Pet] then Ini.MicBoost := Pet;

-

-  // ClickAssist

-  Tekst := IniFile.ReadString('Sound',    'ClickAssist', 'Off');

-  for Pet := 0 to High(IClickAssist) do

-    if Tekst = IClickAssist[Pet] then Ini.ClickAssist := Pet;

-

-  // BeatClick

-  Tekst := IniFile.ReadString('Sound',    'BeatClick', IBeatClick[0]);

-  for Pet := 0 to High(IBeatClick) do

-    if Tekst = IBeatClick[Pet] then Ini.BeatClick := Pet;

-

-  // SavePlayback

-  Tekst := IniFile.ReadString('Sound',    'SavePlayback', ISavePlayback[0]);

-  for Pet := 0 to High(ISavePlayback) do

-    if Tekst = ISavePlayback[Pet] then Ini.SavePlayback := Pet;

-

-  // Threshold

-  Tekst := IniFile.ReadString('Sound', 'Threshold', IThreshold[2]);

-  for Pet := 0 to High(IThreshold) do

-    if Tekst = IThreshold[Pet] then Ini.Threshold := Pet;

-

-  //Song Preview

-  Tekst := IniFile.ReadString('Sound', 'PreviewVolume', IPreviewVolume[7]);

-  for Pet := 0 to High(IPreviewVolume) do

-    if Tekst = IPreviewVolume[Pet] then Ini.PreviewVolume := Pet;

-

-  Tekst := IniFile.ReadString('Sound', 'PreviewFading', IPreviewFading[1]);

-  for Pet := 0 to High(IPreviewFading) do

-    if Tekst = IPreviewFading[Pet] then Ini.PreviewFading := Pet;

-

-  // Lyrics Font

-  Tekst := IniFile.ReadString('Lyrics',    'LyricsFont',   ILyricsFont[1]);

-  for Pet := 0 to High(ILyricsFont) do

-    if Tekst = ILyricsFont[Pet] then Ini.LyricsFont := Pet;

-

-  // Lyrics Effect

-  Tekst := IniFile.ReadString('Lyrics',    'LyricsEffect',   ILyricsEffect[1]);

-  for Pet := 0 to High(ILyricsEffect) do

-    if Tekst = ILyricsEffect[Pet] then Ini.LyricsEffect := Pet;

-

-  // Solmization

-  Tekst := IniFile.ReadString('Lyrics',    'Solmization',   ISolmization[0]);

-  for Pet := 0 to High(ISolmization) do

-    if Tekst = ISolmization[Pet] then Ini.Solmization := Pet;

-

-  // Theme

-

-  //Theme List Patch

-

-    //I2 Saves the no of the Deluxe (Standard-) Theme

-    I2 := 0;

-    //I counts is the cur. Theme no

-    I := 0;

-

-    SetLength(ITheme, 0);

-    FindFirst('Themes\*.ini',faAnyFile,SR);

-    Repeat

-      //Read Themename from Theme

-      ThemeIni := TMemIniFile.Create(SR.Name);

-      Tekst := UpperCase(ThemeIni.ReadString('Theme','Name',GetFileName(SR.Name)));

-      ThemeIni.Free;

-

-      //if Deluxe Theme then save Themeno to I2

-      if (Tekst = 'DELUXE') then

-        I2 := I;

-

-      //Search for Skins for this Theme  

-      for Pet := low(Skin.Skin) to high(Skin.Skin) do

-      begin

-        if UpperCase(Skin.Skin[Pet].Theme) = Tekst then

-        begin

-          SetLength(ITheme, Length(ITheme)+1);

-          ITheme[High(ITheme)] := GetFileName(SR.Name);

-          break;

-        end;

-      end;

-

-      Inc(I);

-    Until FindNext(SR) <> 0;

-    FindClose(SR);

-  //Theme List Patch End }

-

-  //No Theme Found

-  if (Length(ITheme)=0) then

-  begin

-    Log.CriticalError('Could not find any valid Themes.');

-  end;

-

-

-  Tekst := IniFile.ReadString('Themes',    'Theme',   ITheme[I2]);

-  Ini.Theme := 0;

-  for Pet := 0 to High(ITheme) do

-    if Uppercase(Tekst) = Uppercase(ITheme[Pet]) then Ini.Theme := Pet;

-

-  // Skin

-  Skin.onThemeChange;

-  Ini.SkinNo := 0;

-

-  Tekst := IniFile.ReadString('Themes',    'Skin',   ISkin[0]);

-  for Pet := 0 to High(ISkin) do

-    if Tekst = ISkin[Pet] then Ini.SkinNo := Pet;

-

-  // Color

-  Tekst := IniFile.ReadString('Themes',    'Color',   IColor[0]);

-  for Pet := 0 to High(IColor) do

-    if Tekst = IColor[Pet] then Ini.Color := Pet;

-

-  // Record - load ini list

-  SetLength(CardList, 0);

-  I := 1;

-  while (IniFile.ValueExists('Record', 'DeviceName' + IntToStr(I)) = true) do begin

-    //Automatically Delete not Existing Sound Cards

-    S := IniFile.ReadString('Record', 'DeviceName' + IntToStr(I), '');

-    //{

-    B := False;

-    //Look for Soundcard

-    for I2 := 0 to High(Recording.SoundCard) do

-    begin

-      if (S = Trim(Recording.SoundCard[I2].Description)) then

-      begin

-      B := True;

-      Break;

-      end;

-    end;

-

-    if B then

-    begin //}

-      I3 := Length(CardList);

-      SetLength(CardList, I3+1);

-      Ini.CardList[I3].Name := S;

-      Ini.CardList[I3].Input := IniFile.ReadInteger('Record', 'Input' + IntToStr(I), 0);

-      Ini.CardList[I3].ChannelL := IniFile.ReadInteger('Record', 'ChannelL' + IntToStr(I), 0);

-      Ini.CardList[I3].ChannelR := IniFile.ReadInteger('Record', 'ChannelR' + IntToStr(I), 0);

-    end;

-    Inc(I);

-  end;

-

-  // Record - append detected soundcards

-  for I := 0 to High(Recording.SoundCard) do

-  begin

-    B := False;

-    For I2 := 0 to High(CardList) do

-    begin //Search for Card in List

-      if (CardList[I2].Name = Trim(Recording.SoundCard[I].Description)) then

-      begin

-        B := True;

-        Break;

-      end;

-    end;

-

-    //If not in List -> Add

-    If not B then

-    begin

-      I3 := Length(CardList);

-      SetLength(CardList, I3+1);

-      CardList[I3].Name := Trim(Recording.SoundCard[I].Description);

-      CardList[I3].Input := 0;

-      CardList[I3].ChannelL := 0;

-      CardList[I3].ChannelR := 0;

-      // default for new users

-      if (Length(CardList) = 1) then

-        CardList[I].ChannelL := 1;

-    end;

-  end;

-

-  //Advanced Settings

-

-  // LoadAnimation

-  Tekst := IniFile.ReadString('Advanced', 'LoadAnimation', 'On');

-  for Pet := 0 to High(ILoadAnimation) do

-    if Tekst = ILoadAnimation[Pet] then Ini.LoadAnimation := Pet;

-

-  // ScreenFade

-  Tekst := IniFile.ReadString('Advanced', 'ScreenFade', 'On');

-  for Pet := 0 to High(IScreenFade) do

-    if Tekst = IScreenFade[Pet] then Ini.ScreenFade := Pet;

-

-  // EffectSing

-  Tekst := IniFile.ReadString('Advanced', 'EffectSing', 'On');

-  for Pet := 0 to High(IEffectSing) do

-    if Tekst = IEffectSing[Pet] then Ini.EffectSing := Pet;

-

-  // AskbeforeDel

-  Tekst := IniFile.ReadString('Advanced', 'AskbeforeDel', 'On');

-  for Pet := 0 to High(IAskbeforeDel) do

-    if Tekst = IAskbeforeDel[Pet] then Ini.AskbeforeDel := Pet;

-

-  // OnSongClick

-  Tekst := IniFile.ReadString('Advanced', 'OnSongClick', 'Sing');

-  for Pet := 0 to High(IOnSongClick) do

-    if Tekst = IOnSongClick[Pet] then Ini.OnSongClick := Pet;

-

-  // Linebonus

-  Tekst := IniFile.ReadString('Advanced', 'LineBonus', 'At Score');

-  for Pet := 0 to High(ILineBonus) do

-    if Tekst = ILineBonus[Pet] then Ini.LineBonus := Pet;

-

-  // PartyPopup

-  Tekst := IniFile.ReadString('Advanced', 'PartyPopup', 'On');

-  for Pet := 0 to High(IPartyPopup) do

-    if Tekst = IPartyPopup[Pet] then Ini.PartyPopup := Pet;

-

-

-  // Joypad

-  Tekst := IniFile.ReadString('Controller',    'Joypad',   IJoypad[0]);

-  for Pet := 0 to High(IJoypad) do

-    if Tekst = IJoypad[Pet] then Ini.Joypad := Pet;

-

-  // LCD

-  Tekst := IniFile.ReadString('Devices',    'LPT',   ILPT[0]);

-  for Pet := 0 to High(ILPT) do

-    if Tekst = ILPT[Pet] then Ini.LPT := Pet;

-

-

-  // SongPath

-  if (Params.SongPath <> '') then

-    SongPath := IncludeTrailingPathDelimiter(Params.SongPath)

-  else

-    SongPath := IncludeTrailingPathDelimiter(IniFile.ReadString('Path', 'Songs', SongPath));

-

-  Filename := IniFile.FileName;

-  IniFile.Free;

-end;

-

-procedure TIni.Save;

-var

-  IniFile:    TIniFile;

-  Tekst:      string;

-  I: Integer;

-  S: String;

-begin

-  //if not (FileExists(GamePath + 'config.ini') and FileIsReadOnly(GamePath + 'config.ini')) then begin

-  if not (FileExists(Filename) and FileIsReadOnly(Filename)) then begin

-

-    IniFile := TIniFile.Create(Filename);

-

-    // Players

-    Tekst := IPlayers[Ini.Players];

-    IniFile.WriteString('Game',     'Players',   Tekst);

-

-    // Difficulty

-    Tekst := IDifficulty[Ini.Difficulty];

-    IniFile.WriteString('Game',     'Difficulty',   Tekst);

-

-    // Language

-    Tekst := ILanguage[Ini.Language];

-    IniFile.WriteString('Game',     'Language',   Tekst);

-

-    // Tabs

-    Tekst := ITabs[Ini.Tabs];

-    IniFile.WriteString('Game',     'Tabs',   Tekst);

-

-    // Sorting

-    Tekst := ISorting[Ini.Sorting];

-    IniFile.WriteString('Game',     'Sorting',   Tekst);

-

-    // Debug

-    Tekst := IDebug[Ini.Debug];

-    IniFile.WriteString('Game',     'Debug',   Tekst);

-

-    // Screens

-    Tekst := IScreens[Ini.Screens];

-    IniFile.WriteString('Graphics', 'Screens', Tekst);

-

-    // FullScreen

-    Tekst := IFullScreen[Ini.FullScreen];

-    IniFile.WriteString('Graphics', 'FullScreen', Tekst);

-

-    // Resolution

-    Tekst := IResolution[Ini.Resolution];

-    IniFile.WriteString('Graphics', 'Resolution', Tekst);

-

-    // Depth

-    Tekst := IDepth[Ini.Depth];

-    IniFile.WriteString('Graphics', 'Depth', Tekst);

-

-    // Resolution

-    Tekst := ITextureSize[Ini.TextureSize];

-    IniFile.WriteString('Graphics', 'TextureSize', Tekst);

-

-    // Sing Window

-    Tekst := ISingWindow[Ini.SingWindow];

-    IniFile.WriteString('Graphics', 'SingWindow', Tekst);

-

-    // Oscilloscope

-    Tekst := IOscilloscope[Ini.Oscilloscope];

-    IniFile.WriteString('Graphics', 'Oscilloscope', Tekst);

-

-    // Spectrum

-    Tekst := ISpectrum[Ini.Spectrum];

-    IniFile.WriteString('Graphics', 'Spectrum', Tekst);

-

-    // Spectrograph

-    Tekst := ISpectrograph[Ini.Spectrograph];

-    IniFile.WriteString('Graphics', 'Spectrograph', Tekst);

-

-    // Movie Size

-    Tekst := IMovieSize[Ini.MovieSize];

-    IniFile.WriteString('Graphics', 'MovieSize', Tekst);

-

-    // MicBoost

-    Tekst := IMicBoost[Ini.MicBoost];

-    IniFile.WriteString('Sound',    'MicBoost',    Tekst);

-

-    // ClickAssist

-    Tekst := IClickAssist[Ini.ClickAssist];

-    IniFile.WriteString('Sound',    'ClickAssist',    Tekst);

-

-    // BeatClick

-    Tekst := IBeatClick[Ini.BeatClick];

-    IniFile.WriteString('Sound',    'BeatClick',    Tekst);

-

-    // Threshold

-    Tekst := IThreshold[Ini.Threshold];

-    IniFile.WriteString('Sound',    'Threshold',    Tekst);

-

-    // Song Preview

-    Tekst := IPreviewVolume[Ini.PreviewVolume];

-    IniFile.WriteString('Sound',    'PreviewVolume',    Tekst);

-

-    Tekst := IPreviewFading[Ini.PreviewFading];

-    IniFile.WriteString('Sound',    'PreviewFading',    Tekst);

-

-    // SavePlayback

-    Tekst := ISavePlayback[Ini.SavePlayback];

-    IniFile.WriteString('Sound',    'SavePlayback',    Tekst);

-

-    // Lyrics Font

-    Tekst := ILyricsFont[Ini.LyricsFont];

-    IniFile.WriteString('Lyrics',    'LyricsFont',    Tekst);

-

-    // Lyrics Effect

-    Tekst := ILyricsEffect[Ini.LyricsEffect];

-    IniFile.WriteString('Lyrics',    'LyricsEffect',    Tekst);

-

-    // Solmization

-    Tekst := ISolmization[Ini.Solmization];

-    IniFile.WriteString('Lyrics',    'Solmization',    Tekst);

-

-    // Theme

-    Tekst := ITheme[Ini.Theme];

-    IniFile.WriteString('Themes',    'Theme',    Tekst);

-

-    // Skin

-    Tekst := ISkin[Ini.SkinNo];

-    IniFile.WriteString('Themes',    'Skin',    Tekst);

-

-    // Color

-    Tekst := IColor[Ini.Color];

-    IniFile.WriteString('Themes',    'Color',    Tekst);

-

-    // Record

-      for I := 0 to High(CardList) do begin

-        S := IntToStr(I+1);

-

-        Tekst := CardList[I].Name;

-        IniFile.WriteString('Record', 'DeviceName' + S, Tekst);

-

-        Tekst := IntToStr(CardList[I].Input);

-        IniFile.WriteString('Record', 'Input' + S, Tekst);

-

-        Tekst := IntToStr(CardList[I].ChannelL);

-        IniFile.WriteString('Record', 'ChannelL' + S, Tekst);

-

-        Tekst := IntToStr(CardList[I].ChannelR);

-        IniFile.WriteString('Record', 'ChannelR' + S, Tekst);

-      end;

-

-      //Log.LogError(InttoStr(Length(CardList)) + ' Cards Saved');

-

-    //Advanced Settings

-

-    //LoadAnimation

-    Tekst := ILoadAnimation[Ini.LoadAnimation];

-    IniFile.WriteString('Advanced', 'LoadAnimation', Tekst);

-

-    //EffectSing

-    Tekst := IEffectSing[Ini.EffectSing];

-    IniFile.WriteString('Advanced', 'EffectSing', Tekst);

-

-    //ScreenFade

-    Tekst := IScreenFade[Ini.ScreenFade];

-    IniFile.WriteString('Advanced', 'ScreenFade', Tekst);

-

-    //AskbeforeDel

-    Tekst := IAskbeforeDel[Ini.AskbeforeDel];

-    IniFile.WriteString('Advanced', 'AskbeforeDel', Tekst);

-

-    //OnSongClick

-    Tekst := IOnSongClick[Ini.OnSongClick];

-    IniFile.WriteString('Advanced', 'OnSongClick', Tekst);

-

-    //Line Bonus

-    Tekst := ILineBonus[Ini.LineBonus];

-    IniFile.WriteString('Advanced', 'LineBonus', Tekst);

-

-    //Party Popup

-    Tekst := IPartyPopup[Ini.PartyPopup];

-    IniFile.WriteString('Advanced', 'PartyPopup', Tekst);

-

-    // Joypad

-    Tekst := IJoypad[Ini.Joypad];

-    IniFile.WriteString('Controller',    'Joypad',    Tekst);

-

-    IniFile.Free;

-  end;

-end;

-

-procedure TIni.SaveNames;

-var

-  IniFile:    TIniFile;

-  I:          integer;

-begin

-  //if not FileIsReadOnly(GamePath + 'config.ini') then begin

-    //IniFile := TIniFile.Create(GamePath + 'config.ini');

-  if not FileIsReadOnly(Filename) then begin

-    IniFile := TIniFile.Create(Filename);

-

-    //Name

-      // Templates for Names Mod

-    for I := 1 to 12 do

-      IniFile.WriteString('Name', 'P' + IntToStr(I), Ini.Name[I-1]);

-    for I := 1 to 3 do

-      IniFile.WriteString('NameTeam', 'T' + IntToStr(I), Ini.NameTeam[I-1]);

-    for I := 1 to 12 do

-      IniFile.WriteString('NameTemplate', 'Name' + IntToStr(I), Ini.NameTemplate[I-1]);

-

-    IniFile.Free;

-  end;

-end;

-

-procedure TIni.SaveLevel;

-var

-  IniFile:    TIniFile;

-  I:          integer;

-begin

-  //if not FileIsReadOnly(GamePath + 'config.ini') then begin

-    //IniFile := TIniFile.Create(GamePath + 'config.ini');

-  if not FileIsReadOnly(Filename) then begin

-    IniFile := TIniFile.Create(Filename);

-

-    // Difficulty

-    IniFile.WriteString('Game', 'Difficulty', IDifficulty[Ini.Difficulty]);

-

-    IniFile.Free;

-  end;

-end;

-

-end.

+unit UIni;
+
+interface
+
+{$IFDEF FPC}
+  {$MODE DELPHI}
+{$ENDIF}
+
+uses IniFiles, ULog, SysUtils;
+
+type
+  TIni = class
+    Name:           array[0..11] of string;
+
+    // Templates for Names Mod
+    NameTeam:       array[0..2] of string;
+    NameTemplate:   array[0..11] of string;
+
+    //Filename of the opened iniFile
+    Filename:       string;
+
+    // Game
+    Players:        integer;
+    Difficulty:     integer;
+    Language:       integer;
+    Tabs:           integer;
+    Tabs_at_startup:integer; //Tabs at Startup fix
+    Sorting:        integer;
+    Debug:          integer;
+
+    // Graphics
+    Screens:        integer;
+    Resolution:     integer;
+    Depth:          integer;
+    FullScreen:     integer;
+    TextureSize:    integer;
+    SingWindow:     integer;
+    Oscilloscope:   integer;
+    Spectrum:       integer;
+    Spectrograph:   integer;
+    MovieSize:      integer;
+
+    // Sound
+    MicBoost:       integer;
+    ClickAssist:    integer;
+    BeatClick:      integer;
+    SavePlayback:   integer;
+    Threshold:      integer;
+
+    //Song Preview
+    PreviewVolume: integer;
+    PreviewFading: integer;
+
+    // Lyrics
+    LyricsFont:     integer;
+    LyricsEffect:   integer;
+    Solmization:    integer;
+
+    // Themes
+    Theme:          integer;
+    SkinNo:           integer;
+    Color:          integer;
+
+    // Record
+    Card:           integer; // not saved in config.ini
+
+    CardList:       array of record
+      Name:           string;
+      Input:          integer;
+      ChannelL:       integer;
+      ChannelR:       integer;
+    end;
+
+    // Advanced
+    LoadAnimation:  integer;
+    EffectSing:     integer;
+    ScreenFade:     integer;
+    AskbeforeDel:   integer;
+    OnSongClick:    integer;
+    LineBonus:      integer;
+    PartyPopup:     integer;
+
+    // Controller
+    Joypad:         integer;
+
+    // Soundcards
+    SoundCard:      array[0..7, 1..2] of integer;
+
+    // Devices
+    LPT:            integer;
+
+    procedure Load;
+    procedure Save;
+    procedure SaveNames;
+    procedure SaveLevel;
+  end;
+
+
+var
+  Ini:    TIni;
+  IResolution:    array of string;
+  ILanguage:      array of string;
+  ITheme:         array of string;
+  ISkin:          array of string;
+  ICard:          array of string;
+  IInput:         array of string;
+
+const
+  IPlayers:       array[0..4] of string = ('1', '2', '3', '4', '6');
+  IDifficulty:    array[0..2] of string = ('Easy', 'Medium', 'Hard');
+  ITabs:          array[0..1] of string = ('Off', 'On');
+
+  ISorting:       array[0..7] of string = ('Edition', 'Genre', 'Language', 'Folder', 'Title', 'Artist', 'Title2', 'Artist2');
+  sEdition = 0;
+  sGenre = 1;
+  sLanguage = 2;
+  sFolder = 3;
+  sTitle = 4;
+  sArtist = 5;
+  sTitle2 = 6;
+  sArtist2 = 7;
+
+  IDebug:         array[0..1] of string = ('Off', 'On');
+
+  IScreens:       array[0..1] of string = ('1', '2');
+  IFullScreen:    array[0..1] of string = ('Off', 'On');
+  IDepth:         array[0..1] of string = ('16 bit', '32 bit');
+  ITextureSize:   array[0..2] of string = ('128', '256', '512');
+  ISingWindow:    array[0..1] of string = ('Small', 'Big');
+
+  //SingBar Mod
+  IOscilloscope:  array[0..2] of string = ('Off', 'Osci', 'Bar');
+  //IOscilloscope:  array[0..1] of string = ('Off', 'On');
+
+  ISpectrum:      array[0..1] of string = ('Off', 'On');
+  ISpectrograph:  array[0..1] of string = ('Off', 'On');
+  IMovieSize:     array[0..2] of string = ('Half', 'Full [Vid]', 'Full [BG+Vid]');
+
+  IMicBoost:      array[0..3] of string = ('Off', '+6dB', '+12dB', '+18dB');
+  IClickAssist:   array[0..1] of string = ('Off', 'On');
+  IBeatClick:     array[0..1] of string = ('Off', 'On');
+  ISavePlayback:  array[0..1] of string = ('Off', 'On');
+  IThreshold:     array[0..3] of string = ('5%', '10%', '15%', '20%');
+  //Song Preview
+  IPreviewVolume: array[0..10] of string = ('Off', '10%', '20%', '30%', '40%', '50%', '60%', '70%', '80%', '90%', '100%');
+  IPreviewFading: array[0..5] of string  = ('Off', '1 Sec', '2 Secs', '3 Secs', '4 Secs', '5 Secs');
+
+
+  ILyricsFont:    array[0..2] of string = ('Plain', 'OLine1', 'OLine2');
+  ILyricsEffect:  array[0..3] of string = ('Simple', 'Zoom', 'Slide', 'Ball');
+  ISolmization:   array[0..3] of string = ('Off', 'Euro', 'Jap', 'American');
+
+  IColor:         array[0..8] of string = ('Blue', 'Green', 'Pink', 'Red', 'Violet', 'Orange', 'Yellow', 'Brown', 'Black');
+
+  // Advanced
+  ILoadAnimation: array[0..1] of string = ('Off', 'On');
+  IEffectSing:    array[0..1] of string = ('Off', 'On');
+  IScreenFade: array [0..1] of String =('Off', 'On');
+  IAskbeforeDel:  array[0..1] of string = ('Off', 'On');
+  IOnSongClick:   array[0..2] of string = ('Sing', 'Select Players', 'Open Menu');
+  ILineBonus:  array[0..2] of string = ('Off', 'At Score', 'At Notes');
+  IPartyPopup: array[0..1] of string = ('Off', 'On');
+
+  IJoypad:        array[0..1] of string = ('Off', 'On');
+  ILPT:           array[0..2] of string = ('Off', 'LCD', 'Lights');
+
+  IChannel:       array[0..6] of string = ('0', '1', '2', '3', '4', '5', '6');
+
+implementation
+
+uses //UFiles,
+     UMain,
+     SDL,
+     ULanguage,
+     USkins,
+     URecord,
+     UCommandLine;
+
+procedure TIni.Load;
+var
+  IniFile:    TMemIniFile;
+  ThemeIni:   TMemIniFile;
+  Tekst:      string;
+  Pet:        integer;
+  B: boolean;
+  I, I2, I3:          integer;
+  S:          string;
+  Modes:      PPSDL_Rect;
+  SR: TSearchRec; //Skin List Patch
+
+  function GetFileName (S: String):String;
+  begin
+  //Result := copy (S,0,StrRScan (PChar(S),char('.'))+1);
+    Result := copy (S,0,Pos ('.ini',S)-1);
+  end;
+
+begin
+  GamePath := ExtractFilePath(ParamStr(0));
+  
+  if (Params.ConfigFile <> '') then
+    try
+      IniFile := TMemIniFile.Create(Params.ConfigFile);
+    except
+      IniFile := TMemIniFile.Create(GamePath + 'config.ini');
+    end
+  else
+    IniFile := TMemIniFile.Create(GamePath + 'config.ini');
+
+
+  // Name
+  for I := 0 to 11 do
+    Ini.Name[I] := IniFile.ReadString('Name', 'P'+IntToStr(I+1), 'Player'+IntToStr(I+1));
+
+
+  // Templates for Names Mod
+  for I := 0 to 2 do
+    Ini.NameTeam[I] := IniFile.ReadString('NameTeam', 'T'+IntToStr(I+1), 'Team'+IntToStr(I+1));
+  for I := 0 to 11 do
+    Ini.NameTemplate[I] := IniFile.ReadString('NameTemplate', 'Name'+IntToStr(I+1), 'Template'+IntToStr(I+1));
+
+  // Players
+  Tekst := IniFile.ReadString('Game', 'Players', IPlayers[0]);
+  for Pet := 0 to High(IPlayers) do
+    if Tekst = IPlayers[Pet] then Ini.Players := Pet;
+
+  // Difficulty
+  Tekst := IniFile.ReadString('Game', 'Difficulty', 'Easy');
+  for Pet := 0 to High(IDifficulty) do
+    if Tekst = IDifficulty[Pet] then Ini.Difficulty := Pet;
+
+  // Language
+  Tekst := IniFile.ReadString('Game', 'Language', 'English');
+  for Pet := 0 to High(ILanguage) do
+    if Tekst = ILanguage[Pet] then Ini.Language := Pet;
+
+//  Language.ChangeLanguage(ILanguage[Ini.Language]);
+
+  // Tabs
+  Tekst := IniFile.ReadString('Game', 'Tabs', ITabs[0]);
+  for Pet := 0 to High(ITabs) do
+    if Tekst = ITabs[Pet] then Ini.Tabs := Pet;
+
+  //Tabs at Startup fix
+  Ini.Tabs_at_startup := Ini.Tabs;
+
+  // Sorting
+  Tekst := IniFile.ReadString('Game', 'Sorting', ISorting[0]);
+  for Pet := 0 to High(ISorting) do
+    if Tekst = ISorting[Pet] then Ini.Sorting := Pet;
+
+  // Debug
+  Tekst := IniFile.ReadString('Game', 'Debug', IDebug[0]);
+  for Pet := 0 to High(IDebug) do
+    if Tekst = IDebug[Pet] then Ini.Debug := Pet;
+
+  //if Ini.Debug = 1 then SongPath := 'E:\UltraStar 03\Songs\';
+
+  // Screens
+  Tekst := IniFile.ReadString('Graphics', 'Screens', IScreens[0]);
+  for Pet := 0 to High(IScreens) do
+    if Tekst = IScreens[Pet] then Ini.Screens := Pet;
+
+  // Resolution
+  SetLength(IResolution, 0);
+  Modes := SDL_ListModes(nil, SDL_OPENGL or SDL_FULLSCREEN); // Check if there are any modes available
+  repeat
+//    Log.LogError(Format( ' %d x %d', [ modes^.w, modes^.h ] ) );
+    SetLength(IResolution, Length(IResolution) + 1);
+    IResolution[High(IResolution)] := IntToStr(Modes^.w) + 'x' + IntToStr(Modes^.h);
+    Inc(Modes);
+  until Modes^ = nil;
+
+  // reverse order
+  for I := 0 to (Length(IResolution) div 2) - 1 do begin
+    S := IResolution[I];
+    IResolution[I] := IResolution[High(IResolution)-I];
+    IResolution[High(IResolution)-I] := S;
+  end;
+
+  Tekst := IniFile.ReadString('Graphics', 'Resolution', '800x600');
+  for Pet := 0 to High(IResolution) do
+    if Tekst = IResolution[Pet] then Ini.Resolution := Pet;
+
+  // FullScreen
+  Tekst := IniFile.ReadString('Graphics', 'FullScreen', 'On');
+  for Pet := 0 to High(IFullScreen) do
+    if Tekst = IFullScreen[Pet] then Ini.FullScreen := Pet;
+
+  // Resolution
+  Tekst := IniFile.ReadString('Graphics', 'Depth', '32 bit');
+  for Pet := 0 to High(IDepth) do
+    if Tekst = IDepth[Pet] then Ini.Depth := Pet;
+
+  // Texture Size
+  Tekst := IniFile.ReadString('Graphics', 'TextureSize', ITextureSize[1]);
+  for Pet := 0 to High(ITextureSize) do
+    if Tekst = ITextureSize[Pet] then Ini.TextureSize := Pet;
+
+  // SingWindow
+  Tekst := IniFile.ReadString('Graphics', 'SingWindow', 'Big');
+  for Pet := 0 to High(ISingWindow) do
+    if Tekst = ISingWindow[Pet] then Ini.SingWindow := Pet;
+
+  // Oscilloscope
+  Tekst := IniFile.ReadString('Graphics', 'Oscilloscope', 'Bar');
+  for Pet := 0 to High(IOscilloscope) do
+    if Tekst = IOscilloscope[Pet] then Ini.Oscilloscope := Pet;
+
+  // Spectrum
+  Tekst := IniFile.ReadString('Graphics', 'Spectrum', 'Off');
+  for Pet := 0 to High(ISpectrum) do
+    if Tekst = ISpectrum[Pet] then Ini.Spectrum := Pet;
+
+  // Spectrograph
+  Tekst := IniFile.ReadString('Graphics', 'Spectrograph', 'Off');
+  for Pet := 0 to High(ISpectrograph) do
+    if Tekst = ISpectrograph[Pet] then Ini.Spectrograph := Pet;
+
+  // MovieSize
+  Tekst := IniFile.ReadString('Graphics', 'MovieSize', IMovieSize[2]);
+  for Pet := 0 to High(IMovieSize) do
+    if Tekst = IMovieSize[Pet] then Ini.MovieSize := Pet;
+
+  // MicBoost
+  Tekst := IniFile.ReadString('Sound',    'MicBoost',    'Off');
+  for Pet := 0 to High(IMicBoost) do
+    if Tekst = IMicBoost[Pet] then Ini.MicBoost := Pet;
+
+  // ClickAssist
+  Tekst := IniFile.ReadString('Sound',    'ClickAssist', 'Off');
+  for Pet := 0 to High(IClickAssist) do
+    if Tekst = IClickAssist[Pet] then Ini.ClickAssist := Pet;
+
+  // BeatClick
+  Tekst := IniFile.ReadString('Sound',    'BeatClick', IBeatClick[0]);
+  for Pet := 0 to High(IBeatClick) do
+    if Tekst = IBeatClick[Pet] then Ini.BeatClick := Pet;
+
+  // SavePlayback
+  Tekst := IniFile.ReadString('Sound',    'SavePlayback', ISavePlayback[0]);
+  for Pet := 0 to High(ISavePlayback) do
+    if Tekst = ISavePlayback[Pet] then Ini.SavePlayback := Pet;
+
+  // Threshold
+  Tekst := IniFile.ReadString('Sound', 'Threshold', IThreshold[2]);
+  for Pet := 0 to High(IThreshold) do
+    if Tekst = IThreshold[Pet] then Ini.Threshold := Pet;
+
+  //Song Preview
+  Tekst := IniFile.ReadString('Sound', 'PreviewVolume', IPreviewVolume[7]);
+  for Pet := 0 to High(IPreviewVolume) do
+    if Tekst = IPreviewVolume[Pet] then Ini.PreviewVolume := Pet;
+
+  Tekst := IniFile.ReadString('Sound', 'PreviewFading', IPreviewFading[1]);
+  for Pet := 0 to High(IPreviewFading) do
+    if Tekst = IPreviewFading[Pet] then Ini.PreviewFading := Pet;
+
+  // Lyrics Font
+  Tekst := IniFile.ReadString('Lyrics',    'LyricsFont',   ILyricsFont[1]);
+  for Pet := 0 to High(ILyricsFont) do
+    if Tekst = ILyricsFont[Pet] then Ini.LyricsFont := Pet;
+
+  // Lyrics Effect
+  Tekst := IniFile.ReadString('Lyrics',    'LyricsEffect',   ILyricsEffect[1]);
+  for Pet := 0 to High(ILyricsEffect) do
+    if Tekst = ILyricsEffect[Pet] then Ini.LyricsEffect := Pet;
+
+  // Solmization
+  Tekst := IniFile.ReadString('Lyrics',    'Solmization',   ISolmization[0]);
+  for Pet := 0 to High(ISolmization) do
+    if Tekst = ISolmization[Pet] then Ini.Solmization := Pet;
+
+  // Theme
+
+  //Theme List Patch
+
+    //I2 Saves the no of the Deluxe (Standard-) Theme
+    I2 := 0;
+    //I counts is the cur. Theme no
+    I := 0;
+
+    SetLength(ITheme, 0);
+    FindFirst('Themes' + PathDelim + '*.ini',faAnyFile,SR);
+    Repeat
+      //Read Themename from Theme
+      ThemeIni := TMemIniFile.Create(SR.Name);
+      Tekst := UpperCase(ThemeIni.ReadString('Theme','Name',GetFileName(SR.Name)));
+      ThemeIni.Free;
+
+      //if Deluxe Theme then save Themeno to I2
+      if (Tekst = 'DELUXE') then
+        I2 := I;
+
+      //Search for Skins for this Theme  
+      for Pet := low(Skin.Skin) to high(Skin.Skin) do
+      begin
+        if UpperCase(Skin.Skin[Pet].Theme) = Tekst then
+        begin
+          SetLength(ITheme, Length(ITheme)+1);
+          ITheme[High(ITheme)] := GetFileName(SR.Name);
+          break;
+        end;
+      end;
+
+      Inc(I);
+    Until FindNext(SR) <> 0;
+    FindClose(SR);
+  //Theme List Patch End }
+
+  //No Theme Found
+  if (Length(ITheme)=0) then
+  begin
+    Log.CriticalError('Could not find any valid Themes.');
+  end;
+
+
+  Tekst := IniFile.ReadString('Themes',    'Theme',   ITheme[I2]);
+  Ini.Theme := 0;
+  for Pet := 0 to High(ITheme) do
+    if Uppercase(Tekst) = Uppercase(ITheme[Pet]) then Ini.Theme := Pet;
+
+  // Skin
+  Skin.onThemeChange;
+  Ini.SkinNo := 0;
+
+  Tekst := IniFile.ReadString('Themes',    'Skin',   ISkin[0]);
+  for Pet := 0 to High(ISkin) do
+    if Tekst = ISkin[Pet] then Ini.SkinNo := Pet;
+
+  // Color
+  Tekst := IniFile.ReadString('Themes',    'Color',   IColor[0]);
+  for Pet := 0 to High(IColor) do
+    if Tekst = IColor[Pet] then Ini.Color := Pet;
+
+  // Record - load ini list
+  SetLength(CardList, 0);
+  I := 1;
+  while (IniFile.ValueExists('Record', 'DeviceName' + IntToStr(I)) = true) do begin
+    //Automatically Delete not Existing Sound Cards
+    S := IniFile.ReadString('Record', 'DeviceName' + IntToStr(I), '');
+    //{
+    B := False;
+    //Look for Soundcard
+    for I2 := 0 to High(Recording.SoundCard) do
+    begin
+      if (S = Trim(Recording.SoundCard[I2].Description)) then
+      begin
+      B := True;
+      Break;
+      end;
+    end;
+
+    if B then
+    begin //}
+      I3 := Length(CardList);
+      SetLength(CardList, I3+1);
+      Ini.CardList[I3].Name := S;
+      Ini.CardList[I3].Input := IniFile.ReadInteger('Record', 'Input' + IntToStr(I), 0);
+      Ini.CardList[I3].ChannelL := IniFile.ReadInteger('Record', 'ChannelL' + IntToStr(I), 0);
+      Ini.CardList[I3].ChannelR := IniFile.ReadInteger('Record', 'ChannelR' + IntToStr(I), 0);
+    end;
+    Inc(I);
+  end;
+
+  // Record - append detected soundcards
+  for I := 0 to High(Recording.SoundCard) do
+  begin
+    B := False;
+    For I2 := 0 to High(CardList) do
+    begin //Search for Card in List
+      if (CardList[I2].Name = Trim(Recording.SoundCard[I].Description)) then
+      begin
+        B := True;
+        Break;
+      end;
+    end;
+
+    //If not in List -> Add
+    If not B then
+    begin
+      I3 := Length(CardList);
+      SetLength(CardList, I3+1);
+      CardList[I3].Name := Trim(Recording.SoundCard[I].Description);
+      CardList[I3].Input := 0;
+      CardList[I3].ChannelL := 0;
+      CardList[I3].ChannelR := 0;
+      // default for new users
+      if (Length(CardList) = 1) then
+        CardList[I].ChannelL := 1;
+    end;
+  end;
+
+  //Advanced Settings
+
+  // LoadAnimation
+  Tekst := IniFile.ReadString('Advanced', 'LoadAnimation', 'On');
+  for Pet := 0 to High(ILoadAnimation) do
+    if Tekst = ILoadAnimation[Pet] then Ini.LoadAnimation := Pet;
+
+  // ScreenFade
+  Tekst := IniFile.ReadString('Advanced', 'ScreenFade', 'On');
+  for Pet := 0 to High(IScreenFade) do
+    if Tekst = IScreenFade[Pet] then Ini.ScreenFade := Pet;
+
+  // EffectSing
+  Tekst := IniFile.ReadString('Advanced', 'EffectSing', 'On');
+  for Pet := 0 to High(IEffectSing) do
+    if Tekst = IEffectSing[Pet] then Ini.EffectSing := Pet;
+
+  // AskbeforeDel
+  Tekst := IniFile.ReadString('Advanced', 'AskbeforeDel', 'On');
+  for Pet := 0 to High(IAskbeforeDel) do
+    if Tekst = IAskbeforeDel[Pet] then Ini.AskbeforeDel := Pet;
+
+  // OnSongClick
+  Tekst := IniFile.ReadString('Advanced', 'OnSongClick', 'Sing');
+  for Pet := 0 to High(IOnSongClick) do
+    if Tekst = IOnSongClick[Pet] then Ini.OnSongClick := Pet;
+
+  // Linebonus
+  Tekst := IniFile.ReadString('Advanced', 'LineBonus', 'At Score');
+  for Pet := 0 to High(ILineBonus) do
+    if Tekst = ILineBonus[Pet] then Ini.LineBonus := Pet;
+
+  // PartyPopup
+  Tekst := IniFile.ReadString('Advanced', 'PartyPopup', 'On');
+  for Pet := 0 to High(IPartyPopup) do
+    if Tekst = IPartyPopup[Pet] then Ini.PartyPopup := Pet;
+
+
+  // Joypad
+  Tekst := IniFile.ReadString('Controller',    'Joypad',   IJoypad[0]);
+  for Pet := 0 to High(IJoypad) do
+    if Tekst = IJoypad[Pet] then Ini.Joypad := Pet;
+
+  // LCD
+  Tekst := IniFile.ReadString('Devices',    'LPT',   ILPT[0]);
+  for Pet := 0 to High(ILPT) do
+    if Tekst = ILPT[Pet] then Ini.LPT := Pet;
+
+
+  // SongPath
+  if (Params.SongPath <> '') then
+    SongPath := IncludeTrailingPathDelimiter(Params.SongPath)
+  else
+    SongPath := IncludeTrailingPathDelimiter(IniFile.ReadString('Path', 'Songs', SongPath));
+
+  Filename := IniFile.FileName;
+  IniFile.Free;
+end;
+
+procedure TIni.Save;
+var
+  IniFile:    TIniFile;
+  Tekst:      string;
+  I: Integer;
+  S: String;
+begin
+  //if not (FileExists(GamePath + 'config.ini') and FileIsReadOnly(GamePath + 'config.ini')) then begin
+  if not (FileExists(Filename) and FileIsReadOnly(Filename)) then begin
+
+    IniFile := TIniFile.Create(Filename);
+
+    // Players
+    Tekst := IPlayers[Ini.Players];
+    IniFile.WriteString('Game',     'Players',   Tekst);
+
+    // Difficulty
+    Tekst := IDifficulty[Ini.Difficulty];
+    IniFile.WriteString('Game',     'Difficulty',   Tekst);
+
+    // Language
+    Tekst := ILanguage[Ini.Language];
+    IniFile.WriteString('Game',     'Language',   Tekst);
+
+    // Tabs
+    Tekst := ITabs[Ini.Tabs];
+    IniFile.WriteString('Game',     'Tabs',   Tekst);
+
+    // Sorting
+    Tekst := ISorting[Ini.Sorting];
+    IniFile.WriteString('Game',     'Sorting',   Tekst);
+
+    // Debug
+    Tekst := IDebug[Ini.Debug];
+    IniFile.WriteString('Game',     'Debug',   Tekst);
+
+    // Screens
+    Tekst := IScreens[Ini.Screens];
+    IniFile.WriteString('Graphics', 'Screens', Tekst);
+
+    // FullScreen
+    Tekst := IFullScreen[Ini.FullScreen];
+    IniFile.WriteString('Graphics', 'FullScreen', Tekst);
+
+    // Resolution
+    Tekst := IResolution[Ini.Resolution];
+    IniFile.WriteString('Graphics', 'Resolution', Tekst);
+
+    // Depth
+    Tekst := IDepth[Ini.Depth];
+    IniFile.WriteString('Graphics', 'Depth', Tekst);
+
+    // Resolution
+    Tekst := ITextureSize[Ini.TextureSize];
+    IniFile.WriteString('Graphics', 'TextureSize', Tekst);
+
+    // Sing Window
+    Tekst := ISingWindow[Ini.SingWindow];
+    IniFile.WriteString('Graphics', 'SingWindow', Tekst);
+
+    // Oscilloscope
+    Tekst := IOscilloscope[Ini.Oscilloscope];
+    IniFile.WriteString('Graphics', 'Oscilloscope', Tekst);
+
+    // Spectrum
+    Tekst := ISpectrum[Ini.Spectrum];
+    IniFile.WriteString('Graphics', 'Spectrum', Tekst);
+
+    // Spectrograph
+    Tekst := ISpectrograph[Ini.Spectrograph];
+    IniFile.WriteString('Graphics', 'Spectrograph', Tekst);
+
+    // Movie Size
+    Tekst := IMovieSize[Ini.MovieSize];
+    IniFile.WriteString('Graphics', 'MovieSize', Tekst);
+
+    // MicBoost
+    Tekst := IMicBoost[Ini.MicBoost];
+    IniFile.WriteString('Sound',    'MicBoost',    Tekst);
+
+    // ClickAssist
+    Tekst := IClickAssist[Ini.ClickAssist];
+    IniFile.WriteString('Sound',    'ClickAssist',    Tekst);
+
+    // BeatClick
+    Tekst := IBeatClick[Ini.BeatClick];
+    IniFile.WriteString('Sound',    'BeatClick',    Tekst);
+
+    // Threshold
+    Tekst := IThreshold[Ini.Threshold];
+    IniFile.WriteString('Sound',    'Threshold',    Tekst);
+
+    // Song Preview
+    Tekst := IPreviewVolume[Ini.PreviewVolume];
+    IniFile.WriteString('Sound',    'PreviewVolume',    Tekst);
+
+    Tekst := IPreviewFading[Ini.PreviewFading];
+    IniFile.WriteString('Sound',    'PreviewFading',    Tekst);
+
+    // SavePlayback
+    Tekst := ISavePlayback[Ini.SavePlayback];
+    IniFile.WriteString('Sound',    'SavePlayback',    Tekst);
+
+    // Lyrics Font
+    Tekst := ILyricsFont[Ini.LyricsFont];
+    IniFile.WriteString('Lyrics',    'LyricsFont',    Tekst);
+
+    // Lyrics Effect
+    Tekst := ILyricsEffect[Ini.LyricsEffect];
+    IniFile.WriteString('Lyrics',    'LyricsEffect',    Tekst);
+
+    // Solmization
+    Tekst := ISolmization[Ini.Solmization];
+    IniFile.WriteString('Lyrics',    'Solmization',    Tekst);
+
+    // Theme
+    Tekst := ITheme[Ini.Theme];
+    IniFile.WriteString('Themes',    'Theme',    Tekst);
+
+    // Skin
+    Tekst := ISkin[Ini.SkinNo];
+    IniFile.WriteString('Themes',    'Skin',    Tekst);
+
+    // Color
+    Tekst := IColor[Ini.Color];
+    IniFile.WriteString('Themes',    'Color',    Tekst);
+
+    // Record
+      for I := 0 to High(CardList) do begin
+        S := IntToStr(I+1);
+
+        Tekst := CardList[I].Name;
+        IniFile.WriteString('Record', 'DeviceName' + S, Tekst);
+
+        Tekst := IntToStr(CardList[I].Input);
+        IniFile.WriteString('Record', 'Input' + S, Tekst);
+
+        Tekst := IntToStr(CardList[I].ChannelL);
+        IniFile.WriteString('Record', 'ChannelL' + S, Tekst);
+
+        Tekst := IntToStr(CardList[I].ChannelR);
+        IniFile.WriteString('Record', 'ChannelR' + S, Tekst);
+      end;
+
+      //Log.LogError(InttoStr(Length(CardList)) + ' Cards Saved');
+
+    //Advanced Settings
+
+    //LoadAnimation
+    Tekst := ILoadAnimation[Ini.LoadAnimation];
+    IniFile.WriteString('Advanced', 'LoadAnimation', Tekst);
+
+    //EffectSing
+    Tekst := IEffectSing[Ini.EffectSing];
+    IniFile.WriteString('Advanced', 'EffectSing', Tekst);
+
+    //ScreenFade
+    Tekst := IScreenFade[Ini.ScreenFade];
+    IniFile.WriteString('Advanced', 'ScreenFade', Tekst);
+
+    //AskbeforeDel
+    Tekst := IAskbeforeDel[Ini.AskbeforeDel];
+    IniFile.WriteString('Advanced', 'AskbeforeDel', Tekst);
+
+    //OnSongClick
+    Tekst := IOnSongClick[Ini.OnSongClick];
+    IniFile.WriteString('Advanced', 'OnSongClick', Tekst);
+
+    //Line Bonus
+    Tekst := ILineBonus[Ini.LineBonus];
+    IniFile.WriteString('Advanced', 'LineBonus', Tekst);
+
+    //Party Popup
+    Tekst := IPartyPopup[Ini.PartyPopup];
+    IniFile.WriteString('Advanced', 'PartyPopup', Tekst);
+
+    // Joypad
+    Tekst := IJoypad[Ini.Joypad];
+    IniFile.WriteString('Controller',    'Joypad',    Tekst);
+
+    IniFile.Free;
+  end;
+end;
+
+procedure TIni.SaveNames;
+var
+  IniFile:    TIniFile;
+  I:          integer;
+begin
+  //if not FileIsReadOnly(GamePath + 'config.ini') then begin
+    //IniFile := TIniFile.Create(GamePath + 'config.ini');
+  if not FileIsReadOnly(Filename) then begin
+    IniFile := TIniFile.Create(Filename);
+
+    //Name
+      // Templates for Names Mod
+    for I := 1 to 12 do
+      IniFile.WriteString('Name', 'P' + IntToStr(I), Ini.Name[I-1]);
+    for I := 1 to 3 do
+      IniFile.WriteString('NameTeam', 'T' + IntToStr(I), Ini.NameTeam[I-1]);
+    for I := 1 to 12 do
+      IniFile.WriteString('NameTemplate', 'Name' + IntToStr(I), Ini.NameTemplate[I-1]);
+
+    IniFile.Free;
+  end;
+end;
+
+procedure TIni.SaveLevel;
+var
+  IniFile:    TIniFile;
+  I:          integer;
+begin
+  //if not FileIsReadOnly(GamePath + 'config.ini') then begin
+    //IniFile := TIniFile.Create(GamePath + 'config.ini');
+  if not FileIsReadOnly(Filename) then begin
+    IniFile := TIniFile.Create(Filename);
+
+    // Difficulty
+    IniFile.WriteString('Game', 'Difficulty', IDifficulty[Ini.Difficulty]);
+
+    IniFile.Free;
+  end;
+end;
+
+end.
diff --git a/Game/Code/Classes/USkins.pas b/Game/Code/Classes/USkins.pas
index a5f618ff..a825050f 100644
--- a/Game/Code/Classes/USkins.pas
+++ b/Game/Code/Classes/USkins.pas
@@ -1,164 +1,164 @@
-unit USkins;

-

-{$IFDEF FPC}

-  {$MODE DELPHI}

-{$ENDIF}

-             

-

-interface

-

-type

-  TSkinTexture = record

-    Name:       string;

-    FileName:   string;

-  end;

-

-  TSkinEntry = record

-    Theme:      string;

-    Name:       string;

-    Path:       string;

-    FileName:   string;

-    Creator:    string; // not used yet

-  end;

-

-  TSkin = class

-    Skin:         array of TSkinEntry;

-    SkinTexture:  array of TSkinTexture;

-    SkinPath:     string;

-    Color:        integer;

-    constructor Create;

-    procedure LoadList;

-    procedure ParseDir(Dir: string);

-    procedure LoadHeader(FileName: string);

-    procedure LoadSkin(Name: string);

-    function GetTextureFileName(TextureName: string): string;

-    function GetSkinNumber(Name: string): integer;

-    procedure onThemeChange;

-  end;

-

-var

-  Skin:   TSkin;

-

-implementation

-

-uses IniFiles, Classes, SysUtils, ULog, UIni;

-

-constructor TSkin.Create;

-begin

-  LoadList;

-//  LoadSkin('Lisek');

-//  SkinColor := Color;

-end;

-

-procedure TSkin.LoadList;

-var

-  SR:     TSearchRec;

-//  SR2:    TSearchRec;

-//  SLen:   integer;

-begin

-  if FindFirst('Skins\*', faDirectory, SR) = 0 then begin

-    repeat

-      if (SR.Name <> '.') and (SR.Name <> '..') then

-        ParseDir('Skins\' + SR.Name + '\');

-    until FindNext(SR) <> 0;

-  end; // if

-  FindClose(SR);

-end;

-

-procedure TSkin.ParseDir(Dir: string);

-var

-  SR:     TSearchRec;

-//  SLen:   integer;

-begin

-  if FindFirst(Dir + '*.ini', faAnyFile, SR) = 0 then begin

-    repeat

-      if (SR.Name <> '.') and (SR.Name <> '..') then

-        LoadHeader(Dir + SR.Name);

-        //Log.LogError(SR.Name);

-    until FindNext(SR) <> 0;

-  end;

-end;

-

-procedure TSkin.LoadHeader(FileName: string);

-var

-  SkinIni:    TMemIniFile;

-  S:          integer;

-begin

-  SkinIni := TMemIniFile.Create(FileName);

-

-  S := Length(Skin);

-  SetLength(Skin, S+1);

-  Skin[S].Path := IncludeTrailingBackslash(ExtractFileDir(FileName));

-  Skin[S].FileName := ExtractFileName(FileName);

-  Skin[S].Theme :=    SkinIni.ReadString('Skin', 'Theme', '');

-  Skin[S].Name :=     SkinIni.ReadString('Skin', 'Name', '');

-  Skin[S].Creator :=  SkinIni.ReadString('Skin', 'Creator', '');

-

-  SkinIni.Free;

-end;

-

-procedure TSkin.LoadSkin(Name: string);

-var

-  SkinIni:    TMemIniFile;

-  SL:         TStringList;

-  T:          integer;

-  S:          integer;

-begin

-  S := GetSkinNumber(Name);

-  SkinPath := Skin[S].Path;

-

-  SkinIni := TMemIniFile.Create(SkinPath + Skin[S].FileName);

-

-  SL := TStringList.Create;

-  SkinIni.ReadSection('Textures', SL);

-

-  SetLength(SkinTexture, SL.Count);

-  for T := 0 to SL.Count-1 do begin

-    SkinTexture[T].Name := SL.Strings[T];

-    SkinTexture[T].FileName := SkinIni.ReadString('Textures', SL.Strings[T], '');

-  end;

-

-  SL.Free;

-  SkinIni.Free;

-end;

-

-function TSkin.GetTextureFileName(TextureName: string): string;

-var

-  T:    integer;

-begin

-  Result := '';

-  for T := 0 to High(SkinTexture) do

-    if SkinTexture[T].Name = TextureName then Result := SkinPath + SkinTexture[T].FileName;

-

-{  Result := SkinPath + 'Bar.jpg';

-  if TextureName = 'Ball' then Result := SkinPath + 'Ball.bmp';

-  if Copy(TextureName, 1, 4) = 'Gray' then Result := SkinPath + 'Ball.bmp';

-  if Copy(TextureName, 1, 6) = 'NoteBG' then Result := SkinPath + 'Ball.bmp';}

-end;

-

-function TSkin.GetSkinNumber(Name: string): integer;

-var

-  S:    integer;

-begin

-  Result := 0; // set default to the first available skin

-  for S := 0 to High(Skin) do

-    if Skin[S].Name = Name then Result := S;

-end;

-

-procedure TSkin.onThemeChange;

-var

-  S:    integer;

-  Name: String;

-begin

-  Ini.SkinNo:=0;

-  SetLength(ISkin, 0);

-  Name := Uppercase(ITheme[Ini.Theme]);

-  for S := 0 to High(Skin) do

-    if Name = Uppercase(Skin[S].Theme) then begin

-      SetLength(ISkin, Length(ISkin)+1);

-      ISkin[High(ISkin)] := Skin[S].Name;

-    end;

-

-end;

-

-end.

+unit USkins;
+
+{$IFDEF FPC}
+  {$MODE DELPHI}
+{$ENDIF}
+             
+
+interface
+
+type
+  TSkinTexture = record
+    Name:       string;
+    FileName:   string;
+  end;
+
+  TSkinEntry = record
+    Theme:      string;
+    Name:       string;
+    Path:       string;
+    FileName:   string;
+    Creator:    string; // not used yet
+  end;
+
+  TSkin = class
+    Skin:         array of TSkinEntry;
+    SkinTexture:  array of TSkinTexture;
+    SkinPath:     string;
+    Color:        integer;
+    constructor Create;
+    procedure LoadList;
+    procedure ParseDir(Dir: string);
+    procedure LoadHeader(FileName: string);
+    procedure LoadSkin(Name: string);
+    function GetTextureFileName(TextureName: string): string;
+    function GetSkinNumber(Name: string): integer;
+    procedure onThemeChange;
+  end;
+
+var
+  Skin:   TSkin;
+
+implementation
+
+uses IniFiles, Classes, SysUtils, ULog, UIni;
+
+constructor TSkin.Create;
+begin
+  LoadList;
+//  LoadSkin('Lisek');
+//  SkinColor := Color;
+end;
+
+procedure TSkin.LoadList;
+var
+  SR:     TSearchRec;
+//  SR2:    TSearchRec;
+//  SLen:   integer;
+begin
+  if FindFirst('Skins'+PathDelim+'*', faDirectory, SR) = 0 then begin
+    repeat
+      if (SR.Name <> '.') and (SR.Name <> '..') then
+        ParseDir('Skins'+PathDelim + SR.Name + PathDelim);
+    until FindNext(SR) <> 0;
+  end; // if
+  FindClose(SR);
+end;
+
+procedure TSkin.ParseDir(Dir: string);
+var
+  SR:     TSearchRec;
+//  SLen:   integer;
+begin
+  if FindFirst(Dir + '*.ini', faAnyFile, SR) = 0 then begin
+    repeat
+      if (SR.Name <> '.') and (SR.Name <> '..') then
+        LoadHeader(Dir + SR.Name);
+        //Log.LogError(SR.Name);
+    until FindNext(SR) <> 0;
+  end;
+end;
+
+procedure TSkin.LoadHeader(FileName: string);
+var
+  SkinIni:    TMemIniFile;
+  S:          integer;
+begin
+  SkinIni := TMemIniFile.Create(FileName);
+
+  S := Length(Skin);
+  SetLength(Skin, S+1);
+  Skin[S].Path := IncludeTrailingBackslash(ExtractFileDir(FileName));
+  Skin[S].FileName := ExtractFileName(FileName);
+  Skin[S].Theme :=    SkinIni.ReadString('Skin', 'Theme', '');
+  Skin[S].Name :=     SkinIni.ReadString('Skin', 'Name', '');
+  Skin[S].Creator :=  SkinIni.ReadString('Skin', 'Creator', '');
+
+  SkinIni.Free;
+end;
+
+procedure TSkin.LoadSkin(Name: string);
+var
+  SkinIni:    TMemIniFile;
+  SL:         TStringList;
+  T:          integer;
+  S:          integer;
+begin
+  S := GetSkinNumber(Name);
+  SkinPath := Skin[S].Path;
+
+  SkinIni := TMemIniFile.Create(SkinPath + Skin[S].FileName);
+
+  SL := TStringList.Create;
+  SkinIni.ReadSection('Textures', SL);
+
+  SetLength(SkinTexture, SL.Count);
+  for T := 0 to SL.Count-1 do begin
+    SkinTexture[T].Name := SL.Strings[T];
+    SkinTexture[T].FileName := SkinIni.ReadString('Textures', SL.Strings[T], '');
+  end;
+
+  SL.Free;
+  SkinIni.Free;
+end;
+
+function TSkin.GetTextureFileName(TextureName: string): string;
+var
+  T:    integer;
+begin
+  Result := '';
+  for T := 0 to High(SkinTexture) do
+    if SkinTexture[T].Name = TextureName then Result := SkinPath + SkinTexture[T].FileName;
+
+{  Result := SkinPath + 'Bar.jpg';
+  if TextureName = 'Ball' then Result := SkinPath + 'Ball.bmp';
+  if Copy(TextureName, 1, 4) = 'Gray' then Result := SkinPath + 'Ball.bmp';
+  if Copy(TextureName, 1, 6) = 'NoteBG' then Result := SkinPath + 'Ball.bmp';}
+end;
+
+function TSkin.GetSkinNumber(Name: string): integer;
+var
+  S:    integer;
+begin
+  Result := 0; // set default to the first available skin
+  for S := 0 to High(Skin) do
+    if Skin[S].Name = Name then Result := S;
+end;
+
+procedure TSkin.onThemeChange;
+var
+  S:    integer;
+  Name: String;
+begin
+  Ini.SkinNo:=0;
+  SetLength(ISkin, 0);
+  Name := Uppercase(ITheme[Ini.Theme]);
+  for S := 0 to High(Skin) do
+    if Name = Uppercase(Skin[S].Theme) then begin
+      SetLength(ISkin, Length(ISkin)+1);
+      ISkin[High(ISkin)] := Skin[S].Name;
+    end;
+
+end;
+
+end.
diff --git a/Game/Code/Classes/USongs.pas b/Game/Code/Classes/USongs.pas
index f5afbee2..301eb15c 100644
--- a/Game/Code/Classes/USongs.pas
+++ b/Game/Code/Classes/USongs.pas
@@ -1,753 +1,753 @@
-unit USongs;

-

-interface

-

-{$IFDEF FPC}

-  {$MODE DELPHI}

-{$ENDIF}

-

-

-uses SysUtils, ULog, UTexture, UCatCovers;

-

-type

-  TBPM = record

-    BPM:        real;

-    StartBeat:  real;

-  end;

-

-  TScore = record

-    Name:       string;

-    Score:      integer;

-    Length:     string;

-  end;

-

-  TSong = record

-    Path:       string;

-    Folder:     string; // for sorting by folder

-    FileName:   string;

-

-    // sorting methods

-    Category:   array of string; // I think I won't need this

-    Genre:      string;

-    Edition:    string;

-    Language:   string; // 0.5.0: new

-

-    Title:      string;

-    Artist:     string;

-

-    Text:       string;

-    Creator:    string;

-

-    Cover:      string;

-    CoverTex:   TTexture;

-    Mp3:        string;

-    Background: string;

-    Video:      string;

-    VideoGAP:   real;

-    VideoLoaded: boolean; // 0.5.0: true if the video has been loaded 

-    NotesGAP:   integer;

-    Start:      real; // in seconds

-    Finish:     integer; // in miliseconds

-    Relative:   boolean;

-    Resolution: integer;

-    BPM:        array of TBPM;

-    GAP:        real; // in miliseconds

-

-    Score:      array[0..2] of array of TScore;

-

-    // these are used when sorting is enabled

-    Visible:    boolean; // false if hidden, true if visible

-    Main:       boolean; // false for songs, true for category buttons

-    OrderNum:   integer; // has a number of category for category buttons and songs

-    OrderTyp:   integer; // type of sorting for this button (0=name)

-    CatNumber:  integer; // Count of Songs in Category for Cats and Number of Song in Category for Songs

-  end;

-

-  TSongs = class

-  private

-    BrowsePos: Cardinal; //Actual Pos in Song Array

-  public

-    Song:       array of TSong; // array of songs

-    Selected:   integer; // selected song index

-    procedure LoadSongList; // load all songs

-    procedure BrowseDir(Dir: string); // should return number of songs in the future

-    procedure Sort(Order: integer);

-    function FindSongFile(Dir, Mask: string): string;

-  end;

-

-  TCatSongs = class

-    Song:       array of TSong; // array of categories with songs

-    Selected:   integer; // selected song index

-    Order:      integer; // order type (0=title)

-    CatNumShow: integer; // Category Number being seen

-    CatCount:   integer; //Number of Categorys

-

-    procedure Refresh; // refreshes arrays by recreating them from Songs array

-//    procedure Sort(Order: integer);

-    procedure ShowCategory(Index: integer); // expands all songs in category

-    procedure HideCategory(Index: integer); // hides all songs in category

-    procedure ClickCategoryButton(Index: integer); // uses ShowCategory and HideCategory when needed

-    procedure ShowCategoryList; //Hides all Songs And Show the List of all Categorys

-    function FindNextVisible(SearchFrom:integer): integer; //Find Next visible Song

-    function VisibleSongs: integer; // returns number of visible songs (for tabs)

-    function VisibleIndex(Index: integer): integer; // returns visible song index (skips invisible)

-

-    function SetFilter(FilterStr: String; const fType: Byte): Cardinal;

-  end;

-

-var

-  Songs:      TSongs; // all songs

-  CatSongs:   TCatSongs; // categorized songs

-  AktSong:    TSong; // one song *unknown use)

-

-implementation

-

-uses StrUtils,

-     UFiles,

-     UMain,

-     UIni;

-

-

-procedure TSongs.LoadSongList;

-begin

-  Log.LogStatus('Initializing', 'LoadSongList');

-

-  // clear

-  Setlength(Song, 50);

-

-  BrowsePos := 0;

-  // browse directories

-  BrowseDir(SongPath);

-

-  //Set Correct SongArray Length

-  SetLength(Song, BrowsePos);

-//  if Ini.Debug = 1 then BrowseDir('D:\Extract\Songs\');

-end;

-

-procedure TSongs.BrowseDir(Dir: string);

-var

-  SR:     TSearchRec;   // for parsing Songs Directory

-  SLen:   integer;

-begin

-  if FindFirst(Dir + '*', faDirectory, SR) = 0 then begin

-    repeat

-      if (SR.Name <> '.') and (SR.Name <> '..') then

-        BrowseDir(Dir + Sr.Name + '\');

-    until FindNext(SR) <> 0;

-  end; // if

-  FindClose(SR);

-

-//        Log.LogStatus('Parsing directory: ' + Dir + SR.Name, 'LoadSongList');

-

- if FindFirst(Dir + '*.txt', 0, SR) = 0 then begin

-//          Log.LogStatus('Parsing file:      ' + Dir + SR.Name + '\' + SRD.Name, 'LoadSongList');

-    repeat

-      //New Mod for better Memory Management

-

-      SLen := BrowsePos;

-      {//Old

-      SLen := Length(Song);

-      SetLength(Song, SLen + 1);//}

-

-      Song[SLen].Path := Dir;

-      Song[SLen].Folder := Copy(Dir, Length(SongPath)+1, 10000);

-      Song[SLen].Folder := Copy(Song[SLen].Folder, 1, Pos('\', Song[SLen].Folder)-1);

-      Song[SLen].FileName := SR.Name;

-

-      if (AnalyseFile(Song[SLen]) = false) then Dec(BrowsePos)

-      else begin

-        // scanning complete, file is good

-        // if there is no cover then try to find it

-        if Song[SLen].Cover = '' then Song[SLen].Cover := FindSongFile(Dir, '*[CO].jpg');

-//        if Song[SLen].Background = '' then begin

-//          Song[SLen].Background := FindSongFile(Dir, '*[BG].jpg');

-//        end; // no needed here}

-

-        // fix by adding path. no, don't fix it.

-//        if Song[SLen].Cover <> '' then

-//          Song[SLen].Cover := Song[SLen].Path + Song[SLen].Cover;

-      end;

-

-      //Change Length Only every 50 Entrys

-      Inc(BrowsePos);

-      

-      if (BrowsePos mod 50 = 0) AND (BrowsePos <> 0) then

-      begin

-          SetLength(Song, Length(Song) + 50);

-      end;

-

-    until FindNext(SR) <> 0;

-    end; // if FindFirst

-  FindClose(SR);

-end;

-

-procedure TSongs.Sort(Order: integer);

-var

-  S:    integer;

-  S2:   integer;

-  TempSong:   TSong;

-begin

-  case Order of

-    sEdition: // by edition

-      begin

-        for S2 := 0 to Length(Song)-1 do

-          for S := 1 to Length(Song)-1 do

-            if CompareText(Song[S].Edition, Song[S-1].Edition) < 0 then begin

-              // zamiana miejscami

-              TempSong := Song[S-1];

-              Song[S-1] := Song[S];

-              Song[S] := TempSong;

-            end;

-      end;

-    sGenre: // by genre

-      begin

-        for S2 := 0 to Length(Song)-1 do

-          for S := 1 to Length(Song)-1 do

-            if CompareText(Song[S].Genre, Song[S-1].Genre) < 0 then begin

-              // zamiana miejscami

-              TempSong := Song[S-1];

-              Song[S-1] := Song[S];

-              Song[S] := TempSong;

-            end;

-      end;

-    sTitle: // by title

-      begin

-        for S2 := 0 to Length(Song)-1 do

-          for S := 1 to Length(Song)-1 do

-            if CompareText(Song[S].Title, Song[S-1].Title) < 0 then begin

-              // zamiana miejscami

-              TempSong := Song[S-1];

-              Song[S-1] := Song[S];

-              Song[S] := TempSong;

-            end;

-

-      end;

-    sArtist: // by artist

-      begin

-        for S2 := 0 to Length(Song)-1 do

-          for S := 1 to Length(Song)-1 do

-            if CompareText(Song[S].Artist, Song[S-1].Artist) < 0 then begin

-              // zamiana miejscami

-              TempSong := Song[S-1];

-              Song[S-1] := Song[S];

-              Song[S] := TempSong;

-            end;

-      end;

-    sFolder: // by folder

-      begin

-        for S2 := 0 to Length(Song)-1 do

-          for S := 1 to Length(Song)-1 do

-            if CompareText(Song[S].Folder, Song[S-1].Folder) < 0 then begin

-              // zamiana miejscami

-              TempSong := Song[S-1];

-              Song[S-1] := Song[S];

-              Song[S] := TempSong;

-            end;

-      end;

-    sTitle2: // by title2

-      begin

-        for S2 := 0 to Length(Song)-1 do

-          for S := 1 to Length(Song)-1 do

-            if CompareText(Song[S].Title, Song[S-1].Title) < 0 then begin

-              // zamiana miejscami

-              TempSong := Song[S-1];

-              Song[S-1] := Song[S];

-              Song[S] := TempSong;

-            end;

-

-      end;

-    sArtist2: // by artist2

-      begin

-        for S2 := 0 to Length(Song)-1 do

-          for S := 1 to Length(Song)-1 do

-            if CompareText(Song[S].Artist, Song[S-1].Artist) < 0 then begin

-              // zamiana miejscami

-              TempSong := Song[S-1];

-              Song[S-1] := Song[S];

-              Song[S] := TempSong;

-            end;

-      end;

-    sLanguage: // by Language

-      begin

-        for S2 := 0 to Length(Song)-1 do

-          for S := 1 to Length(Song)-1 do

-            if CompareText(Song[S].Language, Song[S-1].Language) < 0 then begin

-              TempSong := Song[S-1];

-              Song[S-1] := Song[S];

-              Song[S] := TempSong;

-            end;

-      end;

-

-  end; // case

-end;

-

-function TSongs.FindSongFile(Dir, Mask: string): string;

-var

-  SR:     TSearchRec;   // for parsing song directory

-begin

-  Result := '';

-  if FindFirst(Dir + Mask, faDirectory, SR) = 0 then begin

-    Result := SR.Name;

-  end; // if

-  FindClose(SR);

-end;

-

-procedure TCatSongs.Refresh;

-var

-  S:        integer; // temporary song index

-  CatLen:   integer; // length of CatSongs.Song

-  Letter:   char; // current letter for sorting using letter

-  SS:       string; // current edition for sorting using edition, genre etc.

-  Order:    integer; // number used for ordernum

-  Letter2:  char; //

-  CatNumber:integer; // Number of Song in Category

-begin

-  CatNumShow := -1;

-//  Songs.Sort(0); // by title

-

-case Ini.Sorting of

-    sEdition: begin

-          Songs.Sort(sArtist);

-          Songs.Sort(sEdition);

-        end;

-    sGenre: begin

-          Songs.Sort(sArtist);

-          Songs.Sort(sGenre);

-        end;

-    sLanguage: begin

-          Songs.Sort(sArtist);

-          Songs.Sort(sLanguage);

-        end;

-    sFolder:  begin

-          Songs.Sort(sArtist);

-          Songs.Sort(sFolder);

-        end;

-    sTitle:  Songs.Sort(sTitle);

-    sArtist:  Songs.Sort(sArtist);

-    sTitle2:  Songs.Sort(sTitle2); // by title2

-    sArtist2:  Songs.Sort(sArtist2); // by artist2

-

-  end; // case

-

-

-  Letter := ' ';

-  SS := '';

-  Order := 0;

-  CatNumber := 0;

-

-  //Songs leeren

-  SetLength (Song, 0);

-

-  for S := Low(Songs.Song) to High(Songs.Song) do begin

-    if (Ini.Tabs = 1) then

-    if (Ini.Sorting = sEdition) and (CompareText(SS, Songs.Song[S].Edition) <> 0) then begin

-      // add Category Button

-      Inc(Order);

-      SS := Songs.Song[S].Edition;

-      CatLen := Length(CatSongs.Song);

-      SetLength(CatSongs.Song, CatLen+1);

-      CatSongs.Song[CatLen].Artist := '[' + SS + ']';

-      CatSongs.Song[CatLen].Main := true;

-      CatSongs.Song[CatLen].OrderTyp := 0;

-      CatSongs.Song[CatLen].OrderNum := Order;

-

-

-

-      // 0.4.3

-      // if SS = 'Singstar' then CatSongs.Song[CatLen].Cover := CoversPath + 'Singstar.jpg';

-      // if SS = 'Singstar Part 2' then CatSongs.Song[CatLen].Cover := CoversPath + 'Singstar.jpg';

-      // if SS = 'Singstar German' then CatSongs.Song[CatLen].Cover := CoversPath + 'Singstar.jpg';

-      // if SS = 'Singstar Spanish' then CatSongs.Song[CatLen].Cover := CoversPath + 'Singstar.jpg';

-      // if SS = 'Singstar Italian' then CatSongs.Song[CatLen].Cover := CoversPath + 'Singstar.jpg';

-      // if SS = 'Singstar French' then CatSongs.Song[CatLen].Cover := CoversPath + 'Singstar.jpg';

-      // if SS = 'Singstar Party' then CatSongs.Song[CatLen].Cover := CoversPath + 'Singstar Party.jpg';

-      // if SS = 'Singstar Popworld' then CatSongs.Song[CatLen].Cover := CoversPath + 'Singstar Popworld.jpg';

-      // if SS = 'Singstar 80s' then CatSongs.Song[CatLen].Cover := CoversPath + 'Singstar 80s.jpg';

-      // if SS = 'Singstar 80s Polish' then CatSongs.Song[CatLen].Cover := CoversPath + 'Singstar 80s.jpg';

-      // if SS = 'Singstar Rocks' then CatSongs.Song[CatLen].Cover := CoversPath + 'Singstar Rocks.jpg';

-      // if SS = 'Singstar Anthems' then CatSongs.Song[CatLen].Cover := CoversPath + 'Singstar Anthems.jpg';

-

-      {// cover-patch

-      if FileExists(CoversPath + SS + '.jpg') then CatSongs.Song[CatLen].Cover := CoversPath + SS + '.jpg'

-      else if FileExists(CoversPath + 'NoCover.jpg') then CatSongs.Song[CatLen].Cover := CoversPath + 'NoCover.jpg';//}

-

-      CatSongs.Song[CatLen].Cover := CatCovers.GetCover(Ini.Sorting, SS);

-

-      //CatNumber Patch

-      if (SS <> '') then

-      begin

-        Song[CatLen - CatNumber - 1].CatNumber := CatNumber;//Set CatNumber of Categroy

-        CatNumber := 0;

-      end;

-

-      CatSongs.Song[CatLen].Visible := true;

-    end

-

-    else if (Ini.Sorting = sGenre) and (CompareText(SS, Songs.Song[S].Genre) <> 0) then begin

-      // add Genre Button

-      Inc(Order);

-      SS := Songs.Song[S].Genre;

-      CatLen := Length(CatSongs.Song);

-      SetLength(CatSongs.Song, CatLen+1);

-      CatSongs.Song[CatLen].Artist := SS;

-      CatSongs.Song[CatLen].Main := true;

-      CatSongs.Song[CatLen].OrderTyp := 0;

-      CatSongs.Song[CatLen].OrderNum := Order;

-

-      {// cover-patch

-      if FileExists(CoversPath + SS + '.jpg') then CatSongs.Song[CatLen].Cover := CoversPath + SS + '.jpg'

-      else if FileExists(CoversPath + 'NoCover.jpg') then CatSongs.Song[CatLen].Cover := CoversPath + 'NoCover.jpg';}

-      CatSongs.Song[CatLen].Cover := CatCovers.GetCover(Ini.Sorting, SS);

-

-      //CatNumber Patch

-      if (SS <> '') then

-      begin

-        Song[CatLen - CatNumber - 1].CatNumber := CatNumber;//Set CatNumber of Categroy

-        CatNumber := 0;

-      end;

-

-      CatSongs.Song[CatLen].Visible := true;

-    end

-

-    else if (Ini.Sorting = sLanguage) and (CompareText(SS, Songs.Song[S].Language) <> 0) then begin

-      // add Language Button

-      Inc(Order);

-      SS := Songs.Song[S].Language;

-      CatLen := Length(CatSongs.Song);

-      SetLength(CatSongs.Song, CatLen+1);

-      CatSongs.Song[CatLen].Artist := SS;

-      CatSongs.Song[CatLen].Main := true;

-      CatSongs.Song[CatLen].OrderTyp := 0;

-      CatSongs.Song[CatLen].OrderNum := Order;

-

-      {// cover-patch

-      if FileExists(CoversPath + SS + '.jpg') then CatSongs.Song[CatLen].Cover := CoversPath + SS + '.jpg'

-      else if FileExists(CoversPath + 'NoCover.jpg') then CatSongs.Song[CatLen].Cover := CoversPath + 'NoCover.jpg';}

-      CatSongs.Song[CatLen].Cover := CatCovers.GetCover(Ini.Sorting, SS);

-

-      //CatNumber Patch

-      if (SS <> '') then

-      begin

-        Song[CatLen - CatNumber - 1].CatNumber := CatNumber;//Set CatNumber of Categroy

-        CatNumber := 0;

-      end;

-

-      CatSongs.Song[CatLen].Visible := true;

-    end

-

-    else if (Ini.Sorting = sTitle) and (Length(Songs.Song[S].Title)>=1) and (Letter <> UpCase(Songs.Song[S].Title[1])) then begin

-      // add a letter Category Button

-      Inc(Order);

-      Letter := UpCase(Songs.Song[S].Title[1]);

-      CatLen := Length(CatSongs.Song);

-      SetLength(CatSongs.Song, CatLen+1);

-      CatSongs.Song[CatLen].Artist := '[' + Letter + ']';

-      CatSongs.Song[CatLen].Main := true;

-      CatSongs.Song[CatLen].OrderTyp := 0;

-//      Order := ord(Letter);

-      CatSongs.Song[CatLen].OrderNum := Order;

-

-

-      {// cover-patch

-      if FileExists(CoversPath + 'Title' + Letter + '.jpg') then CatSongs.Song[CatLen].Cover := CoversPath + 'Title' + Letter + '.jpg'

-      else if FileExists(CoversPath + 'NoCover.jpg') then CatSongs.Song[CatLen].Cover := CoversPath + 'NoCover.jpg';}

-      CatSongs.Song[CatLen].Cover := CatCovers.GetCover(Ini.Sorting, Letter);

-

-      //CatNumber Patch

-      if (Letter <> ' ') then

-      begin

-        Song[CatLen - CatNumber - 1].CatNumber := CatNumber;//Set CatNumber of Categroy

-        CatNumber := 0;

-      end;

-

-      CatSongs.Song[CatLen].Visible := true;

-    end

-

-    else if (Ini.Sorting = sArtist) and (Length(Songs.Song[S].Artist)>=1) and (Letter <> UpCase(Songs.Song[S].Artist[1])) then begin

-      // add a letter Category Button

-      Inc(Order);

-      Letter := UpCase(Songs.Song[S].Artist[1]);

-      CatLen := Length(CatSongs.Song);

-      SetLength(CatSongs.Song, CatLen+1);

-      CatSongs.Song[CatLen].Artist := '[' + Letter + ']';

-      CatSongs.Song[CatLen].Main := true;

-      CatSongs.Song[CatLen].OrderTyp := 0;

-//      Order := ord(Letter);

-      CatSongs.Song[CatLen].OrderNum := Order;

-

-      {// cover-patch

-      if FileExists(CoversPath + 'Artist' + Letter + '.jpg') then CatSongs.Song[CatLen].Cover := CoversPath + 'Artist' + Letter + '.jpg'

-      else if FileExists(CoversPath + 'NoCover.jpg') then CatSongs.Song[CatLen].Cover := CoversPath + 'NoCover.jpg';}

-      CatSongs.Song[CatLen].Cover := CatCovers.GetCover(Ini.Sorting, Letter);

-

-      //CatNumber Patch

-      if (Letter <> ' ') then

-      begin

-        Song[CatLen - CatNumber - 1].CatNumber := CatNumber;//Set CatNumber of Categroy

-        CatNumber := 0;

-      end;

-

-      CatSongs.Song[CatLen].Visible := true;

-    end

-

-    else if (Ini.Sorting = sFolder) and (CompareText(SS, Songs.Song[S].Folder) <> 0) then begin

-      // 0.5.0: add folder tab

-      Inc(Order);

-      SS := Songs.Song[S].Folder;

-      CatLen := Length(CatSongs.Song);

-      SetLength(CatSongs.Song, CatLen+1);

-      CatSongs.Song[CatLen].Artist := SS;

-      CatSongs.Song[CatLen].Main := true;

-      CatSongs.Song[CatLen].OrderTyp := 0;

-      CatSongs.Song[CatLen].OrderNum := Order;

-

-      {// cover-patch

-      if FileExists(CoversPath + SS + '.jpg') then CatSongs.Song[CatLen].Cover := CoversPath + SS + '.jpg'

-      else if FileExists(CoversPath + 'NoCover.jpg') then CatSongs.Song[CatLen].Cover := CoversPath + 'NoCover.jpg';}

-      CatSongs.Song[CatLen].Cover := CatCovers.GetCover(Ini.Sorting, SS);

-

-      //CatNumber Patch

-      if (SS <> '') then

-      begin

-        Song[CatLen - CatNumber - 1].CatNumber := CatNumber;//Set CatNumber of Categroy

-        CatNumber := 0;

-      end;

-

-      CatSongs.Song[CatLen].Visible := true;

-    end

-

-    else if (Ini.Sorting = sTitle2) AND (Length(Songs.Song[S].Title)>=1) then begin

-      if (ord(Songs.Song[S].Title[1]) > 47) and (ord(Songs.Song[S].Title[1]) < 58) then Letter2 := '#' else Letter2 := UpCase(Songs.Song[S].Title[1]);

-      if (Letter <> Letter2) then begin

-        // add a letter Category Button

-        Inc(Order);

-        Letter := Letter2;

-        CatLen := Length(CatSongs.Song);

-        SetLength(CatSongs.Song, CatLen+1);

-        CatSongs.Song[CatLen].Artist := '[' + Letter + ']';

-        CatSongs.Song[CatLen].Main := true;

-        CatSongs.Song[CatLen].OrderTyp := 0;

-//      Order := ord(Letter);

-        CatSongs.Song[CatLen].OrderNum := Order;

-

-        {// cover-patch

-        if FileExists(CoversPath + 'Title' + Letter + '.jpg') then CatSongs.Song[CatLen].Cover := CoversPath + 'Title' + Letter + '.jpg'

-        else if FileExists(CoversPath + 'NoCover.jpg') then CatSongs.Song[CatLen].Cover := CoversPath + 'NoCover.jpg';}

-        CatSongs.Song[CatLen].Cover := CatCovers.GetCover(Ini.Sorting, Letter);

-

-        //CatNumber Patch

-      if (Letter <> ' ') then

-      begin

-        Song[CatLen - CatNumber - 1].CatNumber := CatNumber;//Set CatNumber of Categroy

-        CatNumber := 0;

-      end;

-

-        CatSongs.Song[CatLen].Visible := true;

-      end;

-    end

-

-    else if (Ini.Sorting = sArtist2) AND (Length(Songs.Song[S].Artist)>=1) then begin

-     if (ord(Songs.Song[S].Artist[1]) > 47) and (ord(Songs.Song[S].Artist[1]) < 58) then Letter2 := '#' else Letter2 := UpCase(Songs.Song[S].Artist[1]);

-       if (Letter <> Letter2) then begin

-        // add a letter Category Button

-        Inc(Order);

-        Letter := Letter2;

-        CatLen := Length(CatSongs.Song);

-        SetLength(CatSongs.Song, CatLen+1);

-        CatSongs.Song[CatLen].Artist := '[' + Letter + ']';

-        CatSongs.Song[CatLen].Main := true;

-        CatSongs.Song[CatLen].OrderTyp := 0;

-//      Order := ord(Letter);

-        CatSongs.Song[CatLen].OrderNum := Order;

-

-        {// cover-patch

-        if FileExists(CoversPath + 'Artist' + Letter + '.jpg') then CatSongs.Song[CatLen].Cover := CoversPath + 'Artist' + Letter + '.jpg'

-        else if FileExists(CoversPath + 'NoCover.jpg') then CatSongs.Song[CatLen].Cover := CoversPath + 'NoCover.jpg';}

-        CatSongs.Song[CatLen].Cover := CatCovers.GetCover(Ini.Sorting, Letter);

-

-        //CatNumber Patch

-        if (Letter <> ' ') then

-        begin

-          Song[CatLen - CatNumber - 1].CatNumber := CatNumber;//Set CatNumber of Categroy

-          CatNumber := 0;

-        end;

-        

-        CatSongs.Song[CatLen].Visible := true;

-      end;

-    end;

-

-

-    CatLen := Length(CatSongs.Song);

-    SetLength(CatSongs.Song, CatLen+1);

-

-    Inc (CatNumber); //Increase Number in Cat

-

-    CatSongs.Song[CatLen] := Songs.Song[S];

-    CatSongs.Song[CatLen].OrderNum := Order; // assigns category

-    CatSongs.Song[CatLen].CatNumber := CatNumber;

-

-    if (Ini.Tabs = 0) then CatSongs.Song[CatLen].Visible := true

-    else if (Ini.Tabs = 1) then CatSongs.Song[CatLen].Visible := false;

-//    if (Ini.Tabs = 1) and (Order = 1) then CatSongs.Song[CatLen].Visible := true; // open first tab

-//CatSongs.Song[CatLen].Visible := true;

-

-  end;

-//CatNumber Patch - Set CatNumber of Last Category

-if (ini.Tabs_at_startup = 1) And (high(Song) >=1) then

-  Song[CatLen - CatNumber].CatNumber := CatNumber;//Set CatNumber of Categroy

-//CatCount Patch

-CatCount := Order;

-end;

-

-procedure TCatSongs.ShowCategory(Index: integer);

-var

-  S:    integer; // song

-begin

-  CatNumShow := Index;

-  for S := 0 to high(CatSongs.Song) do

-  begin

-    if (CatSongs.Song[S].OrderNum = Index) AND (Not CatSongs.Song[S].Main) then

-      CatSongs.Song[S].Visible := true

-    else

-      CatSongs.Song[S].Visible := false;

-  end;

-end;

-

-procedure TCatSongs.HideCategory(Index: integer); // hides all songs in category

-var

-  S:    integer; // song

-begin

-  for S := 0 to high(CatSongs.Song) do begin

-    if not CatSongs.Song[S].Main then

-      CatSongs.Song[S].Visible := false // hides all at now

-  end;

-end;

-

-procedure TCatSongs.ClickCategoryButton(Index: integer);

-var

-  Num, S:    integer;

-begin

-  Num := CatSongs.Song[Index].OrderNum;

-  if Num <> CatNumShow then

-    begin

-    ShowCategory(Num);

-    end

-  else begin

-    ShowCategoryList;

-  end;

-end;

-

-//Hide Categorys when in Category Hack

-procedure TCatSongs.ShowCategoryList;

-var

-  Num, S:    integer;

-begin

-  //Hide All Songs Show All Cats

-  for S := 0 to high(CatSongs.Song) do begin

-    if CatSongs.Song[S].Main then

-      CatSongs.Song[S].Visible := true

-    else

-      CatSongs.Song[S].Visible := false

-  end;

-  CatSongs.Selected := CatNumShow; //Show last shown Category

-  CatNumShow := -1;

-end;

-//Hide Categorys when in Category Hack End

-

-//Wrong song selected when tabs on bug

-function TCatSongs.FindNextVisible(SearchFrom:integer): integer;//Find next Visible Song

-var

-  I: Integer;

-  begin

-  Result := -1;

-  I := SearchFrom + 1;

-  while not CatSongs.Song[I].Visible do

-    begin

-    Inc (I);

-    if (I>high(CatSongs.Song)) then

-      I := low(CatSongs.Song);

-    if (I = SearchFrom) then //Make One Round and no song found->quit

-      break;

-    end;

-  end;

-//Wrong song selected when tabs on bug End

-

-function TCatSongs.VisibleSongs: integer;

-var

-  S:    integer; // song

-begin

-  Result := 0;

-  for S := 0 to high(CatSongs.Song) do

-    if CatSongs.Song[S].Visible = true then Inc(Result);

-end;

-

-function TCatSongs.VisibleIndex(Index: integer): integer;

-var

-  S:    integer; // song

-begin

-  Result := 0;

-  for S := 0 to Index-1 do

-    if CatSongs.Song[S].Visible = true then Inc(Result);

-end;

-

-function TCatSongs.SetFilter(FilterStr: String; const fType: Byte): Cardinal;

-var

-  I, J: Integer;

-  cString: String;

-  SearchStr: Array of String;

-begin

-  {fType: 0: All

-          1: Title

-          2: Artist}

-  FilterStr := Trim(FilterStr);

-  if FilterStr<>'' then begin

-    Result := 0;

-    //Create Search Array

-    SetLength(SearchStr, 1);

-    I := Pos (' ', FilterStr);

-    While (I <> 0) do

-    begin

-      SetLength (SearchStr, Length(SearchStr) + 1);

-      cString := Copy(FilterStr, 1, I-1);

-      if (cString <> ' ') AND (cString <> '') then

-        SearchStr[High(SearchStr)-1] := cString;

-      Delete (FilterStr, 1, I);

-

-      I := Pos (' ', FilterStr);

-    end;

-    //Copy last Word

-    if (FilterStr <> ' ') AND (FilterStr <> '') then

-      SearchStr[High(SearchStr)] := FilterStr;

-

-    for I:=0 to High(Song) do begin

-      if not Song[i].Main then

-      begin

-        case fType of

-          0: cString := Song[I].Artist + ' ' + Song[i].Title + ' ' + Song[i].Folder;

-          1: cString := Song[I].Title;

-          2: cString := Song[I].Artist;

-        end;

-        Song[i].Visible:=True;

-        //Look for every Searched Word

-        For J := 0 to High(SearchStr) do

-        begin

-          Song[i].Visible := Song[i].Visible AND AnsiContainsText(cString, SearchStr[J])

-        end;

-        if Song[i].Visible then

-          Inc(Result);

-      end

-      else

-        Song[i].Visible:=False;

-    end;

-    CatNumShow := -2;

-  end

-  else begin

-    for i:=0 to High(Song) do begin

-      Song[i].Visible:=(Ini.Tabs=1)=Song[i].Main;

-      CatNumShow := -1;

-    end;

-    Result := 0;

-  end;

-end;

-

-end.

+unit USongs;
+
+interface
+
+{$IFDEF FPC}
+  {$MODE DELPHI}
+{$ENDIF}
+
+
+uses SysUtils, ULog, UTexture, UCatCovers;
+
+type
+  TBPM = record
+    BPM:        real;
+    StartBeat:  real;
+  end;
+
+  TScore = record
+    Name:       string;
+    Score:      integer;
+    Length:     string;
+  end;
+
+  TSong = record
+    Path:       string;
+    Folder:     string; // for sorting by folder
+    FileName:   string;
+
+    // sorting methods
+    Category:   array of string; // I think I won't need this
+    Genre:      string;
+    Edition:    string;
+    Language:   string; // 0.5.0: new
+
+    Title:      string;
+    Artist:     string;
+
+    Text:       string;
+    Creator:    string;
+
+    Cover:      string;
+    CoverTex:   TTexture;
+    Mp3:        string;
+    Background: string;
+    Video:      string;
+    VideoGAP:   real;
+    VideoLoaded: boolean; // 0.5.0: true if the video has been loaded 
+    NotesGAP:   integer;
+    Start:      real; // in seconds
+    Finish:     integer; // in miliseconds
+    Relative:   boolean;
+    Resolution: integer;
+    BPM:        array of TBPM;
+    GAP:        real; // in miliseconds
+
+    Score:      array[0..2] of array of TScore;
+
+    // these are used when sorting is enabled
+    Visible:    boolean; // false if hidden, true if visible
+    Main:       boolean; // false for songs, true for category buttons
+    OrderNum:   integer; // has a number of category for category buttons and songs
+    OrderTyp:   integer; // type of sorting for this button (0=name)
+    CatNumber:  integer; // Count of Songs in Category for Cats and Number of Song in Category for Songs
+  end;
+
+  TSongs = class
+  private
+    BrowsePos: Cardinal; //Actual Pos in Song Array
+  public
+    Song:       array of TSong; // array of songs
+    Selected:   integer; // selected song index
+    procedure LoadSongList; // load all songs
+    procedure BrowseDir(Dir: string); // should return number of songs in the future
+    procedure Sort(Order: integer);
+    function FindSongFile(Dir, Mask: string): string;
+  end;
+
+  TCatSongs = class
+    Song:       array of TSong; // array of categories with songs
+    Selected:   integer; // selected song index
+    Order:      integer; // order type (0=title)
+    CatNumShow: integer; // Category Number being seen
+    CatCount:   integer; //Number of Categorys
+
+    procedure Refresh; // refreshes arrays by recreating them from Songs array
+//    procedure Sort(Order: integer);
+    procedure ShowCategory(Index: integer); // expands all songs in category
+    procedure HideCategory(Index: integer); // hides all songs in category
+    procedure ClickCategoryButton(Index: integer); // uses ShowCategory and HideCategory when needed
+    procedure ShowCategoryList; //Hides all Songs And Show the List of all Categorys
+    function FindNextVisible(SearchFrom:integer): integer; //Find Next visible Song
+    function VisibleSongs: integer; // returns number of visible songs (for tabs)
+    function VisibleIndex(Index: integer): integer; // returns visible song index (skips invisible)
+
+    function SetFilter(FilterStr: String; const fType: Byte): Cardinal;
+  end;
+
+var
+  Songs:      TSongs; // all songs
+  CatSongs:   TCatSongs; // categorized songs
+  AktSong:    TSong; // one song *unknown use)
+
+implementation
+
+uses StrUtils,
+     UFiles,
+     UMain,
+     UIni;
+
+
+procedure TSongs.LoadSongList;
+begin
+  Log.LogStatus('Initializing', 'LoadSongList');
+
+  // clear
+  Setlength(Song, 50);
+
+  BrowsePos := 0;
+  // browse directories
+  BrowseDir(SongPath);
+
+  //Set Correct SongArray Length
+  SetLength(Song, BrowsePos);
+//  if Ini.Debug = 1 then BrowseDir('D:\Extract\Songs\');
+end;
+
+procedure TSongs.BrowseDir(Dir: string);
+var
+  SR:     TSearchRec;   // for parsing Songs Directory
+  SLen:   integer;
+begin
+  if FindFirst(Dir + '*', faDirectory, SR) = 0 then begin
+    repeat
+      if (SR.Name <> '.') and (SR.Name <> '..') then
+        BrowseDir(Dir + Sr.Name + PathDelim);
+    until FindNext(SR) <> 0;
+  end; // if
+  FindClose(SR);
+
+//        Log.LogStatus('Parsing directory: ' + Dir + SR.Name, 'LoadSongList');
+
+ if FindFirst(Dir + '*.txt', 0, SR) = 0 then begin
+//          Log.LogStatus('Parsing file:      ' + Dir + SR.Name + '\' + SRD.Name, 'LoadSongList');
+    repeat
+      //New Mod for better Memory Management
+
+      SLen := BrowsePos;
+      {//Old
+      SLen := Length(Song);
+      SetLength(Song, SLen + 1);//}
+
+      Song[SLen].Path := Dir;
+      Song[SLen].Folder := Copy(Dir, Length(SongPath)+1, 10000);
+      Song[SLen].Folder := Copy(Song[SLen].Folder, 1, Pos( PathDelim , Song[SLen].Folder)-1);
+      Song[SLen].FileName := SR.Name;
+
+      if (AnalyseFile(Song[SLen]) = false) then Dec(BrowsePos)
+      else begin
+        // scanning complete, file is good
+        // if there is no cover then try to find it
+        if Song[SLen].Cover = '' then Song[SLen].Cover := FindSongFile(Dir, '*[CO].jpg');
+//        if Song[SLen].Background = '' then begin
+//          Song[SLen].Background := FindSongFile(Dir, '*[BG].jpg');
+//        end; // no needed here}
+
+        // fix by adding path. no, don't fix it.
+//        if Song[SLen].Cover <> '' then
+//          Song[SLen].Cover := Song[SLen].Path + Song[SLen].Cover;
+      end;
+
+      //Change Length Only every 50 Entrys
+      Inc(BrowsePos);
+      
+      if (BrowsePos mod 50 = 0) AND (BrowsePos <> 0) then
+      begin
+          SetLength(Song, Length(Song) + 50);
+      end;
+
+    until FindNext(SR) <> 0;
+    end; // if FindFirst
+  FindClose(SR);
+end;
+
+procedure TSongs.Sort(Order: integer);
+var
+  S:    integer;
+  S2:   integer;
+  TempSong:   TSong;
+begin
+  case Order of
+    sEdition: // by edition
+      begin
+        for S2 := 0 to Length(Song)-1 do
+          for S := 1 to Length(Song)-1 do
+            if CompareText(Song[S].Edition, Song[S-1].Edition) < 0 then begin
+              // zamiana miejscami
+              TempSong := Song[S-1];
+              Song[S-1] := Song[S];
+              Song[S] := TempSong;
+            end;
+      end;
+    sGenre: // by genre
+      begin
+        for S2 := 0 to Length(Song)-1 do
+          for S := 1 to Length(Song)-1 do
+            if CompareText(Song[S].Genre, Song[S-1].Genre) < 0 then begin
+              // zamiana miejscami
+              TempSong := Song[S-1];
+              Song[S-1] := Song[S];
+              Song[S] := TempSong;
+            end;
+      end;
+    sTitle: // by title
+      begin
+        for S2 := 0 to Length(Song)-1 do
+          for S := 1 to Length(Song)-1 do
+            if CompareText(Song[S].Title, Song[S-1].Title) < 0 then begin
+              // zamiana miejscami
+              TempSong := Song[S-1];
+              Song[S-1] := Song[S];
+              Song[S] := TempSong;
+            end;
+
+      end;
+    sArtist: // by artist
+      begin
+        for S2 := 0 to Length(Song)-1 do
+          for S := 1 to Length(Song)-1 do
+            if CompareText(Song[S].Artist, Song[S-1].Artist) < 0 then begin
+              // zamiana miejscami
+              TempSong := Song[S-1];
+              Song[S-1] := Song[S];
+              Song[S] := TempSong;
+            end;
+      end;
+    sFolder: // by folder
+      begin
+        for S2 := 0 to Length(Song)-1 do
+          for S := 1 to Length(Song)-1 do
+            if CompareText(Song[S].Folder, Song[S-1].Folder) < 0 then begin
+              // zamiana miejscami
+              TempSong := Song[S-1];
+              Song[S-1] := Song[S];
+              Song[S] := TempSong;
+            end;
+      end;
+    sTitle2: // by title2
+      begin
+        for S2 := 0 to Length(Song)-1 do
+          for S := 1 to Length(Song)-1 do
+            if CompareText(Song[S].Title, Song[S-1].Title) < 0 then begin
+              // zamiana miejscami
+              TempSong := Song[S-1];
+              Song[S-1] := Song[S];
+              Song[S] := TempSong;
+            end;
+
+      end;
+    sArtist2: // by artist2
+      begin
+        for S2 := 0 to Length(Song)-1 do
+          for S := 1 to Length(Song)-1 do
+            if CompareText(Song[S].Artist, Song[S-1].Artist) < 0 then begin
+              // zamiana miejscami
+              TempSong := Song[S-1];
+              Song[S-1] := Song[S];
+              Song[S] := TempSong;
+            end;
+      end;
+    sLanguage: // by Language
+      begin
+        for S2 := 0 to Length(Song)-1 do
+          for S := 1 to Length(Song)-1 do
+            if CompareText(Song[S].Language, Song[S-1].Language) < 0 then begin
+              TempSong := Song[S-1];
+              Song[S-1] := Song[S];
+              Song[S] := TempSong;
+            end;
+      end;
+
+  end; // case
+end;
+
+function TSongs.FindSongFile(Dir, Mask: string): string;
+var
+  SR:     TSearchRec;   // for parsing song directory
+begin
+  Result := '';
+  if FindFirst(Dir + Mask, faDirectory, SR) = 0 then begin
+    Result := SR.Name;
+  end; // if
+  FindClose(SR);
+end;
+
+procedure TCatSongs.Refresh;
+var
+  S:        integer; // temporary song index
+  CatLen:   integer; // length of CatSongs.Song
+  Letter:   char; // current letter for sorting using letter
+  SS:       string; // current edition for sorting using edition, genre etc.
+  Order:    integer; // number used for ordernum
+  Letter2:  char; //
+  CatNumber:integer; // Number of Song in Category
+begin
+  CatNumShow := -1;
+//  Songs.Sort(0); // by title
+
+case Ini.Sorting of
+    sEdition: begin
+          Songs.Sort(sArtist);
+          Songs.Sort(sEdition);
+        end;
+    sGenre: begin
+          Songs.Sort(sArtist);
+          Songs.Sort(sGenre);
+        end;
+    sLanguage: begin
+          Songs.Sort(sArtist);
+          Songs.Sort(sLanguage);
+        end;
+    sFolder:  begin
+          Songs.Sort(sArtist);
+          Songs.Sort(sFolder);
+        end;
+    sTitle:  Songs.Sort(sTitle);
+    sArtist:  Songs.Sort(sArtist);
+    sTitle2:  Songs.Sort(sTitle2); // by title2
+    sArtist2:  Songs.Sort(sArtist2); // by artist2
+
+  end; // case
+
+
+  Letter := ' ';
+  SS := '';
+  Order := 0;
+  CatNumber := 0;
+
+  //Songs leeren
+  SetLength (Song, 0);
+
+  for S := Low(Songs.Song) to High(Songs.Song) do begin
+    if (Ini.Tabs = 1) then
+    if (Ini.Sorting = sEdition) and (CompareText(SS, Songs.Song[S].Edition) <> 0) then begin
+      // add Category Button
+      Inc(Order);
+      SS := Songs.Song[S].Edition;
+      CatLen := Length(CatSongs.Song);
+      SetLength(CatSongs.Song, CatLen+1);
+      CatSongs.Song[CatLen].Artist := '[' + SS + ']';
+      CatSongs.Song[CatLen].Main := true;
+      CatSongs.Song[CatLen].OrderTyp := 0;
+      CatSongs.Song[CatLen].OrderNum := Order;
+
+
+
+      // 0.4.3
+      // if SS = 'Singstar' then CatSongs.Song[CatLen].Cover := CoversPath + 'Singstar.jpg';
+      // if SS = 'Singstar Part 2' then CatSongs.Song[CatLen].Cover := CoversPath + 'Singstar.jpg';
+      // if SS = 'Singstar German' then CatSongs.Song[CatLen].Cover := CoversPath + 'Singstar.jpg';
+      // if SS = 'Singstar Spanish' then CatSongs.Song[CatLen].Cover := CoversPath + 'Singstar.jpg';
+      // if SS = 'Singstar Italian' then CatSongs.Song[CatLen].Cover := CoversPath + 'Singstar.jpg';
+      // if SS = 'Singstar French' then CatSongs.Song[CatLen].Cover := CoversPath + 'Singstar.jpg';
+      // if SS = 'Singstar Party' then CatSongs.Song[CatLen].Cover := CoversPath + 'Singstar Party.jpg';
+      // if SS = 'Singstar Popworld' then CatSongs.Song[CatLen].Cover := CoversPath + 'Singstar Popworld.jpg';
+      // if SS = 'Singstar 80s' then CatSongs.Song[CatLen].Cover := CoversPath + 'Singstar 80s.jpg';
+      // if SS = 'Singstar 80s Polish' then CatSongs.Song[CatLen].Cover := CoversPath + 'Singstar 80s.jpg';
+      // if SS = 'Singstar Rocks' then CatSongs.Song[CatLen].Cover := CoversPath + 'Singstar Rocks.jpg';
+      // if SS = 'Singstar Anthems' then CatSongs.Song[CatLen].Cover := CoversPath + 'Singstar Anthems.jpg';
+
+      {// cover-patch
+      if FileExists(CoversPath + SS + '.jpg') then CatSongs.Song[CatLen].Cover := CoversPath + SS + '.jpg'
+      else if FileExists(CoversPath + 'NoCover.jpg') then CatSongs.Song[CatLen].Cover := CoversPath + 'NoCover.jpg';//}
+
+      CatSongs.Song[CatLen].Cover := CatCovers.GetCover(Ini.Sorting, SS);
+
+      //CatNumber Patch
+      if (SS <> '') then
+      begin
+        Song[CatLen - CatNumber - 1].CatNumber := CatNumber;//Set CatNumber of Categroy
+        CatNumber := 0;
+      end;
+
+      CatSongs.Song[CatLen].Visible := true;
+    end
+
+    else if (Ini.Sorting = sGenre) and (CompareText(SS, Songs.Song[S].Genre) <> 0) then begin
+      // add Genre Button
+      Inc(Order);
+      SS := Songs.Song[S].Genre;
+      CatLen := Length(CatSongs.Song);
+      SetLength(CatSongs.Song, CatLen+1);
+      CatSongs.Song[CatLen].Artist := SS;
+      CatSongs.Song[CatLen].Main := true;
+      CatSongs.Song[CatLen].OrderTyp := 0;
+      CatSongs.Song[CatLen].OrderNum := Order;
+
+      {// cover-patch
+      if FileExists(CoversPath + SS + '.jpg') then CatSongs.Song[CatLen].Cover := CoversPath + SS + '.jpg'
+      else if FileExists(CoversPath + 'NoCover.jpg') then CatSongs.Song[CatLen].Cover := CoversPath + 'NoCover.jpg';}
+      CatSongs.Song[CatLen].Cover := CatCovers.GetCover(Ini.Sorting, SS);
+
+      //CatNumber Patch
+      if (SS <> '') then
+      begin
+        Song[CatLen - CatNumber - 1].CatNumber := CatNumber;//Set CatNumber of Categroy
+        CatNumber := 0;
+      end;
+
+      CatSongs.Song[CatLen].Visible := true;
+    end
+
+    else if (Ini.Sorting = sLanguage) and (CompareText(SS, Songs.Song[S].Language) <> 0) then begin
+      // add Language Button
+      Inc(Order);
+      SS := Songs.Song[S].Language;
+      CatLen := Length(CatSongs.Song);
+      SetLength(CatSongs.Song, CatLen+1);
+      CatSongs.Song[CatLen].Artist := SS;
+      CatSongs.Song[CatLen].Main := true;
+      CatSongs.Song[CatLen].OrderTyp := 0;
+      CatSongs.Song[CatLen].OrderNum := Order;
+
+      {// cover-patch
+      if FileExists(CoversPath + SS + '.jpg') then CatSongs.Song[CatLen].Cover := CoversPath + SS + '.jpg'
+      else if FileExists(CoversPath + 'NoCover.jpg') then CatSongs.Song[CatLen].Cover := CoversPath + 'NoCover.jpg';}
+      CatSongs.Song[CatLen].Cover := CatCovers.GetCover(Ini.Sorting, SS);
+
+      //CatNumber Patch
+      if (SS <> '') then
+      begin
+        Song[CatLen - CatNumber - 1].CatNumber := CatNumber;//Set CatNumber of Categroy
+        CatNumber := 0;
+      end;
+
+      CatSongs.Song[CatLen].Visible := true;
+    end
+
+    else if (Ini.Sorting = sTitle) and (Length(Songs.Song[S].Title)>=1) and (Letter <> UpCase(Songs.Song[S].Title[1])) then begin
+      // add a letter Category Button
+      Inc(Order);
+      Letter := UpCase(Songs.Song[S].Title[1]);
+      CatLen := Length(CatSongs.Song);
+      SetLength(CatSongs.Song, CatLen+1);
+      CatSongs.Song[CatLen].Artist := '[' + Letter + ']';
+      CatSongs.Song[CatLen].Main := true;
+      CatSongs.Song[CatLen].OrderTyp := 0;
+//      Order := ord(Letter);
+      CatSongs.Song[CatLen].OrderNum := Order;
+
+
+      {// cover-patch
+      if FileExists(CoversPath + 'Title' + Letter + '.jpg') then CatSongs.Song[CatLen].Cover := CoversPath + 'Title' + Letter + '.jpg'
+      else if FileExists(CoversPath + 'NoCover.jpg') then CatSongs.Song[CatLen].Cover := CoversPath + 'NoCover.jpg';}
+      CatSongs.Song[CatLen].Cover := CatCovers.GetCover(Ini.Sorting, Letter);
+
+      //CatNumber Patch
+      if (Letter <> ' ') then
+      begin
+        Song[CatLen - CatNumber - 1].CatNumber := CatNumber;//Set CatNumber of Categroy
+        CatNumber := 0;
+      end;
+
+      CatSongs.Song[CatLen].Visible := true;
+    end
+
+    else if (Ini.Sorting = sArtist) and (Length(Songs.Song[S].Artist)>=1) and (Letter <> UpCase(Songs.Song[S].Artist[1])) then begin
+      // add a letter Category Button
+      Inc(Order);
+      Letter := UpCase(Songs.Song[S].Artist[1]);
+      CatLen := Length(CatSongs.Song);
+      SetLength(CatSongs.Song, CatLen+1);
+      CatSongs.Song[CatLen].Artist := '[' + Letter + ']';
+      CatSongs.Song[CatLen].Main := true;
+      CatSongs.Song[CatLen].OrderTyp := 0;
+//      Order := ord(Letter);
+      CatSongs.Song[CatLen].OrderNum := Order;
+
+      {// cover-patch
+      if FileExists(CoversPath + 'Artist' + Letter + '.jpg') then CatSongs.Song[CatLen].Cover := CoversPath + 'Artist' + Letter + '.jpg'
+      else if FileExists(CoversPath + 'NoCover.jpg') then CatSongs.Song[CatLen].Cover := CoversPath + 'NoCover.jpg';}
+      CatSongs.Song[CatLen].Cover := CatCovers.GetCover(Ini.Sorting, Letter);
+
+      //CatNumber Patch
+      if (Letter <> ' ') then
+      begin
+        Song[CatLen - CatNumber - 1].CatNumber := CatNumber;//Set CatNumber of Categroy
+        CatNumber := 0;
+      end;
+
+      CatSongs.Song[CatLen].Visible := true;
+    end
+
+    else if (Ini.Sorting = sFolder) and (CompareText(SS, Songs.Song[S].Folder) <> 0) then begin
+      // 0.5.0: add folder tab
+      Inc(Order);
+      SS := Songs.Song[S].Folder;
+      CatLen := Length(CatSongs.Song);
+      SetLength(CatSongs.Song, CatLen+1);
+      CatSongs.Song[CatLen].Artist := SS;
+      CatSongs.Song[CatLen].Main := true;
+      CatSongs.Song[CatLen].OrderTyp := 0;
+      CatSongs.Song[CatLen].OrderNum := Order;
+
+      {// cover-patch
+      if FileExists(CoversPath + SS + '.jpg') then CatSongs.Song[CatLen].Cover := CoversPath + SS + '.jpg'
+      else if FileExists(CoversPath + 'NoCover.jpg') then CatSongs.Song[CatLen].Cover := CoversPath + 'NoCover.jpg';}
+      CatSongs.Song[CatLen].Cover := CatCovers.GetCover(Ini.Sorting, SS);
+
+      //CatNumber Patch
+      if (SS <> '') then
+      begin
+        Song[CatLen - CatNumber - 1].CatNumber := CatNumber;//Set CatNumber of Categroy
+        CatNumber := 0;
+      end;
+
+      CatSongs.Song[CatLen].Visible := true;
+    end
+
+    else if (Ini.Sorting = sTitle2) AND (Length(Songs.Song[S].Title)>=1) then begin
+      if (ord(Songs.Song[S].Title[1]) > 47) and (ord(Songs.Song[S].Title[1]) < 58) then Letter2 := '#' else Letter2 := UpCase(Songs.Song[S].Title[1]);
+      if (Letter <> Letter2) then begin
+        // add a letter Category Button
+        Inc(Order);
+        Letter := Letter2;
+        CatLen := Length(CatSongs.Song);
+        SetLength(CatSongs.Song, CatLen+1);
+        CatSongs.Song[CatLen].Artist := '[' + Letter + ']';
+        CatSongs.Song[CatLen].Main := true;
+        CatSongs.Song[CatLen].OrderTyp := 0;
+//      Order := ord(Letter);
+        CatSongs.Song[CatLen].OrderNum := Order;
+
+        {// cover-patch
+        if FileExists(CoversPath + 'Title' + Letter + '.jpg') then CatSongs.Song[CatLen].Cover := CoversPath + 'Title' + Letter + '.jpg'
+        else if FileExists(CoversPath + 'NoCover.jpg') then CatSongs.Song[CatLen].Cover := CoversPath + 'NoCover.jpg';}
+        CatSongs.Song[CatLen].Cover := CatCovers.GetCover(Ini.Sorting, Letter);
+
+        //CatNumber Patch
+      if (Letter <> ' ') then
+      begin
+        Song[CatLen - CatNumber - 1].CatNumber := CatNumber;//Set CatNumber of Categroy
+        CatNumber := 0;
+      end;
+
+        CatSongs.Song[CatLen].Visible := true;
+      end;
+    end
+
+    else if (Ini.Sorting = sArtist2) AND (Length(Songs.Song[S].Artist)>=1) then begin
+     if (ord(Songs.Song[S].Artist[1]) > 47) and (ord(Songs.Song[S].Artist[1]) < 58) then Letter2 := '#' else Letter2 := UpCase(Songs.Song[S].Artist[1]);
+       if (Letter <> Letter2) then begin
+        // add a letter Category Button
+        Inc(Order);
+        Letter := Letter2;
+        CatLen := Length(CatSongs.Song);
+        SetLength(CatSongs.Song, CatLen+1);
+        CatSongs.Song[CatLen].Artist := '[' + Letter + ']';
+        CatSongs.Song[CatLen].Main := true;
+        CatSongs.Song[CatLen].OrderTyp := 0;
+//      Order := ord(Letter);
+        CatSongs.Song[CatLen].OrderNum := Order;
+
+        {// cover-patch
+        if FileExists(CoversPath + 'Artist' + Letter + '.jpg') then CatSongs.Song[CatLen].Cover := CoversPath + 'Artist' + Letter + '.jpg'
+        else if FileExists(CoversPath + 'NoCover.jpg') then CatSongs.Song[CatLen].Cover := CoversPath + 'NoCover.jpg';}
+        CatSongs.Song[CatLen].Cover := CatCovers.GetCover(Ini.Sorting, Letter);
+
+        //CatNumber Patch
+        if (Letter <> ' ') then
+        begin
+          Song[CatLen - CatNumber - 1].CatNumber := CatNumber;//Set CatNumber of Categroy
+          CatNumber := 0;
+        end;
+        
+        CatSongs.Song[CatLen].Visible := true;
+      end;
+    end;
+
+
+    CatLen := Length(CatSongs.Song);
+    SetLength(CatSongs.Song, CatLen+1);
+
+    Inc (CatNumber); //Increase Number in Cat
+
+    CatSongs.Song[CatLen] := Songs.Song[S];
+    CatSongs.Song[CatLen].OrderNum := Order; // assigns category
+    CatSongs.Song[CatLen].CatNumber := CatNumber;
+
+    if (Ini.Tabs = 0) then CatSongs.Song[CatLen].Visible := true
+    else if (Ini.Tabs = 1) then CatSongs.Song[CatLen].Visible := false;
+//    if (Ini.Tabs = 1) and (Order = 1) then CatSongs.Song[CatLen].Visible := true; // open first tab
+//CatSongs.Song[CatLen].Visible := true;
+
+  end;
+//CatNumber Patch - Set CatNumber of Last Category
+if (ini.Tabs_at_startup = 1) And (high(Song) >=1) then
+  Song[CatLen - CatNumber].CatNumber := CatNumber;//Set CatNumber of Categroy
+//CatCount Patch
+CatCount := Order;
+end;
+
+procedure TCatSongs.ShowCategory(Index: integer);
+var
+  S:    integer; // song
+begin
+  CatNumShow := Index;
+  for S := 0 to high(CatSongs.Song) do
+  begin
+    if (CatSongs.Song[S].OrderNum = Index) AND (Not CatSongs.Song[S].Main) then
+      CatSongs.Song[S].Visible := true
+    else
+      CatSongs.Song[S].Visible := false;
+  end;
+end;
+
+procedure TCatSongs.HideCategory(Index: integer); // hides all songs in category
+var
+  S:    integer; // song
+begin
+  for S := 0 to high(CatSongs.Song) do begin
+    if not CatSongs.Song[S].Main then
+      CatSongs.Song[S].Visible := false // hides all at now
+  end;
+end;
+
+procedure TCatSongs.ClickCategoryButton(Index: integer);
+var
+  Num, S:    integer;
+begin
+  Num := CatSongs.Song[Index].OrderNum;
+  if Num <> CatNumShow then
+    begin
+    ShowCategory(Num);
+    end
+  else begin
+    ShowCategoryList;
+  end;
+end;
+
+//Hide Categorys when in Category Hack
+procedure TCatSongs.ShowCategoryList;
+var
+  Num, S:    integer;
+begin
+  //Hide All Songs Show All Cats
+  for S := 0 to high(CatSongs.Song) do begin
+    if CatSongs.Song[S].Main then
+      CatSongs.Song[S].Visible := true
+    else
+      CatSongs.Song[S].Visible := false
+  end;
+  CatSongs.Selected := CatNumShow; //Show last shown Category
+  CatNumShow := -1;
+end;
+//Hide Categorys when in Category Hack End
+
+//Wrong song selected when tabs on bug
+function TCatSongs.FindNextVisible(SearchFrom:integer): integer;//Find next Visible Song
+var
+  I: Integer;
+  begin
+  Result := -1;
+  I := SearchFrom + 1;
+  while not CatSongs.Song[I].Visible do
+    begin
+    Inc (I);
+    if (I>high(CatSongs.Song)) then
+      I := low(CatSongs.Song);
+    if (I = SearchFrom) then //Make One Round and no song found->quit
+      break;
+    end;
+  end;
+//Wrong song selected when tabs on bug End
+
+function TCatSongs.VisibleSongs: integer;
+var
+  S:    integer; // song
+begin
+  Result := 0;
+  for S := 0 to high(CatSongs.Song) do
+    if CatSongs.Song[S].Visible = true then Inc(Result);
+end;
+
+function TCatSongs.VisibleIndex(Index: integer): integer;
+var
+  S:    integer; // song
+begin
+  Result := 0;
+  for S := 0 to Index-1 do
+    if CatSongs.Song[S].Visible = true then Inc(Result);
+end;
+
+function TCatSongs.SetFilter(FilterStr: String; const fType: Byte): Cardinal;
+var
+  I, J: Integer;
+  cString: String;
+  SearchStr: Array of String;
+begin
+  {fType: 0: All
+          1: Title
+          2: Artist}
+  FilterStr := Trim(FilterStr);
+  if FilterStr<>'' then begin
+    Result := 0;
+    //Create Search Array
+    SetLength(SearchStr, 1);
+    I := Pos (' ', FilterStr);
+    While (I <> 0) do
+    begin
+      SetLength (SearchStr, Length(SearchStr) + 1);
+      cString := Copy(FilterStr, 1, I-1);
+      if (cString <> ' ') AND (cString <> '') then
+        SearchStr[High(SearchStr)-1] := cString;
+      Delete (FilterStr, 1, I);
+
+      I := Pos (' ', FilterStr);
+    end;
+    //Copy last Word
+    if (FilterStr <> ' ') AND (FilterStr <> '') then
+      SearchStr[High(SearchStr)] := FilterStr;
+
+    for I:=0 to High(Song) do begin
+      if not Song[i].Main then
+      begin
+        case fType of
+          0: cString := Song[I].Artist + ' ' + Song[i].Title + ' ' + Song[i].Folder;
+          1: cString := Song[I].Title;
+          2: cString := Song[I].Artist;
+        end;
+        Song[i].Visible:=True;
+        //Look for every Searched Word
+        For J := 0 to High(SearchStr) do
+        begin
+          Song[i].Visible := Song[i].Visible AND AnsiContainsText(cString, SearchStr[J])
+        end;
+        if Song[i].Visible then
+          Inc(Result);
+      end
+      else
+        Song[i].Visible:=False;
+    end;
+    CatNumShow := -2;
+  end
+  else begin
+    for i:=0 to High(Song) do begin
+      Song[i].Visible:=(Ini.Tabs=1)=Song[i].Main;
+      CatNumShow := -1;
+    end;
+    Result := 0;
+  end;
+end;
+
+end.