- added "VideoPreview" option (on/off)

- removed some test comments

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

2 files changed, 3 insertions, 11 deletions

diff --git a/VideoPreview/src/screens/UScreenSing.pas b/VideoPreview/src/screens/UScreenSing.pas
index 835cb2df..dc43881a 100644
--- a/VideoPreview/src/screens/UScreenSing.pas
+++ b/VideoPreview/src/screens/UScreenSing.pas
@@ -847,19 +847,8 @@ begin
       fCurrentVideo.GetFrame(VideoFrameTime);
     end;
 
-    //***** for testing:
-    {fCurrentVideo.SetScreenPosition(10, 10, 1);
-    fCurrentVideo.Width := 200;
-    fCurrentVideo.Height := 200;
-    fCurrentVideo.ReflectionSpacing := 10;
-    fCurrentVideo.Alpha := 1;
-    fCurrentVideo.AspectCorrection := acoLetterBox;}
-    //***** end testing
-
     fCurrentVideo.SetScreen(ScreenAct);
     fCurrentVideo.Draw;
-    
-    //fCurrentVideo.DrawReflection; //just for testing, should be deleted!
   end;
 
   // draw static menu (FG)
diff --git a/VideoPreview/src/screens/UScreenSong.pas b/VideoPreview/src/screens/UScreenSong.pas
index d7f309c7..1171eaa9 100644
--- a/VideoPreview/src/screens/UScreenSong.pas
+++ b/VideoPreview/src/screens/UScreenSong.pas
@@ -1837,6 +1837,9 @@ var
   Song:       TSong;
 
 begin
+  if (Ini.VideoPreview=0)  then
+    Exit;
+
   if Assigned(fCurrentVideo) then
   begin
     fCurrentVideo.Stop();