diff options
| author | brunzelchen <brunzelchen@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2010-06-10 18:27:53 +0000 |
|---|---|---|
| committer | brunzelchen <brunzelchen@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2010-06-10 18:27:53 +0000 |
| commit | f261cd24db299daee8a0d8e470ff7d173f1a1c75 (patch) | |
| tree | ec004d8d028dbef3f4f424513ee9b3334fae04b5 /src/screens/UScreenSing.pas | |
| parent | f385e4be2dddc918ef87bc1be9e32784b78dc3bd (diff) | |
| download | usdx-f261cd24db299daee8a0d8e470ff7d173f1a1c75.tar.gz usdx-f261cd24db299daee8a0d8e470ff7d173f1a1c75.tar.xz usdx-f261cd24db299daee8a0d8e470ff7d173f1a1c75.zip | |
merge of VideoPreview branch into trunk
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2475 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to 'src/screens/UScreenSing.pas')
| -rw-r--r-- | src/screens/UScreenSing.pas | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/screens/UScreenSing.pas b/src/screens/UScreenSing.pas index fe8ea8e8..3e0d8078 100644 --- a/src/screens/UScreenSing.pas +++ b/src/screens/UScreenSing.pas @@ -522,7 +522,7 @@ begin *} fShowVisualization := false; VideoFile := CurrentSong.Path.Append(CurrentSong.Video); - if (CurrentSong.Video.IsSet) and VideoFile.IsFile then + if (Ini.VideoEnabled = 1) and CurrentSong.Video.IsSet() and VideoFile.IsFile then begin fVideoClip := VideoPlayback.Open(VideoFile); fCurrentVideo := fVideoClip; @@ -859,7 +859,8 @@ begin fCurrentVideo.GetFrame(VideoFrameTime); end; - fCurrentVideo.DrawGL(ScreenAct); + fCurrentVideo.SetScreen(ScreenAct); + fCurrentVideo.Draw; end; // draw static menu (FG) |