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

Added a 3 second fade at the start of the video. Some cleanup

Browse Source
This commit is contained in:
Stephan Sundermann committed 2012-03-05 22:28:38 +01:00
1 parent 973f4a181d
commit d348313b16
2 files changed
+24 -7
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Vocaluxe/Base/CBackgroundMusic.cs
+17 -4
View File
@@ -31,6 +31,7 @@ namespace Vocaluxe.Base
private static int _Video = -1;
private static STexture _CurrentVideoTexture = new STexture(-1);
private static Stopwatch _FadeTimer = new Stopwatch();
public static void Init()
{
@@ -76,9 +77,12 @@ namespace Vocaluxe.Base
public static void Stop()
{
if (_VideoEnabled && _Video != 0)
if (_VideoEnabled && _Video != -1)
{
CVideo.VdClose(_Video);
_Video = -1;
CDraw.RemoveTexture(ref _CurrentVideoTexture);
_Video = -1;
}
CSound.FadeAndStop(_CurrentMusicStream, 0f, CSettings.BackgroundMusicFadeTime);
_CurrentPlaylistElement = new PlaylistElement();
@@ -127,7 +131,6 @@ namespace Vocaluxe.Base
_CurrentPlaylistElement = _PreviousFileNames[_PreviousMusicIndex];
}
_CurrentMusicStream = CSound.Load(_CurrentPlaylistElement.GetMusicFilePath());
CSound.SetStreamVolume(_CurrentMusicStream, 0f);
Play();
@@ -317,6 +320,15 @@ namespace Vocaluxe.Base
{
float vtime = 0f;
CVideo.VdGetFrame(_Video, ref _CurrentVideoTexture, CSound.GetPosition(_CurrentMusicStream), ref vtime);
if (_FadeTimer.ElapsedMilliseconds <= 3000L)
{
_CurrentVideoTexture.color.A = (_FadeTimer.ElapsedMilliseconds / 3000f);
}
else
{
_CurrentVideoTexture.color.A = 1f;
_FadeTimer.Stop();
}
CDraw.DrawTexture(bounds, _CurrentVideoTexture, EAspect.Crop);
return true;
}
@@ -357,10 +369,11 @@ namespace Vocaluxe.Base
{
if (_Video == -1)
{
CVideo.VdClose(_Video);
_Video = CVideo.VdLoad(_CurrentPlaylistElement.GetVideoFilePath());
CVideo.VdSkip(_Video, CSound.GetPosition(_CurrentMusicStream), _CurrentPlaylistElement.GetVideoGap());
_VideoEnabled = true;
_FadeTimer.Reset();
_FadeTimer.Start();
}
}
}
Vocaluxe/Screens/CPopupScreenPlayerControl.cs
+7 -3
View File
@@ -133,9 +133,6 @@ namespace Vocaluxe.Screens
public override bool UpdateGame()
{
Buttons[htButtons(ButtonPause)].Visible = CBackgroundMusic.IsPlaying();
Buttons[htButtons(ButtonPlay)].Visible = !CBackgroundMusic.IsPlaying();
Texts[htTexts(TextCurrentSong)].Text = CBackgroundMusic.GetSongArtistAndTitle();
return true;
}
@@ -151,6 +148,7 @@ namespace Vocaluxe.Screens
return false;
if (CBackgroundMusic.IsVideoEnabled() && CBackgroundMusic.HasVideo())
{
Statics[htStatics(StaticCover)].Texture = CBackgroundMusic.GetCover();
CBackgroundMusic.UploadNewFrame(Statics[htStatics(StaticCover)]);
Statics[htStatics(StaticCover)].Visible = false;
}
@@ -159,6 +157,12 @@ namespace Vocaluxe.Screens
Statics[htStatics(StaticCover)].Visible = true;
Statics[htStatics(StaticCover)].Texture = CBackgroundMusic.GetCover();
}
Buttons[htButtons(ButtonPause)].Visible = CBackgroundMusic.IsPlaying();
Buttons[htButtons(ButtonPlay)].Visible = !CBackgroundMusic.IsPlaying();
Texts[htTexts(TextCurrentSong)].Text = CBackgroundMusic.GetSongArtistAndTitle();
if (CBackgroundMusic.IsVideoEnabled())
Buttons[htButtons(ButtonShowVideo)].SColor = CTheme.GetColor("ButtonSColor");
return base.Draw();
}