aboutsummaryrefslogtreecommitdiffstats
path: root/Game/Code/Screens
diff options
context:
space:
mode:
authormogguh <mogguh@b956fd51-792f-4845-bead-9b4dfca2ff2c>2008-08-20 03:29:48 +0000
committermogguh <mogguh@b956fd51-792f-4845-bead-9b4dfca2ff2c>2008-08-20 03:29:48 +0000
commitcbe91d537cbe8986c52d5689b618d307802d0ca3 (patch)
tree633731b24a6f2a2a93167b3c92b632c0e5c51c45 /Game/Code/Screens
parented6ba689766e896c792a6e8bea55660ade1bfeca (diff)
downloadusdx-cbe91d537cbe8986c52d5689b618d307802d0ca3.tar.gz
usdx-cbe91d537cbe8986c52d5689b618d307802d0ca3.tar.xz
usdx-cbe91d537cbe8986c52d5689b618d307802d0ca3.zip
preparing the commit if projectM option integration
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1277 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to '')
-rw-r--r--Game/Code/Screens/UScreenSing.pas14
1 files changed, 13 insertions, 1 deletions
diff --git a/Game/Code/Screens/UScreenSing.pas b/Game/Code/Screens/UScreenSing.pas
index f6c7adb5..8edd2be4 100644
--- a/Game/Code/Screens/UScreenSing.pas
+++ b/Game/Code/Screens/UScreenSing.pas
@@ -428,6 +428,7 @@ begin
CurrentSong.VideoLoaded := False;
fShowVisualization := False;
if (CurrentSong.Video <> '') and FileExists(CurrentSong.Path + CurrentSong.Video) then
+ //and not (TVisualizerOption(Ini.VisualizerOption) in [voOn, voWhenNoVideo]) then
begin
if (fCurrentVideoPlaybackEngine.Open(CurrentSong.Path + CurrentSong.Video)) then
begin
@@ -438,6 +439,7 @@ begin
// set background
if (CurrentSong.Background <> '') and (CurrentSong.VideoLoaded = False) then
+ //and (TVisualizerOption(Ini.VisualizerOption) = voOff) then
try
Tex_Background := Texture.LoadTexture(CurrentSong.Path + CurrentSong.Background);
except
@@ -447,7 +449,17 @@ begin
end
else
Tex_Background.TexNum := 0;
-
+ {**
+ * set visualization
+ *}
+ {*
+ if (TVisualizerOption(Ini.VisualizerOption) in [voOn, voWhenNoVideo]) then
+ begin
+ fShowVisualization := True;
+ fCurrentVideoPlaybackEngine := Visualization;
+ fCurrentVideoPlaybackEngine.play;
+ end;
+ *}
// prepare lyrics timer
LyricsState.Reset();
LyricsState.SetCurrentTime(CurrentSong.Start);