Projects/Vocaluxe
2
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

do not play intro videos if background videos are off

Browse Source
This commit is contained in:
Alexander Eckart committed 2012-02-29 18:00:22 +01:00
1 parent 91ee1e3083
commit 5bf8bebb9d
2 files changed
+22 -10
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Output/Themes/Ambient/Screens/ScreenLoad.xml
+1 -1
View File
@@ -4,7 +4,7 @@
<ScreenVersion>1</ScreenVersion> <ScreenVersion>1</ScreenVersion>
<Background1> <Background1>
<!--<Type>: Background type: None, Color, Texture, Video--> <!--<Type>: Background type: None, Color, Texture, Video-->
<Type>None</Type> <Type>Texture</Type>
<!--<Video>: Background video name--> <!--<Video>: Background video name-->
<Video>BG_Video</Video> <Video>BG_Video</Video>
<!--<Skin>: Background Texture name--> <!--<Skin>: Background Texture name-->
Vocaluxe/Screens/CScreenLoad.cs
+21 -9
View File
@@ -113,20 +113,25 @@ namespace Vocaluxe.Screens
_CurrentIntroVideoNr = -1; _CurrentIntroVideoNr = -1;
_IntroOutPlayed = false; _IntroOutPlayed = false;
for (int i = 0; i < _Intros.Length; i++) if (CConfig.VideoBackgrounds == EOffOn.TR_CONFIG_ON)
{ {
_Intros[i].Load(IntroVideo[i]); for (int i = 0; i < _Intros.Length; i++)
{
_Intros[i].Load(IntroVideo[i]);
}
} }
} }
public override void OnShowFinish() public override void OnShowFinish()
{ {
base.OnShowFinish(); base.OnShowFinish();
for (int i = 0; i < _Intros.Length; i++) if (CConfig.VideoBackgrounds == EOffOn.TR_CONFIG_ON)
{ {
_Intros[i].PreLoad(); for (int i = 0; i < _Intros.Length; i++)
{
_Intros[i].PreLoad();
}
} }
CLog.StartBenchmark(3, "Load Cover"); CLog.StartBenchmark(3, "Load Cover");
@@ -154,7 +159,7 @@ namespace Vocaluxe.Screens
bool next = ((CConfig.CoverLoading == ECoverLoading.TR_CONFIG_COVERLOADING_ATSTART && CSongs.CoverLoaded) || bool next = ((CConfig.CoverLoading == ECoverLoading.TR_CONFIG_COVERLOADING_ATSTART && CSongs.CoverLoaded) ||
CConfig.CoverLoading != ECoverLoading.TR_CONFIG_COVERLOADING_ATSTART); CConfig.CoverLoading != ECoverLoading.TR_CONFIG_COVERLOADING_ATSTART);
if ((_IntroOutPlayed || _SkipIntro) && next && CSettings.GameState != EGameState.EditTheme) if ((_IntroOutPlayed || _SkipIntro) && next && CSettings.GameState != EGameState.EditTheme && CSongs.SongsLoaded)
{ {
CSettings.GameState = EGameState.Normal; CSettings.GameState = EGameState.Normal;
} }
@@ -198,9 +203,10 @@ namespace Vocaluxe.Screens
_timer.Stop(); _timer.Stop();
_timer.Reset(); _timer.Reset();
_Intros[0].Close(); for (int i = 0; i < _Intros.Length; i++)
_Intros[1].Close(); {
_Intros[2].Close(); _Intros[i].Close();
}
CLog.StopBenchmark(3, "Load Cover"); CLog.StopBenchmark(3, "Load Cover");
} }
@@ -210,6 +216,12 @@ namespace Vocaluxe.Screens
if (_IntroOutPlayed) if (_IntroOutPlayed)
return; return;
if (CConfig.VideoBackgrounds == EOffOn.TR_CONFIG_OFF)
{
_IntroOutPlayed = true;
return;
}
if (_CurrentIntroVideoNr < 0) if (_CurrentIntroVideoNr < 0)
{ {
_CurrentIntroVideoNr = 0; _CurrentIntroVideoNr = 0;