update of ffmpeg, fixed bg music skip, try to fix mic bug

This commit is contained in:
Alexander Eckart committed 2013-01-02 20:06:11 +01:00
1 parent fd8df67374
commit 1c49c4aaaf
16 files changed
+6 -3

No files matched your search

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
+3
View File
@@ -211,6 +211,7 @@ namespace Vocaluxe.Base
_Video = -1;
}
CSound.FadeAndStop(_CurrentMusicStream, 0f, CSettings.BackgroundMusicFadeTime);
_CurrentMusicStream = -1;
_CurrentPlaylistElement = new PlaylistElement();
_Playing = false;
@@ -242,6 +243,7 @@ namespace Vocaluxe.Base
bool finished = CSound.IsFinished(_CurrentMusicStream);
if (_Playing && (timeToPlay <= CSettings.BackgroundMusicFadeTime || finished))
{
if (_RepeatSong)
{
CSound.SetPosition(_CurrentMusicStream, 0);
@@ -250,6 +252,7 @@ namespace Vocaluxe.Base
}
else
Next();
}
}
}
+3 -3
View File
@@ -438,7 +438,7 @@ namespace Vocaluxe.Screens
UpdateNames();
CBackgroundMusic.Disabled = true;
CloseSong();
}
public override void OnShowFinish()
@@ -573,6 +573,8 @@ namespace Vocaluxe.Screens
private void LoadNextSong()
{
CloseSong();
CGame.NextRound();
if (CGame.IsFinished())
@@ -589,8 +591,6 @@ namespace Vocaluxe.Screens
return;
}
CloseSong();
if (!song.CoverSmallLoaded)
song.ReadNotes();