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

Merge branch 'develop' of https://github.com/Vocaluxe/Vocaluxe

Browse Source
This commit is contained in:
Stephan Sundermann committed 2012-02-20 20:38:29 +01:00
2 parents 769c3f16e6 7d2ab03106
commit 4b36ceb779
7 files changed
+29 -23
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Output/Themes/Ambient/Skin Blue.xml
+4 -4
View File
@@ -218,9 +218,9 @@
<Invisible>Invisible.png</Invisible> <Invisible>Invisible.png</Invisible>
</Skins> </Skins>
<Videos> <Videos>
<BG_Video>[Blue]BG_Video.mkv</BG_Video> <BG_Video>[Blue]BG_Video.mp4</BG_Video>
<IntroIn>[Blue]IntroIn.mkv</IntroIn> <IntroIn>[Blue]IntroIn.mp4</IntroIn>
<IntroMid>[Blue]IntroMid.mkv</IntroMid> <IntroMid>[Blue]IntroMid.mp4</IntroMid>
<IntroOut>[Blue]IntroOut.mkv</IntroOut> <IntroOut>[Blue]IntroOut.mp4</IntroOut>
</Videos> </Videos>
</root> </root>
Output/Themes/Ambient/Skin Green.xml
+4 -4
View File
@@ -218,9 +218,9 @@
<Invisible>Invisible.png</Invisible> <Invisible>Invisible.png</Invisible>
</Skins> </Skins>
<Videos> <Videos>
<BG_Video>[Green]BG_Video.mkv</BG_Video> <BG_Video>[Green]BG_Video.mp4</BG_Video>
<IntroIn>[Green]IntroIn.mkv</IntroIn> <IntroIn>[Green]IntroIn.mp4</IntroIn>
<IntroMid>[Green]IntroMid.mkv</IntroMid> <IntroMid>[Green]IntroMid.mp4</IntroMid>
<IntroOut>[Green]IntroOut.mkv</IntroOut> <IntroOut>[Green]IntroOut.mp4</IntroOut>
</Videos> </Videos>
</root> </root>
Output/Themes/Ambient/Skin Red.xml
+4 -4
View File
@@ -218,9 +218,9 @@
<Invisible>Invisible.png</Invisible> <Invisible>Invisible.png</Invisible>
</Skins> </Skins>
<Videos> <Videos>
<BG_Video>[Red]BG_Video.mkv</BG_Video> <BG_Video>[Red]BG_Video.mp4</BG_Video>
<IntroIn>[Red]IntroIn.mkv</IntroIn> <IntroIn>[Red]IntroIn.mp4</IntroIn>
<IntroMid>[Red]IntroMid.mkv</IntroMid> <IntroMid>[Red]IntroMid.mp4</IntroMid>
<IntroOut>[Red]IntroOut.mkv</IntroOut> <IntroOut>[Red]IntroOut.mp4</IntroOut>
</Videos> </Videos>
</root> </root>
Output/Themes/Ambient/Skin Yellow.xml
+4 -4
View File
@@ -218,9 +218,9 @@
<Invisible>Invisible.png</Invisible> <Invisible>Invisible.png</Invisible>
</Skins> </Skins>
<Videos> <Videos>
<BG_Video>[Yellow]BG_Video.mkv</BG_Video> <BG_Video>[Yellow]BG_Video.mp4</BG_Video>
<IntroIn>[Yellow]IntroIn.mkv</IntroIn> <IntroIn>[Yellow]IntroIn.mp4</IntroIn>
<IntroMid>[Yellow]IntroMid.mkv</IntroMid> <IntroMid>[Yellow]IntroMid.mp4</IntroMid>
<IntroOut>[Yellow]IntroOut.mkv</IntroOut> <IntroOut>[Yellow]IntroOut.mp4</IntroOut>
</Videos> </Videos>
</root> </root>
Output/acinerella.dll
BIN
View File
Binary file not shown.
Vocaluxe/Lib/Video/CVideoDecoderFFmpeg.cs
+11 -5
View File
@@ -244,6 +244,7 @@ namespace Vocaluxe.Lib.Video
private bool _Paused = false; private bool _Paused = false;
private bool _NoMoreFrames = false; private bool _NoMoreFrames = false;
private bool _Finished = false; private bool _Finished = false;
private bool _BeforeLoop = false;
private int _Width = 0; private int _Width = 0;
@@ -314,7 +315,10 @@ namespace Vocaluxe.Lib.Video
public bool Finished public bool Finished
{ {
get { return _Finished; } get
{
return _Finished;
}
} }
public bool Open(string FileName) public bool Open(string FileName)
@@ -395,6 +399,7 @@ namespace Vocaluxe.Lib.Video
_VideoSkipTime = _Gap; _VideoSkipTime = _Gap;
_NegativeSkipTime = _Start + _Gap; _NegativeSkipTime = _Start + _Gap;
_SkipTime = _Start + _Gap; _SkipTime = _Start + _Gap;
_BeforeLoop = false;
} }
if (_SkipTime > 0) if (_SkipTime > 0)
@@ -575,7 +580,7 @@ namespace Vocaluxe.Lib.Video
return; return;
int FrameFinished = 0; int FrameFinished = 0;
if (DropFrame) if (DropFrame && !_BeforeLoop)
{ {
try try
{ {
@@ -588,7 +593,7 @@ namespace Vocaluxe.Lib.Video
} }
if (!DropFrame || FrameFinished != 0) if (!_BeforeLoop && (!DropFrame || FrameFinished != 0))
{ {
lock (MutexFrame) lock (MutexFrame)
{ {
@@ -608,14 +613,15 @@ namespace Vocaluxe.Lib.Video
{ {
if (_Loop) if (_Loop)
{ {
bool doskip = false; _BeforeLoop = true;
bool doskip = true;
float tm = 0f; float tm = 0f;
int num = -1; int num = -1;
lock (MutexFramebuffer) lock (MutexFramebuffer)
{ {
for (int i = 0; i < _FrameBuffer.Length; i++) for (int i = 0; i < _FrameBuffer.Length; i++)
{ {
if (_FrameBuffer[i].time > tm) if (_FrameBuffer[i].time > tm && !_FrameBuffer[i].displayed)
{ {
tm = _FrameBuffer[i].time; tm = _FrameBuffer[i].time;
num = i; num = i;
Vocaluxe/Screens/CScreenLoad.cs
+2 -2
View File
@@ -206,13 +206,13 @@ namespace Vocaluxe.Screens
if (_CurrentIntroVideoNr == 0 && _Intros[0].IsFinished) if (_CurrentIntroVideoNr == 0 && _Intros[0].IsFinished)
{ {
_CurrentIntroVideoNr = 1; _CurrentIntroVideoNr = 1;
_Intros[1].Loop = true;
_Intros[1].Start(); _Intros[1].Start();
} }
if (_CurrentIntroVideoNr == 1 && CSongs.CoverLoaded) if (_CurrentIntroVideoNr == 1 && CSongs.CoverLoaded)
{ {
_CurrentIntroVideoNr = 2; _CurrentIntroVideoNr = 2;
_Intros[2].Loop = true;
_Intros[2].Start(); _Intros[2].Start();
} }
@@ -277,7 +277,7 @@ namespace Vocaluxe.Screens
{ {
float VideoTime = _VideoTimer.ElapsedMilliseconds / 1000f; float VideoTime = _VideoTimer.ElapsedMilliseconds / 1000f;
_Finished = (VideoTime >= CVideo.VdGetLength(_VideoStream)); _Finished = CVideo.VdFinished(_VideoStream);
STexture tex = new STexture(-1); STexture tex = new STexture(-1);
CVideo.VdGetFrame(_VideoStream, ref tex, VideoTime, ref VideoTime); CVideo.VdGetFrame(_VideoStream, ref tex, VideoTime, ref VideoTime);