From 4f10526633c463675defb42b4d8e27e21105ec21 Mon Sep 17 00:00:00 2001
From: brunzelchen <brunzelchen@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Wed, 10 Nov 2010 17:23:37 +0000
Subject: - added polish language (thx to Pit33) - added polish fonts - added
 lipsync option - fixed drawing webcam on 2 screens - added copy&paste for
 duets in editor - some bugfixes in editor - change language without restart

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/1.0.1 Challenge MOD@2730 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 Game/Code/Screens/UScreenSing.pas | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'Game/Code/Screens/UScreenSing.pas')

diff --git a/Game/Code/Screens/UScreenSing.pas b/Game/Code/Screens/UScreenSing.pas
index 6e3da366..f9d59552 100644
--- a/Game/Code/Screens/UScreenSing.pas
+++ b/Game/Code/Screens/UScreenSing.pas
@@ -327,7 +327,7 @@ begin
   else            //Pause ausschalten
   begin
     Czas.Teraz := PauseTime; //Position of Notes
-    Music.MoveTo (PauseTime);//Position of Music
+    Music.MoveTo (PauseTime + Ini.LipSync*0.01);//Position of Music
     Music.Play; //Play Music
     if (AktSong.Video <> '') and FileExists(AktSong.Path + AktSong.Video) then //Video
       acTogglePause;
@@ -1643,7 +1643,7 @@ begin
     SetFontPos (400 - glTextWidth ('Activating Webcam ...')/2, 250); //Position
     glColor4f(1,1,1,1);
     glPrint('Activating Webcam ...');
-    SwapBuffers;
+    SwapBuffers;    
     wStartWebCam();
   end;
 
@@ -1978,7 +1978,7 @@ begin
   if ShowFinish and AktSong.VideoLoaded then
   begin
     try
-      acGetFrame(Music.Position);
+      acGetFrame(Music.Position + Ini.LipSync*0.01);
       acDrawGL(ScreenAct, not WebCam); // this only draws
     except
       //If an Error occurs drawing: prevent Video from being Drawn again and Close Video
@@ -1993,7 +1993,7 @@ begin
     end;
   end;
 
-  wDraw(WebCam);
+  wDraw(WebCam, ScreenAct);
   // draw static menu (FG)
   DrawFG;
 
@@ -2006,7 +2006,7 @@ begin
   if ShowFinish then
   begin
     if (not Music.Finished) and (not medley_end or (ScreenSong.Mode <> smMedley))
-      and ((AktSong.Finish = 0) or (CurTime*1000 <= AktSong.Finish)) then
+      and ((AktSong.Finish = 0) or (Music.Position + Ini.LipSync*0.01 <= AktSong.Finish)) then
     begin
       //Pause Mod:
       if not Paused then
@@ -2170,8 +2170,8 @@ begin
 
     SetFontPos (5, 184);
     glPrint(PChar('lt: ' + FormatFloat('#0.00', Czas.Teraz) +
-      ' mt: ' + FormatFloat('#0.00', Music.Position) +
-      ' dt: ' + FormatFloat('#0.000', Czas.Teraz-Music.Position)));
+      ' mt: ' + FormatFloat('#0.00', Music.Position + Ini.LipSync*0.01) +
+      ' dt: ' + FormatFloat('#0.000', Czas.Teraz-(Music.Position+Ini.LipSync*0.01))));
   end;
   PerfLog.AddComment('ScreenSing: End Draw');
 end;
-- 
cgit v1.2.3