merged trunk into lua branch

plugin loading is disabled atm because of a bug reading the files (lua may be the reason). 
Reading the files in usdx and passing the contents to lua may solve this

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

2 files changed, 4 insertions, 197 deletions

diff --git a/Lua/src/macosx/PseudoThread.pas b/Lua/src/macosx/PseudoThread.pas
index 5764395d..d74285f7 100644
--- a/Lua/src/macosx/PseudoThread.pas
+++ b/Lua/src/macosx/PseudoThread.pas
@@ -37,23 +37,24 @@ type
 
 // Debugging threads with XCode doesn't seem to work.
 // We use PseudoThread in Debug mode to get proper debugging.
+
 TPseudoThread = class(TObject)
   private
   protected
     Terminated,
-    FreeOnTerminate : Boolean;
+    FreeOnTerminate: boolean;
     procedure Execute; virtual; abstract;
     procedure Resume;
     procedure Suspend;
   public
-   constructor Create(const suspended : Boolean);
+   constructor Create(const suspended : boolean);
 end;
 
 implementation
 
 { TPseudoThread }
 
-constructor TPseudoThread.Create(const suspended : Boolean);
+constructor TPseudoThread.Create(const suspended: boolean);
 begin
   if not suspended then
   begin
diff --git a/Lua/src/macosx/Windows.pas b/Lua/src/macosx/Windows.pas
deleted file mode 100644
index 28b5c99f..00000000
--- a/Lua/src/macosx/Windows.pas
+++ /dev/null
@@ -1,194 +0,0 @@
-{* UltraStar Deluxe - Karaoke Game
- *
- * UltraStar Deluxe is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *}
-
-unit Windows;
-
-{$I switches.inc}
-
-interface
-
-uses
-  Types;
-
-const
-  opengl32 = 'OpenGL';
-  MAX_PATH = 260;
-
-type
-
-  DWORD = Types.DWORD;
-  {$EXTERNALSYM DWORD}
-  BOOL = LongBool;
-  {$EXTERNALSYM BOOL}
-  PBOOL = ^BOOL;
-  {$EXTERNALSYM PBOOL}
-  PByte = Types.PByte;
-  PINT = ^Integer;
-  {$EXTERNALSYM PINT}
-  PSingle = ^Single;
-  PWORD = ^Word;
-  {$EXTERNALSYM PWORD}
-  PDWORD = ^DWORD;
-  {$EXTERNALSYM PDWORD}
-  LPDWORD = PDWORD;
-  {$EXTERNALSYM LPDWORD}
-  HDC = type LongWord;
-  {$EXTERNALSYM HDC}
-  HGLRC = type LongWord;
-  {$EXTERNALSYM HGLRC}
-  TLargeInteger = Int64;
-  HFONT = type LongWord;
-  {$EXTERNALSYM HFONT}
-  HWND = type LongWord;
-  {$EXTERNALSYM HWND}
-
-  PPaletteEntry = ^TPaletteEntry;
-  {$EXTERNALSYM tagPALETTEENTRY}
-  tagPALETTEENTRY = packed record
-    peRed: Byte;
-    peGreen: Byte;
-    peBlue: Byte;
-    peFlags: Byte;
-  end;
-  TPaletteEntry = tagPALETTEENTRY;
-  {$EXTERNALSYM PALETTEENTRY}
-  PALETTEENTRY = tagPALETTEENTRY;
-  
-  PRGBQuad = ^TRGBQuad;
-  {$EXTERNALSYM tagRGBQUAD}
-  tagRGBQUAD = packed record
-    rgbBlue: Byte;
-    rgbGreen: Byte;
-    rgbRed: Byte;
-    rgbReserved: Byte;
-  end;
-  TRGBQuad = tagRGBQUAD;
-  {$EXTERNALSYM RGBQUAD}
-  RGBQUAD = tagRGBQUAD;
-
-  PBitmapInfoHeader = ^TBitmapInfoHeader;
-  {$EXTERNALSYM tagBITMAPINFOHEADER}
-  tagBITMAPINFOHEADER = packed record
-    biSize: DWORD;
-    biWidth: Longint;
-    biHeight: Longint;
-    biPlanes: Word;
-    biBitCount: Word;
-    biCompression: DWORD;
-    biSizeImage: DWORD;
-    biXPelsPerMeter: Longint;
-    biYPelsPerMeter: Longint;
-    biClrUsed: DWORD;
-    biClrImportant: DWORD;
-  end;
-  TBitmapInfoHeader = tagBITMAPINFOHEADER;
-  {$EXTERNALSYM BITMAPINFOHEADER}
-  BITMAPINFOHEADER = tagBITMAPINFOHEADER;
-
-  PBitmapInfo = ^TBitmapInfo;
-  {$EXTERNALSYM tagBITMAPINFO}
-  tagBITMAPINFO = packed record
-      bmiHeader: TBitmapInfoHeader;
-      bmiColors: array[0..0] of TRGBQuad;
-  end;
-  TBitmapInfo = tagBITMAPINFO;
-  {$EXTERNALSYM BITMAPINFO}
-  BITMAPINFO = tagBITMAPINFO;
-	
-  PBitmapFileHeader = ^TBitmapFileHeader;
-  {$EXTERNALSYM tagBITMAPFILEHEADER}
-  tagBITMAPFILEHEADER = packed record
-    bfType: Word;
-    bfSize: DWORD;
-    bfReserved1: Word;
-    bfReserved2: Word;
-    bfOffBits: DWORD;
-  end;
-  TBitmapFileHeader = tagBITMAPFILEHEADER;
-  {$EXTERNALSYM BITMAPFILEHEADER}
-  BITMAPFILEHEADER = tagBITMAPFILEHEADER;
-	
-
-function MakeLong(a, b: Word): Longint;
-procedure ZeroMemory(Destination: Pointer; Length: DWORD);
-function QueryPerformanceFrequency(var lpFrequency: TLargeInteger): BOOL;
-function QueryPerformanceCounter(var lpPerformanceCount: TLargeInteger): BOOL;
-function GetTickCount : Cardinal;
-Procedure ShowMessage(msg : String);
-procedure CopyMemory(Destination: Pointer; Source: Pointer; Length: DWORD);
-
-implementation
-
-uses
-  SDL;
-
-procedure CopyMemory(Destination: Pointer; Source: Pointer; Length: DWORD);
-begin
-  Move(Source^, Destination^, Length);
-end;
-
-procedure ShowMessage(msg : String);
-begin
-  // to be implemented	
-end;
-
-function MakeLong(A, B: Word): Longint;
-begin
-  Result := (LongInt(B) shl 16) + A;
-end;
-
-procedure ZeroMemory(Destination: Pointer; Length: DWORD);
-begin
-  FillChar( Destination^, Length, 0);
-end;
-
-function QueryPerformanceFrequency(var lpFrequency: TLargeInteger): BOOL;
-begin
-{$IFDEF MSWINDOWS}
-  Result := Windows.QueryPerformanceFrequency(lpFrequency);
-{$ENDIF}
-{$IFDEF MACOS}
-  Result := true;
-  lpFrequency := 1000;
-{$ENDIF}
-end;
-
-function QueryPerformanceCounter(var lpPerformanceCount: TLargeInteger): BOOL;
-begin
-{$IFDEF MSWINDOWS}
-  Result := Windows.QueryPerformanceCounter(lpPerformanceCount);
-{$ENDIF}
-{$IFDEF MACOS}
-  Result := true;
-  lpPerformanceCount := SDL_GetTicks;
-{$ENDIF}
-end;
-
-function GetTickCount : Cardinal;
-begin
-  Result := SDL_GetTicks;
-end;
-
-end.