More improvements and fixes (nearly stable now)

This commit is contained in:
Florian Küpper committed 2014-08-24 13:09:57 +02:00
1 parent 6c4fe011bf
commit 74654d7fcf
4 files changed
+23 -41

No files matched your search

+16 -10
View File
@@ -67,11 +67,10 @@ namespace Vocaluxe.Base
get { return _Disabled; }
set
{
if (Disabled == value)
return;
_Disabled = value;
if (_Disabled)
Pause();
else
Play();
Pause();
}
}
@@ -191,7 +190,7 @@ namespace Vocaluxe.Base
{
_PreviewPlayer.Stop();
_PlaysPreview = false;
Play();
Pause();
}
else
{
@@ -202,13 +201,17 @@ namespace Vocaluxe.Base
public static void Pause()
{
if (!IsPlaying)
return;
if (_PlaysPreview)
{
if (!_PreviewPlayer.SongLoaded)
return;
_PreviewPlayer.TogglePause();
}
else
_SongPlayer.TogglePause();
if (!_SongPlayer.SongLoaded)
Next();
else
_SongPlayer.TogglePause();
}
public static void Next()
@@ -305,7 +308,10 @@ namespace Vocaluxe.Base
public static void LoadPreview(CSong song, float start = 0f)
{
Stop();
if (!_PlaysPreview)
Pause();
else
StopPreview();
if (song == null)
return;
@@ -115,7 +115,7 @@ namespace Vocaluxe.Screens
if (_Buttons[_ButtonPrevious].Selected)
CBackgroundMusic.Previous();
if (_Buttons[_ButtonPlay].Selected)
CBackgroundMusic.Play();
CBackgroundMusic.Pause();
if (_Buttons[_ButtonPause].Selected)
CBackgroundMusic.Pause();
if (_Buttons[_ButtonRepeat].Selected)
@@ -143,7 +143,7 @@ namespace Vocaluxe.Screens
if (_Buttons[_ButtonPrevious].Selected)
CBackgroundMusic.Previous();
if (_Buttons[_ButtonPlay].Selected)
CBackgroundMusic.Play();
CBackgroundMusic.Pause();
if (_Buttons[_ButtonPause].Selected)
CBackgroundMusic.Pause();
if (_Buttons[_ButtonRepeat].Selected)
+1 -1
View File
@@ -714,7 +714,7 @@ namespace Vocaluxe.Screens
_SongMenu.OnHide();
if (CGraphics.NextScreen != EScreens.ScreenNames || CConfig.BackgroundMusic == EBackgroundMusicOffOn.TR_CONFIG_OFF)
if (CGraphics.NextScreen != EScreens.ScreenNames)
{
CBackgroundMusic.Disabled = false;
CSound.SetGlobalVolume(CConfig.BackgroundMusicVolume);