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

Merge pull request #392 from Vocaluxe/PreviewDisableFix

Browse Source 
Fix: Config.Video.VideoPreview is ignored (fixes #391)
This commit is contained in:
Stefan authored and GitHub committed 2020-01-15 23:34:24 +01:00
2 parents b604471e7a 95962e98fd
commit 21ea7df5d6
3 files changed
+7 -2
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

VocaluxeLib/Menu/SongMenu/CSongMenuList.cs
+3 -1
View File
@@ -511,7 +511,9 @@ namespace VocaluxeLib.Menu.SongMenu
} }
_TextBG.Draw(); _TextBG.Draw();
CTextureRef vidtex = CBase.BackgroundMusic.IsPlayingPreview() ? CBase.BackgroundMusic.GetVideoTexture() : null; CTextureRef vidtex = null;
if (CBase.Config.GetVideoPreview() == EOffOn.TR_CONFIG_ON)
vidtex = (CBase.BackgroundMusic.IsPlayingPreview() ? CBase.BackgroundMusic.GetVideoTexture() : null);
if (vidtex != null) if (vidtex != null)
{ {
VocaluxeLib/Menu/SongMenu/CSongMenuTileBoard.cs
+3 -1
View File
@@ -485,7 +485,9 @@ namespace VocaluxeLib.Menu.SongMenu
_TextBG.Draw(); _TextBG.Draw();
CTextureRef vidtex = CBase.BackgroundMusic.IsPlayingPreview() ? CBase.BackgroundMusic.GetVideoTexture() : null; CTextureRef vidtex = null;
if (CBase.Config.GetVideoPreview() == EOffOn.TR_CONFIG_ON)
vidtex = (CBase.BackgroundMusic.IsPlayingPreview() ? CBase.BackgroundMusic.GetVideoTexture() : null);
if (vidtex != null) if (vidtex != null)
{ {
VocaluxeLib/Utils/Player/CSongPlayer.cs
+1
View File
@@ -110,6 +110,7 @@ namespace VocaluxeLib.Utils.Player
if (_Video != null || !SongHasVideo) if (_Video != null || !SongHasVideo)
return; return;
string videoFilePath = Path.Combine(_Song.Folder, _Song.VideoFileName); string videoFilePath = Path.Combine(_Song.Folder, _Song.VideoFileName);
_Video = CBase.Video.Load(videoFilePath); _Video = CBase.Video.Load(videoFilePath);
if (_Video == null) if (_Video == null)