From 94cefdb78044e0f9996e3032de34b690de98b708 Mon Sep 17 00:00:00 2001
From: tobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Thu, 23 Jul 2009 12:34:07 +0000
Subject: - revert to 1777 - Ocean.ini and SVN properties are not reverted

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/experimental@1854 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 unicode/src/screens/UScreenSing.pas | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

(limited to 'unicode/src/screens/UScreenSing.pas')

diff --git a/unicode/src/screens/UScreenSing.pas b/unicode/src/screens/UScreenSing.pas
index 86a811f4..05683c83 100644
--- a/unicode/src/screens/UScreenSing.pas
+++ b/unicode/src/screens/UScreenSing.pas
@@ -58,8 +58,9 @@ type
 
 type
   TScreenSing = class(TMenu)
-  protected
+  private
     VideoLoaded: boolean;
+  protected
     Paused:     boolean; // pause mod
     LyricsSync: TLyricsSyncSource;
     NumEmptySentences: integer;
@@ -127,13 +128,12 @@ uses
   UNote,
   URecord,
   USong,
-  UDisplay,
   UUnicodeUtils;
 
 // method for input parsing. if false is returned, getnextwindow
 // should be checked to know the next window to load;
 
-function TScreenSing.ParseInput(PressedKey: cardinal; CharCode: UCS4Char;
+function TScreenSing.ParseInput(PressedKey: Cardinal; CharCode: UCS4Char;
   PressedDown: boolean): boolean;
 begin
   Result := true;
@@ -255,9 +255,6 @@ constructor TScreenSing.Create;
 begin
   inherited Create;
 
-  //too dangerous, a mouse button is quickly pressed by accident
-  RightMbESC := false;
-
   fShowVisualization := false;
 
   fCurrentVideoPlaybackEngine := VideoPlayback;
@@ -302,8 +299,8 @@ begin
   Static[StaticPausePopup].Visible := false;
 
   Lyrics := TLyricEngine.Create(
-      Theme.LyricBar.UpperX, Theme.LyricBar.UpperY, Theme.LyricBar.UpperW, Theme.LyricBar.UpperH,
-      Theme.LyricBar.LowerX, Theme.LyricBar.LowerY, Theme.LyricBar.LowerW, Theme.LyricBar.LowerH);
+      Skin_LyricsUpperX, Skin_LyricsUpperY, Skin_LyricsUpperW, Skin_LyricsUpperH,
+      Skin_LyricsLowerX, Skin_LyricsLowerY, Skin_LyricsLowerW, Skin_LyricsLowerH);
 
   LyricsSync := TLyricsSyncSource.Create();
 end;
@@ -628,9 +625,6 @@ end;
 
 procedure TScreenSing.onShowFinish;
 begin
-  // hide cursor on singscreen show    
-  Display.SetCursor;
-  
   // start lyrics
   LyricsState.Resume();
 
@@ -651,7 +645,6 @@ begin
   end;
 
   Background.OnFinish;
-  Display.SetCursor;
 end;
 
 function TScreenSing.Draw: boolean;
@@ -752,9 +745,10 @@ begin
     begin
       // Just call this once
       // when Screens = 2
-      if (ScreenAct = 1) then
+      If (ScreenAct = 1) then
         fCurrentVideoPlaybackEngine.GetFrame(CurrentSong.VideoGAP + LyricsState.GetCurrentTime());
 
+
       fCurrentVideoPlaybackEngine.DrawGL(ScreenAct);
     end;
   end;
-- 
cgit v1.2.3