Fixed some bugs with bg-music.

This commit is contained in:
Florian Küpper committed 2014-09-25 19:36:16 +02:00
1 parent 09d0529050
commit fc432f34eb
4 files changed
+4 -4

No files matched your search

+1 -1
View File
@@ -184,7 +184,7 @@ namespace Vocaluxe.Base
if (_PlaysPreview)
_PreviewPlayer.Play();
else if(CConfig.BackgroundMusic == EBackgroundMusicOffOn.TR_CONFIG_OFF)
else if(CConfig.BackgroundMusic == EBackgroundMusicOffOn.TR_CONFIG_ON)
if (_SongPlayer.SongLoaded)
//Resume
_SongPlayer.TogglePause();
+1 -1
View File
@@ -160,7 +160,7 @@ namespace Vocaluxe.Screens
if (CConfig.BackgroundMusic == EBackgroundMusicOffOn.TR_CONFIG_ON)
CBackgroundMusic.Play();
else
CBackgroundMusic.Pause();
CBackgroundMusic.Stop();
}
}
}
+1 -1
View File
@@ -714,7 +714,7 @@ namespace Vocaluxe.Screens
_SongMenu.OnHide();
if (CGraphics.NextScreen != EScreens.ScreenNames)
if (CGraphics.NextScreen != EScreens.ScreenNames || CConfig.BackgroundMusic == EBackgroundMusicOffOn.TR_CONFIG_OFF)
{
CBackgroundMusic.Disabled = false;
CSound.SetGlobalVolume(CConfig.BackgroundMusicVolume);
@@ -297,7 +297,7 @@ namespace VocaluxeLib.Menu.SongMenu
public virtual void OnHide()
{
if(CBase.Graphics.GetNextScreen() != EScreens.ScreenNames)
if(CBase.Graphics.GetNextScreen() != EScreens.ScreenNames || CBase.Config.GetBackgroundMusicStatus() == EBackgroundMusicOffOn.TR_CONFIG_OFF)
_ResetPreview();
}