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

Do not show backgroundvideo if Next() is called

Browse Source
This commit is contained in:
Stephan Sundermann committed 2012-03-06 17:31:49 +01:00
1 parent edf0249951
commit 38e253821d
2 files changed
+3 -4
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Vocaluxe/Menu/CBackground.cs
+2 -3
View File
@@ -137,11 +137,10 @@ namespace Vocaluxe.Menu
public bool Draw() public bool Draw()
{ {
bool ok = false; bool ok = false;
if (_Theme.Type == EBackgroundTypes.Video && CConfig.VideoBackgrounds == EOffOn.TR_CONFIG_ON)
ok = DrawVideo();
if (_Theme.Type == EBackgroundTypes.Video && CConfig.VideoBackgrounds == EOffOn.TR_CONFIG_ON && CBackgroundMusic.VideoToBackgroundIsEnabled() && CBackgroundMusic.IsPlaying() && CBackgroundMusic.HasVideo()) if (_Theme.Type == EBackgroundTypes.Video && CConfig.VideoBackgrounds == EOffOn.TR_CONFIG_ON && CBackgroundMusic.VideoToBackgroundIsEnabled() && CBackgroundMusic.IsPlaying() && CBackgroundMusic.HasVideo())
ok = DrawBackgroundMusicVideo(); ok = DrawBackgroundMusicVideo();
else if (_Theme.Type == EBackgroundTypes.Video && CConfig.VideoBackgrounds == EOffOn.TR_CONFIG_ON)
ok = DrawVideo();
if (_Theme.TextureName != String.Empty && if (_Theme.TextureName != String.Empty &&
(_Theme.Type == EBackgroundTypes.Texture || (_Theme.Type == EBackgroundTypes.Texture ||
Vocaluxe/Screens/CPopupScreenPlayerControl.cs
+1 -1
View File
@@ -155,7 +155,7 @@ namespace Vocaluxe.Screens
if (CBackgroundMusic.IsVideoEnabled() && CBackgroundMusic.HasVideo()) if (CBackgroundMusic.IsVideoEnabled() && CBackgroundMusic.HasVideo())
{ {
Statics[htStatics(StaticCover)].Texture = CBackgroundMusic.GetCover(); Statics[htStatics(StaticCover)].Texture = CBackgroundMusic.GetCover();
Statics[htStatics(StaticCover)].Visible = true; Statics[htStatics(StaticCover)].Visible = false;
CDraw.DrawTexture(Statics[htStatics(StaticCover)], CBackgroundMusic.GetVideoTexture(), EAspect.Crop); CDraw.DrawTexture(Statics[htStatics(StaticCover)], CBackgroundMusic.GetVideoTexture(), EAspect.Crop);
} }
else else