missing svn:eol-style added

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

4 files changed, 588 insertions, 588 deletions

diff --git a/unicode/src/menu/UMenuBackground.pas b/unicode/src/menu/UMenuBackground.pas
index c85f0806..0e2e63a6 100644
--- a/unicode/src/menu/UMenuBackground.pas
+++ b/unicode/src/menu/UMenuBackground.pas
@@ -1,83 +1,83 @@
-{* 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 UMenuBackground;

-

-interface

-

-{$IFDEF FPC}

-  {$MODE Delphi}

-{$ENDIF}

-

-{$I switches.inc}

-

-uses

-  SysUtils,

-  UThemes;

-

-//TMenuBackground - abstraction class for MenuBackgrounds

-//this is a class, not an interface because of the constructors

-//and destructors

-//--------

-

-type

-  EMenuBackgroundError = class(Exception);

-  TMenuBackground = class

-    constructor Create(const ThemedSettings: TThemeBackground); virtual;

-    procedure   OnShow; virtual;

-    procedure   Draw; virtual;

-    procedure   OnFinish; virtual;

-    destructor  Destroy; override;

-  end;

-  cMenuBackground = class of TMenuBackground;

-

-implementation

-

-constructor TMenuBackground.Create(const ThemedSettings: TThemeBackground);

-begin

-  inherited Create;

-end;

-

-destructor  TMenuBackground.Destroy;

-begin

-  inherited;

-end;

-

-procedure   TMenuBackground.OnShow;

-begin

-

-end;

-

-procedure   TMenuBackground.OnFinish;

-begin

-

-end;

-

-procedure   TMenuBackground.Draw;

-begin

-

-end;

-

-end.

+{* 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 UMenuBackground;
+
+interface
+
+{$IFDEF FPC}
+  {$MODE Delphi}
+{$ENDIF}
+
+{$I switches.inc}
+
+uses
+  SysUtils,
+  UThemes;
+
+//TMenuBackground - abstraction class for MenuBackgrounds
+//this is a class, not an interface because of the constructors
+//and destructors
+//--------
+
+type
+  EMenuBackgroundError = class(Exception);
+  TMenuBackground = class
+    constructor Create(const ThemedSettings: TThemeBackground); virtual;
+    procedure   OnShow; virtual;
+    procedure   Draw; virtual;
+    procedure   OnFinish; virtual;
+    destructor  Destroy; override;
+  end;
+  cMenuBackground = class of TMenuBackground;
+
+implementation
+
+constructor TMenuBackground.Create(const ThemedSettings: TThemeBackground);
+begin
+  inherited Create;
+end;
+
+destructor  TMenuBackground.Destroy;
+begin
+  inherited;
+end;
+
+procedure   TMenuBackground.OnShow;
+begin
+
+end;
+
+procedure   TMenuBackground.OnFinish;
+begin
+
+end;
+
+procedure   TMenuBackground.Draw;
+begin
+
+end;
+
+end.
diff --git a/unicode/src/menu/UMenuBackgroundFade.pas b/unicode/src/menu/UMenuBackgroundFade.pas
index 6fef063f..6d877baa 100644
--- a/unicode/src/menu/UMenuBackgroundFade.pas
+++ b/unicode/src/menu/UMenuBackgroundFade.pas
@@ -1,176 +1,176 @@
-{* 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 UMenuBackgroundFade;

-

-interface

-

-{$IFDEF FPC}

-  {$MODE Delphi}

-{$ENDIF}

-

-{$I switches.inc}

-

-uses

-  UThemes,

-  UTexture,

-  UMenuBackground,

-  UPath;

-

-//TMenuBackgroundFade - Background Fade In for Overlay screens

-//--------

-

-type

-  TMenuBackgroundFade = class (TMenuBackground)

-    private

-      Tex:        TTexture;

-      Color:      TRGB;

-      Alpha:      real;

-      

-      useTexture: boolean;

-

-      FadeTime:   cardinal;

-    public

-      constructor Create(const ThemedSettings: TThemeBackground); override;

-      procedure   OnShow; override;

-      procedure   Draw; override;

-      destructor  Destroy; override;

-  end;

-

-const

-  FADEINTIME = 1500; //Time the bg fades in

-

-implementation

-uses

-  sdl,

-  gl,

-  glext,

-  USkins,

-  UCommon,

-  UGraphic;

-

-constructor TMenuBackgroundFade.Create(const ThemedSettings: TThemeBackground);

-var

-  texFilename: IPath;

-begin

-  inherited;

-  FadeTime := 0;

-

-  Color := ThemedSettings.Color;

-  Alpha := ThemedSettings.Alpha;

-  if (Length(ThemedSettings.Tex) > 0) then

-  begin

-    texFilename := Skin.GetTextureFileName(ThemedSettings.Tex);

-    Tex         := Texture.GetTexture(texFilename, TEXTURE_TYPE_PLAIN);

-

-    UseTexture  := (Tex.TexNum <> 0);

-  end

-  else

-    UseTexture := false;

-

-  if (not UseTexture) then

-    FreeandNil(Tex);

-end;

-

-destructor  TMenuBackgroundFade.Destroy;

-begin

-  //Why isn't there any Tex.free method?

-  {if UseTexture then

-    FreeandNil(Tex); }

-  inherited;

-end;

-

-procedure   TMenuBackgroundFade.OnShow;

-begin

-  FadeTime := SDL_GetTicks;

-end;

-

-procedure   TMenuBackgroundFade.Draw;

-var

-  Progress: real;

-begin

-  if FadeTime = 0 then

-    Progress := Alpha

-  else

-    Progress := Alpha * (SDL_GetTicks - FadeTime) / FADEINTIME;

-

-  if Progress > Alpha then

-  begin

-    FadeTime := 0;

-    Progress := Alpha;

-  end;

-

-  if (UseTexture) then

-  begin //Draw Texture to Screen

-    if (ScreenAct = 1) then //Clear just once when in dual screen mode

-      glClear(GL_DEPTH_BUFFER_BIT);

-

-    glEnable(GL_TEXTURE_2D);

-    glEnable(GL_BLEND);

-    glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);

-

-    glColorRGB(Color, Progress);

-    glBindTexture(GL_TEXTURE_2D, Tex.TexNum);

-

-    glBegin(GL_QUADS);

-      glTexCoord2f(Tex.TexX1*Tex.TexW, Tex.TexY1*Tex.TexH);

-      glVertex2f(0, 0);

-

-      glTexCoord2f(Tex.TexX1*Tex.TexW, Tex.TexY2*Tex.TexH);

-      glVertex2f(0, 600);

-

-      glTexCoord2f(Tex.TexX2*Tex.TexW, Tex.TexY2*Tex.TexH);

-      glVertex2f(800, 600);

-

-      glTexCoord2f(Tex.TexX2*Tex.TexW, Tex.TexY1*Tex.TexH);

-      glVertex2f(800, 0);

-    glEnd;

-

-    glDisable(GL_BLEND);

-    glDisable(GL_TEXTURE_2D);

-  end

-  else

-  begin //Clear Screen w/ progress Alpha + Color

-    if (ScreenAct = 1) then //Clear just once when in dual screen mode

-      glClear(GL_DEPTH_BUFFER_BIT);

-      

-    glDisable(GL_TEXTURE_2D);

-    glEnable(GL_BLEND);

-    glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);

-

-    glColorRGB(Color, Progress);

-

-    glBegin(GL_QUADS);

-      glVertex2f(0, 0);

-      glVertex2f(0, 600);

-      glVertex2f(800, 600);

-      glVertex2f(800, 0);

-    glEnd;

-

-    glDisable(GL_BLEND);

-  end;  

-end;

-

-end.

+{* 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 UMenuBackgroundFade;
+
+interface
+
+{$IFDEF FPC}
+  {$MODE Delphi}
+{$ENDIF}
+
+{$I switches.inc}
+
+uses
+  UThemes,
+  UTexture,
+  UMenuBackground,
+  UPath;
+
+//TMenuBackgroundFade - Background Fade In for Overlay screens
+//--------
+
+type
+  TMenuBackgroundFade = class (TMenuBackground)
+    private
+      Tex:        TTexture;
+      Color:      TRGB;
+      Alpha:      real;
+      
+      useTexture: boolean;
+
+      FadeTime:   cardinal;
+    public
+      constructor Create(const ThemedSettings: TThemeBackground); override;
+      procedure   OnShow; override;
+      procedure   Draw; override;
+      destructor  Destroy; override;
+  end;
+
+const
+  FADEINTIME = 1500; //Time the bg fades in
+
+implementation
+uses
+  sdl,
+  gl,
+  glext,
+  USkins,
+  UCommon,
+  UGraphic;
+
+constructor TMenuBackgroundFade.Create(const ThemedSettings: TThemeBackground);
+var
+  texFilename: IPath;
+begin
+  inherited;
+  FadeTime := 0;
+
+  Color := ThemedSettings.Color;
+  Alpha := ThemedSettings.Alpha;
+  if (Length(ThemedSettings.Tex) > 0) then
+  begin
+    texFilename := Skin.GetTextureFileName(ThemedSettings.Tex);
+    Tex         := Texture.GetTexture(texFilename, TEXTURE_TYPE_PLAIN);
+
+    UseTexture  := (Tex.TexNum <> 0);
+  end
+  else
+    UseTexture := false;
+
+  if (not UseTexture) then
+    FreeandNil(Tex);
+end;
+
+destructor  TMenuBackgroundFade.Destroy;
+begin
+  //Why isn't there any Tex.free method?
+  {if UseTexture then
+    FreeandNil(Tex); }
+  inherited;
+end;
+
+procedure   TMenuBackgroundFade.OnShow;
+begin
+  FadeTime := SDL_GetTicks;
+end;
+
+procedure   TMenuBackgroundFade.Draw;
+var
+  Progress: real;
+begin
+  if FadeTime = 0 then
+    Progress := Alpha
+  else
+    Progress := Alpha * (SDL_GetTicks - FadeTime) / FADEINTIME;
+
+  if Progress > Alpha then
+  begin
+    FadeTime := 0;
+    Progress := Alpha;
+  end;
+
+  if (UseTexture) then
+  begin //Draw Texture to Screen
+    if (ScreenAct = 1) then //Clear just once when in dual screen mode
+      glClear(GL_DEPTH_BUFFER_BIT);
+
+    glEnable(GL_TEXTURE_2D);
+    glEnable(GL_BLEND);
+    glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+
+    glColorRGB(Color, Progress);
+    glBindTexture(GL_TEXTURE_2D, Tex.TexNum);
+
+    glBegin(GL_QUADS);
+      glTexCoord2f(Tex.TexX1*Tex.TexW, Tex.TexY1*Tex.TexH);
+      glVertex2f(0, 0);
+
+      glTexCoord2f(Tex.TexX1*Tex.TexW, Tex.TexY2*Tex.TexH);
+      glVertex2f(0, 600);
+
+      glTexCoord2f(Tex.TexX2*Tex.TexW, Tex.TexY2*Tex.TexH);
+      glVertex2f(800, 600);
+
+      glTexCoord2f(Tex.TexX2*Tex.TexW, Tex.TexY1*Tex.TexH);
+      glVertex2f(800, 0);
+    glEnd;
+
+    glDisable(GL_BLEND);
+    glDisable(GL_TEXTURE_2D);
+  end
+  else
+  begin //Clear Screen w/ progress Alpha + Color
+    if (ScreenAct = 1) then //Clear just once when in dual screen mode
+      glClear(GL_DEPTH_BUFFER_BIT);
+      
+    glDisable(GL_TEXTURE_2D);
+    glEnable(GL_BLEND);
+    glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+
+    glColorRGB(Color, Progress);
+
+    glBegin(GL_QUADS);
+      glVertex2f(0, 0);
+      glVertex2f(0, 600);
+      glVertex2f(800, 600);
+      glVertex2f(800, 0);
+    glEnd;
+
+    glDisable(GL_BLEND);
+  end;  
+end;
+
+end.
diff --git a/unicode/src/menu/UMenuBackgroundTexture.pas b/unicode/src/menu/UMenuBackgroundTexture.pas
index 91ea6503..f71637ff 100644
--- a/unicode/src/menu/UMenuBackgroundTexture.pas
+++ b/unicode/src/menu/UMenuBackgroundTexture.pas
@@ -1,126 +1,126 @@
-{* 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 UMenuBackgroundTexture;

-

-interface

-

-{$IFDEF FPC}

-  {$MODE Delphi}

-{$ENDIF}

-

-{$I switches.inc}

-

-uses

-  UThemes,

-  UTexture,

-  UMenuBackground,

-  UPath;

-

-//TMenuBackgroundColor - Background Color

-//--------

-

-type

-  TMenuBackgroundTexture = class (TMenuBackground)

-    private

-      Tex: TTexture;

-      Color: TRGB;

-    public

-      constructor Create(const ThemedSettings: TThemeBackground); override;

-      procedure   Draw; override;

-      destructor  Destroy; override;

-  end;

-

-const

-  SUPPORTED_EXTS_BACKGROUNDTEXTURE: array[0..13] of string = ('.png', '.bmp', '.jpg', '.jpeg', '.gif', '.pnm', '.ppm', '.pgm', '.pbm', '.xpm', '.lbm', '.pcx', '.tga', '.tiff');

-

-implementation

-uses

-  USkins,

-  UCommon,

-  SysUtils,

-  gl,

-  glext,

-  UGraphic;

-

-constructor TMenuBackgroundTexture.Create(const ThemedSettings: TThemeBackground);

-var

-  texFilename: IPath;

-begin

-  inherited;

-

-  if (Length(ThemedSettings.Tex) = 0) then

-    raise EMenuBackgroundError.Create('TMenuBackgroundTexture: No texture filename present');

-

-  Color       := ThemedSettings.Color;

-

-  texFilename := Skin.GetTextureFileName(ThemedSettings.Tex);

-  Tex         := Texture.GetTexture(texFilename, TEXTURE_TYPE_PLAIN);

-

-  if (Tex.TexNum = 0) then

-  begin

-    freeandnil(Tex);

-    raise EMenuBackgroundError.Create('TMenuBackgroundTexture: Can''t load texture');

-  end;

-end;

-

-destructor  TMenuBackgroundTexture.Destroy;

-begin

-  //freeandnil(Tex); <- this causes an Access Violation o0

-  inherited;

-end;

-

-procedure   TMenuBackgroundTexture.Draw;

-begin

-  If (ScreenAct = 1) then //Clear just once when in dual screen mode

-    glClear(GL_DEPTH_BUFFER_BIT);

-    

-  glColorRGB(Color);

-

-  glEnable(GL_TEXTURE_2D);

-  glEnable(GL_BLEND);

-  glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);

-

-  glBindTexture(GL_TEXTURE_2D, Tex.TexNum);

-

-  glBegin(GL_QUADS);

-    glTexCoord2f(Tex.TexX1*Tex.TexW, Tex.TexY1*Tex.TexH);

-    glVertex2f(0, 0);

-

-    glTexCoord2f(Tex.TexX1*Tex.TexW, Tex.TexY2*Tex.TexH);

-    glVertex2f(0, 600);

-

-    glTexCoord2f(Tex.TexX2*Tex.TexW, Tex.TexY2*Tex.TexH);

-    glVertex2f(800, 600);

-

-    glTexCoord2f(Tex.TexX2*Tex.TexW, Tex.TexY1*Tex.TexH);

-    glVertex2f(800, 0);

-  glEnd;

-

-  glDisable(GL_BLEND);

-  glDisable(GL_TEXTURE_2D);

-end;

-

-end.

+{* 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 UMenuBackgroundTexture;
+
+interface
+
+{$IFDEF FPC}
+  {$MODE Delphi}
+{$ENDIF}
+
+{$I switches.inc}
+
+uses
+  UThemes,
+  UTexture,
+  UMenuBackground,
+  UPath;
+
+//TMenuBackgroundColor - Background Color
+//--------
+
+type
+  TMenuBackgroundTexture = class (TMenuBackground)
+    private
+      Tex: TTexture;
+      Color: TRGB;
+    public
+      constructor Create(const ThemedSettings: TThemeBackground); override;
+      procedure   Draw; override;
+      destructor  Destroy; override;
+  end;
+
+const
+  SUPPORTED_EXTS_BACKGROUNDTEXTURE: array[0..13] of string = ('.png', '.bmp', '.jpg', '.jpeg', '.gif', '.pnm', '.ppm', '.pgm', '.pbm', '.xpm', '.lbm', '.pcx', '.tga', '.tiff');
+
+implementation
+uses
+  USkins,
+  UCommon,
+  SysUtils,
+  gl,
+  glext,
+  UGraphic;
+
+constructor TMenuBackgroundTexture.Create(const ThemedSettings: TThemeBackground);
+var
+  texFilename: IPath;
+begin
+  inherited;
+
+  if (Length(ThemedSettings.Tex) = 0) then
+    raise EMenuBackgroundError.Create('TMenuBackgroundTexture: No texture filename present');
+
+  Color       := ThemedSettings.Color;
+
+  texFilename := Skin.GetTextureFileName(ThemedSettings.Tex);
+  Tex         := Texture.GetTexture(texFilename, TEXTURE_TYPE_PLAIN);
+
+  if (Tex.TexNum = 0) then
+  begin
+    freeandnil(Tex);
+    raise EMenuBackgroundError.Create('TMenuBackgroundTexture: Can''t load texture');
+  end;
+end;
+
+destructor  TMenuBackgroundTexture.Destroy;
+begin
+  //freeandnil(Tex); <- this causes an Access Violation o0
+  inherited;
+end;
+
+procedure   TMenuBackgroundTexture.Draw;
+begin
+  If (ScreenAct = 1) then //Clear just once when in dual screen mode
+    glClear(GL_DEPTH_BUFFER_BIT);
+    
+  glColorRGB(Color);
+
+  glEnable(GL_TEXTURE_2D);
+  glEnable(GL_BLEND);
+  glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+
+  glBindTexture(GL_TEXTURE_2D, Tex.TexNum);
+
+  glBegin(GL_QUADS);
+    glTexCoord2f(Tex.TexX1*Tex.TexW, Tex.TexY1*Tex.TexH);
+    glVertex2f(0, 0);
+
+    glTexCoord2f(Tex.TexX1*Tex.TexW, Tex.TexY2*Tex.TexH);
+    glVertex2f(0, 600);
+
+    glTexCoord2f(Tex.TexX2*Tex.TexW, Tex.TexY2*Tex.TexH);
+    glVertex2f(800, 600);
+
+    glTexCoord2f(Tex.TexX2*Tex.TexW, Tex.TexY1*Tex.TexH);
+    glVertex2f(800, 0);
+  glEnd;
+
+  glDisable(GL_BLEND);
+  glDisable(GL_TEXTURE_2D);
+end;
+
+end.
diff --git a/unicode/src/menu/UMenuBackgroundVideo.pas b/unicode/src/menu/UMenuBackgroundVideo.pas
index 0e0a2bff..ca32fded 100644
--- a/unicode/src/menu/UMenuBackgroundVideo.pas
+++ b/unicode/src/menu/UMenuBackgroundVideo.pas
@@ -1,203 +1,203 @@
-{* 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 UMenuBackgroundVideo;

-

-interface

-

-{$IFDEF FPC}

-  {$MODE Delphi}

-{$ENDIF}

-

-{$I switches.inc}

-

-uses

-  UThemes,

-  UMenuBackground,

-  UVideo,

-  UPath;

-

-//TMenuBackgroundColor - Background Color

-//--------

-

-type

-  //DefaultBGVideoPlayback = TVideoPlayback_FFmpeg;

-

-{type

-  TBGVideoPool = class;

-

-  PBGVideoPoolItem = ^TBGVideoPoolItem;

-  TBGVideoPoolItem = record

-    Parent: TBGVideoPool;

-    VideoPlayback = IVideoPlayback;

-    ReferenceCounter: cardinal; //Number of Creations

-  end;

-

-  TBGVideo = class

-    private

-      myItem: PBGVideoPoolItem;

-    public

-      constructor Create(Item: PBGVideoPoolItem); override;

-

-      function    GetVideoPlayback: IVideoPlayback;

-      procedure   Draw;

-

-      destructor  Destroy;

-  end;

-

-  TBGVideoPool = class

-    private

-      Items: PBGVideoPoolItem;

-    public

-      constructor Create;

-

-      function    GetBGVideo(filename: string): TBGVideo;

-      procedure   RemoveItem(

-      procedure   FreeAllItems;

-

-      destructor  Destroy;

-  end;

-

-type }

-  TMenuBackgroundVideo = class (TMenuBackground)

-    private

-      fFilename: IPath;

-    public

-      constructor Create(const ThemedSettings: TThemeBackground); override;

-      procedure   OnShow; override;

-      procedure   Draw; override;

-      procedure   OnFinish; override;

-      destructor  Destroy; override;

-  end;

-

-{var

-  BGVideoPool: TBGVideoPool;  }

-const

-  SUPPORTED_EXTS_BACKGROUNDVIDEO: array[0..6] of string = ('.avi', '.mov', '.divx', '.mpg', '.mp4', '.mpeg', '.m2v');

-

-implementation

-

-uses

-  gl,

-  glext,

-  UMusic,

-  SysUtils,

-  UTime,

-  USkins,

-  UCommon,

-  UGraphic;

-

-constructor TMenuBackgroundVideo.Create(const ThemedSettings: TThemeBackground);

-begin

-  inherited;

-  if (Length(ThemedSettings.Tex) = 0) then

-    raise EMenuBackgroundError.Create('TMenuBackgroundVideo: No video filename present');

-

-  fFileName := Skin.GetTextureFileName(ThemedSettings.Tex);

-  if fFilename.IsFile and VideoPlayback.Open(fFileName) then

-  begin

-    VideoBGTimer.SetTime(0);

-    VideoPlayback.Play;

-  end

-  else

-    raise EMenuBackgroundError.Create('TMenuBackgroundVideo: Can''t load background video: ' + fFilename.ToNative);

-end;

-

-destructor  TMenuBackgroundVideo.Destroy;

-begin

-

-end;

-

-procedure   TMenuBackgroundVideo.OnShow;

-begin

-  if VideoPlayback.Open( fFileName ) then

-  begin

-    VideoBGTimer.SetTime(0);

-    VideoPlayback.Play;

-  end;

-end;

-

-procedure   TMenuBackgroundVideo.OnFinish;

-begin

-

-end;

-

-procedure   TMenuBackgroundVideo.Draw;

-begin

-  If (ScreenAct = 1) then //Clear just once when in dual screen mode

-    glClear(GL_DEPTH_BUFFER_BIT);

-

-  VideoPlayback.GetFrame(VideoBGTimer.GetTime());

-    // FIXME: why do we draw on screen 2? Seems to be wrong.

-  VideoPlayback.DrawGL(2);

-end;

-

-// Implementation of TBGVideo

-//--------

-{constructor TBGVideo.Create(Item: PBGVideoPoolItem);

-begin

-  myItem := PBGVideoPoolItem;

-  Inc(myItem.ReferenceCounter);

-end;

-

-destructor  TBGVideo.Destroy;

-begin

-  Dec(myItem.ReferenceCounter);

-end;

-

-function    TBGVideo.GetVideoPlayback: IVideoPlayback;

-begin

-

-end;

-

-procedure   TBGVideo.Draw;

-begin

-

-end;

-

-// Implementation of TBGVideoPool

-//--------

-

-constructor TBGVideoPool.Create;

-begin

-

-end;

-

-destructor  TBGVideoPool.Destroy;

-begin

-

-end;

-

-function    TBGVideoPool.GetBGVideo(filename: string): TBGVideo;

-begin

-

-end;

-

-procedure   TBGVideoPool.FreeAllItems;

-begin

-

-end;  }

-

-end.

+{* 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 UMenuBackgroundVideo;
+
+interface
+
+{$IFDEF FPC}
+  {$MODE Delphi}
+{$ENDIF}
+
+{$I switches.inc}
+
+uses
+  UThemes,
+  UMenuBackground,
+  UVideo,
+  UPath;
+
+//TMenuBackgroundColor - Background Color
+//--------
+
+type
+  //DefaultBGVideoPlayback = TVideoPlayback_FFmpeg;
+
+{type
+  TBGVideoPool = class;
+
+  PBGVideoPoolItem = ^TBGVideoPoolItem;
+  TBGVideoPoolItem = record
+    Parent: TBGVideoPool;
+    VideoPlayback = IVideoPlayback;
+    ReferenceCounter: cardinal; //Number of Creations
+  end;
+
+  TBGVideo = class
+    private
+      myItem: PBGVideoPoolItem;
+    public
+      constructor Create(Item: PBGVideoPoolItem); override;
+
+      function    GetVideoPlayback: IVideoPlayback;
+      procedure   Draw;
+
+      destructor  Destroy;
+  end;
+
+  TBGVideoPool = class
+    private
+      Items: PBGVideoPoolItem;
+    public
+      constructor Create;
+
+      function    GetBGVideo(filename: string): TBGVideo;
+      procedure   RemoveItem(
+      procedure   FreeAllItems;
+
+      destructor  Destroy;
+  end;
+
+type }
+  TMenuBackgroundVideo = class (TMenuBackground)
+    private
+      fFilename: IPath;
+    public
+      constructor Create(const ThemedSettings: TThemeBackground); override;
+      procedure   OnShow; override;
+      procedure   Draw; override;
+      procedure   OnFinish; override;
+      destructor  Destroy; override;
+  end;
+
+{var
+  BGVideoPool: TBGVideoPool;  }
+const
+  SUPPORTED_EXTS_BACKGROUNDVIDEO: array[0..6] of string = ('.avi', '.mov', '.divx', '.mpg', '.mp4', '.mpeg', '.m2v');
+
+implementation
+
+uses
+  gl,
+  glext,
+  UMusic,
+  SysUtils,
+  UTime,
+  USkins,
+  UCommon,
+  UGraphic;
+
+constructor TMenuBackgroundVideo.Create(const ThemedSettings: TThemeBackground);
+begin
+  inherited;
+  if (Length(ThemedSettings.Tex) = 0) then
+    raise EMenuBackgroundError.Create('TMenuBackgroundVideo: No video filename present');
+
+  fFileName := Skin.GetTextureFileName(ThemedSettings.Tex);
+  if fFilename.IsFile and VideoPlayback.Open(fFileName) then
+  begin
+    VideoBGTimer.SetTime(0);
+    VideoPlayback.Play;
+  end
+  else
+    raise EMenuBackgroundError.Create('TMenuBackgroundVideo: Can''t load background video: ' + fFilename.ToNative);
+end;
+
+destructor  TMenuBackgroundVideo.Destroy;
+begin
+
+end;
+
+procedure   TMenuBackgroundVideo.OnShow;
+begin
+  if VideoPlayback.Open( fFileName ) then
+  begin
+    VideoBGTimer.SetTime(0);
+    VideoPlayback.Play;
+  end;
+end;
+
+procedure   TMenuBackgroundVideo.OnFinish;
+begin
+
+end;
+
+procedure   TMenuBackgroundVideo.Draw;
+begin
+  If (ScreenAct = 1) then //Clear just once when in dual screen mode
+    glClear(GL_DEPTH_BUFFER_BIT);
+
+  VideoPlayback.GetFrame(VideoBGTimer.GetTime());
+    // FIXME: why do we draw on screen 2? Seems to be wrong.
+  VideoPlayback.DrawGL(2);
+end;
+
+// Implementation of TBGVideo
+//--------
+{constructor TBGVideo.Create(Item: PBGVideoPoolItem);
+begin
+  myItem := PBGVideoPoolItem;
+  Inc(myItem.ReferenceCounter);
+end;
+
+destructor  TBGVideo.Destroy;
+begin
+  Dec(myItem.ReferenceCounter);
+end;
+
+function    TBGVideo.GetVideoPlayback: IVideoPlayback;
+begin
+
+end;
+
+procedure   TBGVideo.Draw;
+begin
+
+end;
+
+// Implementation of TBGVideoPool
+//--------
+
+constructor TBGVideoPool.Create;
+begin
+
+end;
+
+destructor  TBGVideoPool.Destroy;
+begin
+
+end;
+
+function    TBGVideoPool.GetBGVideo(filename: string): TBGVideo;
+begin
+
+end;
+
+procedure   TBGVideoPool.FreeAllItems;
+begin
+
+end;  }
+
+end.