basic threading of song loading..

with some stubs for event based song list reloading.

so songs can be added while the game is being played, potentially.
and startup isnt slowed down by loading all the songs, as its done in the background.

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

3 files changed, 401 insertions, 308 deletions

diff --git a/Game/Code/Classes/UMain.pas b/Game/Code/Classes/UMain.pas
index d3b65e2f..d7ae51f4 100644
--- a/Game/Code/Classes/UMain.pas
+++ b/Game/Code/Classes/UMain.pas
@@ -152,314 +152,306 @@ var
   hWnd: THandle;
   I: Integer;
 begin
-  WndTitle := Version;
+  try
 
-//  InitializeSound();
-//  writeln( 'DONE' );
-//  exit;
+    WndTitle := Version;
 
-
-  {$IFDEF MSWINDOWS}
-  //------------------------------
-  //Start more than One Time Prevention
-  //------------------------------
-  hWnd:= FindWindow(nil, PChar(WndTitle));
-  //Programm already started
-  if (hWnd <> 0) then
-  begin
-    I := Messagebox(0, PChar('Another Instance of Ultrastar is already running. Continue ?'), PChar(WndTitle), MB_ICONWARNING or MB_YESNO);
-    if (I = IDYes) then
+    {$IFDEF MSWINDOWS}
+    //------------------------------
+    //Start more than One Time Prevention
+    //------------------------------
+    hWnd:= FindWindow(nil, PChar(WndTitle));
+    //Programm already started
+    if (hWnd <> 0) then
     begin
-      I := 1;
-      repeat
-        Inc(I);
-        hWnd := FindWindow(nil, PChar(WndTitle + ' Instance ' + InttoStr(I)));
-      until (hWnd = 0);
-      WndTitle := WndTitle + ' Instance ' + InttoStr(I);
-    end
+      I := Messagebox(0, PChar('Another Instance of Ultrastar is already running. Continue ?'), PChar(WndTitle), MB_ICONWARNING or MB_YESNO);
+      if (I = IDYes) then
+      begin
+        I := 1;
+        repeat
+          Inc(I);
+          hWnd := FindWindow(nil, PChar(WndTitle + ' Instance ' + InttoStr(I)));
+        until (hWnd = 0);
+        WndTitle := WndTitle + ' Instance ' + InttoStr(I);
+      end
+      else
+        Exit;
+    end;
+    {$ENDIF}
+
+    //------------------------------
+    //StartUp - Create Classes and Load Files
+    //------------------------------
+    USTime := TTime.Create;
+
+    // Commandline Parameter Parser
+    Params := TCMDParams.Create;
+
+    // Log + Benchmark
+    Log := TLog.Create;
+    Log.Title := WndTitle;
+    Log.Enabled := Not Params.NoLog;
+    Log.BenchmarkStart(0);
+
+    // Language
+    Log.BenchmarkStart(1);
+    Log.LogStatus('Initialize Paths', 'Initialization');
+    InitializePaths;
+    Log.LogStatus('Load Language', 'Initialization');
+    Language := TLanguage.Create;
+    //Add Const Values:
+      Language.AddConst('US_VERSION', Version);
+    Log.BenchmarkEnd(1);
+    Log.LogBenchmark('Loading Language', 1);
+
+    // SDL
+    Log.BenchmarkStart(1);
+    Log.LogStatus('Initialize SDL', 'Initialization');
+    SDL_Init(SDL_INIT_VIDEO or SDL_INIT_AUDIO);
+    Log.BenchmarkEnd(1);
+    Log.LogBenchmark('Initializing SDL', 1);
+
+    // SDL_ttf
+    Log.BenchmarkStart(1);
+    Log.LogStatus('Initialize SDL_ttf', 'Initialization');
+    TTF_Init();                      //ttf_quit();
+    Log.BenchmarkEnd(1);
+    Log.LogBenchmark('Initializing SDL_ttf', 1);
+
+     // Skin
+    Log.BenchmarkStart(1);
+    Log.LogStatus('Loading Skin List', 'Initialization');
+    Skin := TSkin.Create;
+    Log.BenchmarkEnd(1);
+    Log.LogBenchmark('Loading Skin List', 1);
+
+    // Sound Card List
+    Log.BenchmarkStart(1);
+    Log.LogStatus('Loading Soundcard list', 'Initialization');
+    Recording := TRecord.Create;
+    Log.BenchmarkEnd(1);
+    Log.LogBenchmark('Loading Soundcard list', 1);
+
+    // Ini + Paths
+    Log.BenchmarkStart(1);
+    Log.LogStatus('Load Ini', 'Initialization');
+    Ini := TIni.Create;
+    Ini.Load;
+
+    //Load Languagefile
+    if (Params.Language <> -1) then
+      Language.ChangeLanguage(ILanguage[Params.Language])
     else
-      Exit;
-  end;
-  {$ENDIF}
-
-  //------------------------------
-  //StartUp - Create Classes and Load Files
-  //------------------------------
-  USTime := TTime.Create;
-
-  // Commandline Parameter Parser
-  Params := TCMDParams.Create;
-
-  // Log + Benchmark
-  Log := TLog.Create;
-  Log.Title := WndTitle;
-  Log.Enabled := Not Params.NoLog;
-  Log.BenchmarkStart(0);
-
-  // Language
-  Log.BenchmarkStart(1);
-  Log.LogStatus('Initialize Paths', 'Initialization');        
-  InitializePaths;
-  Log.LogStatus('Load Language', 'Initialization');           
-  Language := TLanguage.Create;
-  //Add Const Values:
-    Language.AddConst('US_VERSION', Version);
-  Log.BenchmarkEnd(1);
-  Log.LogBenchmark('Loading Language', 1);
-
-  // SDL
-  Log.BenchmarkStart(1);
-  Log.LogStatus('Initialize SDL', 'Initialization');
-  SDL_Init(SDL_INIT_VIDEO or SDL_INIT_AUDIO);
-  Log.BenchmarkEnd(1);
-  Log.LogBenchmark('Initializing SDL', 1);
-
-  // SDL_ttf
-  Log.BenchmarkStart(1);
-  Log.LogStatus('Initialize SDL_ttf', 'Initialization');
-  TTF_Init();                      //ttf_quit();
-  Log.BenchmarkEnd(1);
-  Log.LogBenchmark('Initializing SDL_ttf', 1);
-
-   // Skin
-  Log.BenchmarkStart(1);
-  Log.LogStatus('Loading Skin List', 'Initialization');             
-  Skin := TSkin.Create;
-  Log.BenchmarkEnd(1);
-  Log.LogBenchmark('Loading Skin List', 1);
-
-  // Sound Card List
-  Log.BenchmarkStart(1);
-  Log.LogStatus('Loading Soundcard list', 'Initialization');
-  Recording := TRecord.Create;
-  Log.BenchmarkEnd(1);
-  Log.LogBenchmark('Loading Soundcard list', 1);
-
-  // Ini + Paths
-  Log.BenchmarkStart(1);
-  Log.LogStatus('Load Ini', 'Initialization');                
-  Ini := TIni.Create;
-  Ini.Load;
-
-  //Load Languagefile
-  if (Params.Language <> -1) then
-    Language.ChangeLanguage(ILanguage[Params.Language])
-  else
-    Language.ChangeLanguage(ILanguage[Ini.Language]);
-
-  Log.BenchmarkEnd(1);
-  Log.LogBenchmark('Loading Ini', 1);
-
-
-  // LCD
-  Log.BenchmarkStart(1);
-  Log.LogStatus('Load LCD', 'Initialization');                
-  LCD := TLCD.Create;
-  if Ini.LPT = 1 then begin
-//  LCD.HalfInterface := true;
-    LCD.Enable;
-    LCD.Clear;
-    LCD.WriteText(1, '  UltraStar    ');
-    LCD.WriteText(2, '  Loading...   ');
-  end;
-  Log.BenchmarkEnd(1);
-  Log.LogBenchmark('Loading LCD', 1);
-
-  // Light
-  Log.BenchmarkStart(1);
-  Log.LogStatus('Load Light', 'Initialization');              
-  Light := TLight.Create;
-  if Ini.LPT = 2 then begin
-    Light.Enable;
-  end;
-  Log.BenchmarkEnd(1);
-  Log.LogBenchmark('Loading Light', 1);
-
-
-
-  // Theme
-  Log.BenchmarkStart(1);
-  Log.LogStatus('Load Themes', 'Initialization');             
-  Theme := TTheme.Create('Themes\' + ITheme[Ini.Theme] + '.ini', Ini.Color);
-  Log.BenchmarkEnd(1);
-  Log.LogBenchmark('Loading Themes', 1);
-
-  // Covers Cache
-  Log.BenchmarkStart(1);
-  Log.LogStatus('Creating Covers Cache', 'Initialization');   
-  Covers := TCovers.Create;
-  Log.LogBenchmark('Loading Covers Cache Array', 1);
-  Log.BenchmarkStart(1);
-
-  // Category Covers
-  Log.BenchmarkStart(1);
-  Log.LogStatus('Creating Category Covers Array', 'Initialization');
-  CatCovers:= TCatCovers.Create;
-  Log.BenchmarkEnd(1);
-  Log.LogBenchmark('Loading Category Covers Array', 1);
-
-  // Songs
-  //Log.BenchmarkStart(1);
-  Log.LogStatus('Creating Song Array', 'Initialization');     
-  Songs := TSongs.Create;
-  Songs.LoadSongList;
-  Log.LogStatus('Creating 2nd Song Array', 'Initialization'); 
-  CatSongs := TCatSongs.Create;
-  Log.BenchmarkEnd(1);
-  Log.LogBenchmark('Loading Songs', 1);
-
-  // PluginManager
-  Log.BenchmarkStart(1);
-  Log.LogStatus('PluginManager', 'Initialization');
-  DLLMan := TDLLMan.Create;   //Load PluginList
-  Log.BenchmarkEnd(1);
-  Log.LogBenchmark('Loading PluginManager', 1);
-
-  // Party Mode Manager
-  Log.BenchmarkStart(1);
-  Log.LogStatus('PartySession Manager', 'Initialization');
-  PartySession := TParty_Session.Create;   //Load PartySession
-
-  Log.BenchmarkEnd(1);
-  Log.LogBenchmark('Loading PartySession Manager', 1);
-
-  // Sound
-  Log.BenchmarkStart(1);
-  Log.LogStatus('Initialize Sound', 'Initialization');        
-  InitializeSound();
-  Log.BenchmarkEnd(1);
-  Log.LogBenchmark('Initializing Sound', 1);
-
-//  exit;
-
-  // Graphics
-  Log.BenchmarkStart(1);
-  Log.LogStatus('Initialize 3D', 'Initialization');           
-  Initialize3D(WndTitle);
-  Log.BenchmarkEnd(1);
-  Log.LogBenchmark('Initializing 3D', 1);
-
-  // Score Saving System
-  Log.BenchmarkStart(1);
-  Log.LogStatus('DataBase System', 'Initialization');
-  DataBase := TDataBaseSystem.Create;
-
-  if (Params.ScoreFile = '') then
-    DataBase.Init ('Ultrastar.db')
-  else
-    DataBase.Init (Params.ScoreFile);
-
-  Log.BenchmarkEnd(1);
-  Log.LogBenchmark('Loading DataBase System', 1);
-
-  //Playlist Manager
-  Log.BenchmarkStart(1);
-  Log.LogStatus('Playlist Manager', 'Initialization');
-  PlaylistMan := TPlaylistManager.Create;
-  Log.BenchmarkEnd(1);
-  Log.LogBenchmark('Loading Playlist Manager', 1);
-
-  //GoldenStarsTwinkleMod
-  Log.BenchmarkStart(1);
-  Log.LogStatus('Effect Manager', 'Initialization');
-  GoldenRec := TEffectManager.Create;
-  Log.BenchmarkEnd(1);
-  Log.LogBenchmark('Loading Particel System', 1);
-
-  // Joypad
-  if (Ini.Joypad = 1) OR (Params.Joypad) then begin
+      Language.ChangeLanguage(ILanguage[Ini.Language]);
+
+    Log.BenchmarkEnd(1);
+    Log.LogBenchmark('Loading Ini', 1);
+
+
+    // LCD
     Log.BenchmarkStart(1);
-    Log.LogStatus('Initialize Joystick', 'Initialization');   
-	Joy := TJoy.Create;
+    Log.LogStatus('Load LCD', 'Initialization');
+    LCD := TLCD.Create;
+    if Ini.LPT = 1 then begin
+  //  LCD.HalfInterface := true;
+      LCD.Enable;
+      LCD.Clear;
+      LCD.WriteText(1, '  UltraStar    ');
+      LCD.WriteText(2, '  Loading...   ');
+    end;
     Log.BenchmarkEnd(1);
-    Log.LogBenchmark('Initializing Joystick', 1);
-  end;
+    Log.LogBenchmark('Loading LCD', 1);
 
-  Log.BenchmarkEnd(0);
-  Log.LogBenchmark('Loading Time', 0);
+    // Light
+    Log.BenchmarkStart(1);
+    Log.LogStatus('Load Light', 'Initialization');
+    Light := TLight.Create;
+    if Ini.LPT = 2 then begin
+      Light.Enable;
+    end;
+    Log.BenchmarkEnd(1);
+    Log.LogBenchmark('Loading Light', 1);
 
-  Log.LogError('Creating Core');
-  Core := TCore.Create('Ultrastar Deluxe Beta', MakeVersion(1,1,0, chr(0)));
 
-  Log.LogError('Running Core');
-  Core.Run;
 
-  //------------------------------
-  //Start- Mainloop
-  //------------------------------
-  //Music.SetLoop(true);
-  //Music.SetVolume(50);
-  //Music.Open(SkinPath + 'Menu Music 3.mp3');
-  //Music.Play;
-  Log.LogStatus('Main Loop', 'Initialization');               
-  MainLoop;
+    // Theme
+    Log.BenchmarkStart(1);
+    Log.LogStatus('Load Themes', 'Initialization');
+    Theme := TTheme.Create('Themes\' + ITheme[Ini.Theme] + '.ini', Ini.Color);
+    Log.BenchmarkEnd(1);
+    Log.LogBenchmark('Loading Themes', 1);
 
-  //------------------------------
-  //Finish Application
-  //------------------------------
-  if Ini.LPT = 1 then LCD.Clear;
-  if Ini.LPT = 2 then Light.TurnOff;
+    // Covers Cache
+    Log.BenchmarkStart(1);
+    Log.LogStatus('Creating Covers Cache', 'Initialization');
+    Covers := TCovers.Create;
+    Log.LogBenchmark('Loading Covers Cache Array', 1);
+    Log.BenchmarkStart(1);
 
-  Log.LogStatus('Main Loop', 'Finished');
+    // Category Covers
+    Log.BenchmarkStart(1);
+    Log.LogStatus('Creating Category Covers Array', 'Initialization');
+    CatCovers:= TCatCovers.Create;
+    Log.BenchmarkEnd(1);
+    Log.LogBenchmark('Loading Category Covers Array', 1);
 
-  Log.Free;
+    // Songs
+    //Log.BenchmarkStart(1);
+    Log.LogStatus('Creating Song Array', 'Initialization');
+    Songs := TSongs.Create;
+//    Songs.LoadSongList;
 
+    Log.LogStatus('Creating 2nd Song Array', 'Initialization');
+    CatSongs := TCatSongs.Create;
+    Log.BenchmarkEnd(1);
+    Log.LogBenchmark('Loading Songs', 1);
+
+    // PluginManager
+    Log.BenchmarkStart(1);
+    Log.LogStatus('PluginManager', 'Initialization');
+    DLLMan := TDLLMan.Create;   //Load PluginList
+    Log.BenchmarkEnd(1);
+    Log.LogBenchmark('Loading PluginManager', 1);
+
+    // Party Mode Manager
+    Log.BenchmarkStart(1);
+    Log.LogStatus('PartySession Manager', 'Initialization');
+    PartySession := TParty_Session.Create;   //Load PartySession
+
+    Log.BenchmarkEnd(1);
+    Log.LogBenchmark('Loading PartySession Manager', 1);
+
+    // Sound
+    Log.BenchmarkStart(1);
+    Log.LogStatus('Initialize Sound', 'Initialization');
+    InitializeSound();
+    Log.BenchmarkEnd(1);
+    Log.LogBenchmark('Initializing Sound', 1);
+
+  //  exit;
+
+    // Graphics
+    Log.BenchmarkStart(1);
+    Log.LogStatus('Initialize 3D', 'Initialization');
+    Initialize3D(WndTitle);
+    Log.BenchmarkEnd(1);
+    Log.LogBenchmark('Initializing 3D', 1);
+
+    // Score Saving System
+    Log.BenchmarkStart(1);
+    Log.LogStatus('DataBase System', 'Initialization');
+    DataBase := TDataBaseSystem.Create;
+
+    if (Params.ScoreFile = '') then
+      DataBase.Init ('Ultrastar.db')
+    else
+      DataBase.Init (Params.ScoreFile);
+
+    Log.BenchmarkEnd(1);
+    Log.LogBenchmark('Loading DataBase System', 1);
+
+    //Playlist Manager
+    Log.BenchmarkStart(1);
+    Log.LogStatus('Playlist Manager', 'Initialization');
+    PlaylistMan := TPlaylistManager.Create;
+    Log.BenchmarkEnd(1);
+    Log.LogBenchmark('Loading Playlist Manager', 1);
+
+    //GoldenStarsTwinkleMod
+    Log.BenchmarkStart(1);
+    Log.LogStatus('Effect Manager', 'Initialization');
+    GoldenRec := TEffectManager.Create;
+    Log.BenchmarkEnd(1);
+    Log.LogBenchmark('Loading Particel System', 1);
+
+    // Joypad
+    if (Ini.Joypad = 1) OR (Params.Joypad) then
+    begin
+      Log.BenchmarkStart(1);
+      Log.LogStatus('Initialize Joystick', 'Initialization');
+    	Joy := TJoy.Create;
+      Log.BenchmarkEnd(1);
+      Log.LogBenchmark('Initializing Joystick', 1);
+    end;
+
+    Log.BenchmarkEnd(0);
+    Log.LogBenchmark('Loading Time', 0);
+
+    Log.LogError('Creating Core');
+    Core := TCore.Create('Ultrastar Deluxe Beta', MakeVersion(1,1,0, chr(0)));
+
+    Log.LogError('Running Core');
+    Core.Run;
+
+    //------------------------------
+    //Start- Mainloop
+    //------------------------------
+    //Music.SetLoop(true);
+    //Music.SetVolume(50);
+    //Music.Open(SkinPath + 'Menu Music 3.mp3');
+    //Music.Play;
+    Log.LogStatus('Main Loop', 'Initialization');
+    MainLoop;
+
+  finally
+    //------------------------------
+    //Finish Application
+    //------------------------------
+    if Ini.LPT = 1 then LCD.Clear;
+    if Ini.LPT = 2 then Light.TurnOff;
+
+    Log.LogStatus('Main Loop', 'Finished');
+    Log.Free;
+  end;
 end;
-//{$ENDIF}
 
 procedure MainLoop;
 var
   Delay:    integer;
 begin
-  Delay := 0;
-  SDL_EnableKeyRepeat(125, 125);
-  
-  
-  CountSkipTime();  // JB - for some reason this seems to be needed when we use the SDL Timer functions.
-  While not Done do
-  Begin
-    // joypad
-    if (Ini.Joypad = 1) OR (Params.Joypad) then
-      Joy.Update;
+  try
+    Delay := 0;
+    SDL_EnableKeyRepeat(125, 125);
 
-    // keyboard events
-    CheckEvents;
+    CountSkipTime();  // JB - for some reason this seems to be needed when we use the SDL Timer functions.
+    While not Done do
+    Begin
+      // joypad
+      if (Ini.Joypad = 1) OR (Params.Joypad) then
+        Joy.Update;
 
-    // display
-    done := not Display.Draw;
-    SwapBuffers;
+      // keyboard events
+      CheckEvents;
 
-    // light
-    Light.Refresh;
+      // display
+      done := not Display.Draw;
+      SwapBuffers;
 
-    // delay
-    CountMidTime;
-    
-    {$IFDEF DebugDisplay}
-    Writeln( 'TimeMid : '+ inttostr(trunc(TimeMid)) );
-    {$ENDIF}
+      // light
+      Light.Refresh;
 
-//    if 1000*TimeMid > 100 then beep;
-    Delay := Floor(1000 / 100 - 1000 * TimeMid);
+      // delay
+      CountMidTime;
 
-    {$IFDEF DebugDisplay}
-    Writeln( 'Delay ms : '+ inttostr(Delay) );
-    {$ENDIF}
+      Delay := Floor(1000 / 100 - 1000 * TimeMid);
 
-    if Delay >= 1 then
-      SDL_Delay(Delay); // dynamic, maximum is 100 fps
+      if Delay >= 1 then
+        SDL_Delay(Delay); // dynamic, maximum is 100 fps
 
-    CountSkipTime;
+      CountSkipTime;
 
-    // reinitialization of graphics
-    if Restart then
-    begin
-      Reinitialize3D;
-      Restart := false;
-    end;
+      // reinitialization of graphics
+      if Restart then
+      begin
+        Reinitialize3D;
+        Restart := false;
+      end;
 
-  End;
-  UnloadOpenGL;
+    End;
+    
+  finally
+    UnloadOpenGL;
+  end;
 End;
 
 Procedure CheckEvents;
diff --git a/Game/Code/Classes/USongs.pas b/Game/Code/Classes/USongs.pas
index 614363c8..e3b2f3b2 100644
--- a/Game/Code/Classes/USongs.pas
+++ b/Game/Code/Classes/USongs.pas
@@ -10,12 +10,16 @@ interface
 
 uses SysUtils,
      {$ifndef MSWINDOWS}
-	   {$IFDEF DARWIN}
+     {$IFDEF DARWIN}
 	     baseunix,
 	   {$ELSE}
-         oldlinux,
-	   {$ENDIF}	 
+       oldlinux,
+	   {$ENDIF}
+      baseunix,
+      UnixType,
+      syscall,
      {$endif}
+     Classes,
      ULog,
      UTexture,
      UCommon,
@@ -57,7 +61,7 @@ type
     Background: widestring;
     Video:      widestring;
     VideoGAP:   real;
-    VideoLoaded: boolean; // 0.5.0: true if the video has been loaded 
+    VideoLoaded: boolean; // 0.5.0: true if the video has been loaded
     NotesGAP:   integer;
     Start:      real; // in seconds
     Finish:     integer; // in miliseconds
@@ -76,16 +80,25 @@ type
     CatNumber:  integer; // Count of Songs in Category for Cats and Number of Song in Category for Songs
   end;
 
-  TSongs = class
+  TSongs = class( TThread )
   private
-    BrowsePos: Cardinal; //Actual Pos in Song Array
+    BrowsePos : Cardinal; //Actual Pos in Song Array
+    fNotify   ,
+    fWatch    : longint;
+    fParseSongDirectory : boolean;
+    fProcessing         : boolean;
+    procedure int_LoadSongList;
+  protected
+    procedure Execute; override;
   public
-    Song:       array of TSong; // array of songs
-    Selected:   integer; // selected song index
-    procedure LoadSongList; // load all songs
+    Song      : array of TSong; // array of songs
+    Selected  : integer;        // selected song index
+    constructor create();
+    procedure LoadSongList;     // load all songs
     procedure BrowseDir(Dir: widestring); // should return number of songs in the future
     procedure Sort(Order: integer);
-    function FindSongFile(Dir, Mask: widestring): widestring;
+    function  FindSongFile(Dir, Mask: widestring): widestring;
+    property  Processing : boolean read fProcessing;
   end;
 
   TCatSongs = class
@@ -113,6 +126,20 @@ var
   CatSongs:   TCatSongs; // categorized songs
   AktSong:    TSong; // one song *unknown use)
 
+const
+     IN_ACCESS		    = $00000001;	//* File was accessed */
+     IN_MODIFY		    = $00000002;	//* File was modified */
+     IN_ATTRIB		    = $00000004;	//* Metadata changed */
+     IN_CLOSE_WRITE		= $00000008;	//* Writtable file was closed */
+     IN_CLOSE_NOWRITE	= $00000010;	//* Unwrittable file closed */
+     IN_OPEN			    = $00000020;	//* File was opened */
+     IN_MOVED_FROM		= $00000040;	//* File was moved from X */
+     IN_MOVED_TO		  = $00000080;	//* File was moved to Y */
+     IN_CREATE		    = $00000100;	//* Subfile was created */
+     IN_DELETE		    = $00000200;	//* Subfile was deleted */
+     IN_DELETE_SELF		= $00000400;	//* Self was deleted */
+  
+
 implementation
 
 uses StrUtils,
@@ -127,22 +154,94 @@ begin
 end;
 {$ENDIF}
 
-procedure TSongs.LoadSongList;
+constructor TSongs.create();
 begin
-  Log.LogStatus('Initializing', 'LoadSongList');
+  inherited create( false );
+  self.freeonterminate := true;
+
+  {$IFDEF linux}
+  (*
+    Thankyou to : http://www.linuxjournal.com/article/8478
+                  http://www.tin.org/bin/man.cgi?section=2&topic=inotify_add_watch
+  *)
+(*
+  fNotify := -1;
+  fWatch  := -1;
+  
+  writeln( 'Calling inotify_init' );
+  fNotify := Do_SysCall( syscall_nr_inotify_init );
+  if ( fNotify < 0 ) then
+    writeln( 'Filesystem change notification - disabled' );
+  writeln( 'Calling inotify_init : '+ inttostr(fNotify)  );
+
+  writeln( 'Calling syscall_nr_inotify_init ('+SongPath+')' );
+  fWatch := Do_SysCall( syscall_nr_inotify_init , TSysParam( fNotify ), longint( pchar( SongPath ) ) , IN_MODIFY AND IN_CREATE AND IN_DELETE  );
+  
+  if (fWatch < 0) then
+     writeln ('inotify_add_watch');
+  writeln( 'Calling syscall_nr_inotify_init : '+ inttostr(fWatch)  );
+*)
+  {$endif}
+  
+  Setlength(Song, 0);
+end;
 
-  // clear
-  Setlength(Song, 50);
+procedure TSongs.Execute();
+var
 
-  BrowsePos := 0;
-  // browse directories
-  BrowseDir(SongPath);
+  lrfds : fdSet;
+  time  : Ttimeval;
+  res   : integer;
+  buf   : pchar;
+  len, bufflen : longint;
+  str : String;
+begin
+  fParseSongDirectory := true;
   
-  //Set Correct SongArray Length
-  SetLength(Song, BrowsePos);
-//  if Ini.Debug = 1 then BrowseDir('D:\Extract\Songs\');
+  while not self.terminated do
+  begin
+
+//    if fParseSongDirectory then
+    begin
+      writeln( 'int_LoadSongList' );
+      int_LoadSongList();
+    end;
+
+    self.suspend;
+  end;
+    
+end;
+
+procedure TSongs.int_LoadSongList;
+begin
+  try
+    fProcessing := true;
+    
+    Log.LogError('SongList', 'Searching For Songs');
+    Setlength(Song, 50);
+
+    BrowsePos := 0;
+    // browse directories
+    BrowseDir(SongPath);
+
+    //Set Correct SongArray Length
+    SetLength(Song, BrowsePos);
+  finally
+    Log.LogError('SongList', 'Search Complete');
+    
+    fParseSongDirectory := false;
+    fProcessing         := false;
+  end;
+end;
+
+
+procedure TSongs.LoadSongList;
+begin
+  fParseSongDirectory := true;
+  self.resume;
 end;
 
+// TODO : JB - THis whole function SUX ! and needs refactoring ! :P
 procedure TSongs.BrowseDir(Dir: widestring);
 var
   SLen:   integer;
@@ -150,10 +249,10 @@ var
   {$ifdef MSWINDOWS}
     SR:     TSearchRecW;   // for parsing Songs Directory
   {$else}  // This should work on all posix systems.
-    TheDir  : pdir;
-    ADirent : pDirent;
+    TheDir  : oldlinux.pdir;
+    ADirent : oldlinux.pDirent;
     Entry   : Longint;
-    info    : stat;
+    info    : oldlinux.stat;
   {$endif}  
 begin
   {$ifdef MSWINDOWS}
@@ -201,11 +300,11 @@ begin
 	
    {$IFDEF LINUX}
     // Itterate the Songs Directory... ( With unicode capable functions for linux )
-    TheDir := opendir( Dir );     // JB_Unicode - linux
+    TheDir := oldlinux.opendir( Dir );     // JB_Unicode - linux
     if TheDir <> nil then
     begin
       repeat
-        ADirent := ReadDir(TheDir);
+        ADirent := oldlinux.ReadDir(TheDir);
 
         If ADirent<>Nil then
         begin
@@ -222,11 +321,11 @@ begin
     
     
 
-    TheDir := opendir( Dir );     // JB_Unicode - linux
+    TheDir := oldlinux.opendir( Dir );     // JB_Unicode - linux
     if TheDir <> nil then
     begin
       repeat
-        ADirent := ReadDir(TheDir);
+        ADirent := oldlinux.ReadDir(TheDir);
         
         if ( ADirent <> Nil                    ) AND
            ( pos( '.txt', ADirent^.name ) > 0 ) then
diff --git a/Game/Code/UltraStar.lpr b/Game/Code/UltraStar.lpr
index 630c0873..dc8fb781 100644
--- a/Game/Code/UltraStar.lpr
+++ b/Game/Code/UltraStar.lpr
@@ -11,6 +11,11 @@ program UltraStar;
 {$I switches.inc}
 
 uses
+  {$ifdef unix}            // http://wiki.lazarus.freepascal.org/Multithreaded_Application_Tutorial
+    cthreads,              // THIS MUST be the first used unit !!
+  {$endif}
+  
+  syscall,
 
   // ***************************************************************************
   //
@@ -212,8 +217,5 @@ const
   Version = 'UltraStar Deluxe V 1.10 Alpha Build';
 
 begin
-
   main();
-
-
 end.