Fixed some bugs with bg-music.
This commit is contained in:
1 parent
09d0529050
commit
fc432f34eb
4 files changed
+4
-4
No files matched your search
@@ -184,7 +184,7 @@ namespace Vocaluxe.Base
|
|||||||
|
|
||||||
if (_PlaysPreview)
|
if (_PlaysPreview)
|
||||||
_PreviewPlayer.Play();
|
_PreviewPlayer.Play();
|
||||||
else if(CConfig.BackgroundMusic == EBackgroundMusicOffOn.TR_CONFIG_OFF)
|
else if(CConfig.BackgroundMusic == EBackgroundMusicOffOn.TR_CONFIG_ON)
|
||||||
if (_SongPlayer.SongLoaded)
|
if (_SongPlayer.SongLoaded)
|
||||||
//Resume
|
//Resume
|
||||||
_SongPlayer.TogglePause();
|
_SongPlayer.TogglePause();
|
||||||
|
|||||||
@@ -160,7 +160,7 @@ namespace Vocaluxe.Screens
|
|||||||
if (CConfig.BackgroundMusic == EBackgroundMusicOffOn.TR_CONFIG_ON)
|
if (CConfig.BackgroundMusic == EBackgroundMusicOffOn.TR_CONFIG_ON)
|
||||||
CBackgroundMusic.Play();
|
CBackgroundMusic.Play();
|
||||||
else
|
else
|
||||||
CBackgroundMusic.Pause();
|
CBackgroundMusic.Stop();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -714,7 +714,7 @@ namespace Vocaluxe.Screens
|
|||||||
|
|
||||||
_SongMenu.OnHide();
|
_SongMenu.OnHide();
|
||||||
|
|
||||||
if (CGraphics.NextScreen != EScreens.ScreenNames)
|
if (CGraphics.NextScreen != EScreens.ScreenNames || CConfig.BackgroundMusic == EBackgroundMusicOffOn.TR_CONFIG_OFF)
|
||||||
{
|
{
|
||||||
CBackgroundMusic.Disabled = false;
|
CBackgroundMusic.Disabled = false;
|
||||||
CSound.SetGlobalVolume(CConfig.BackgroundMusicVolume);
|
CSound.SetGlobalVolume(CConfig.BackgroundMusicVolume);
|
||||||
|
|||||||
@@ -297,7 +297,7 @@ namespace VocaluxeLib.Menu.SongMenu
|
|||||||
|
|
||||||
public virtual void OnHide()
|
public virtual void OnHide()
|
||||||
{
|
{
|
||||||
if(CBase.Graphics.GetNextScreen() != EScreens.ScreenNames)
|
if(CBase.Graphics.GetNextScreen() != EScreens.ScreenNames || CBase.Config.GetBackgroundMusicStatus() == EBackgroundMusicOffOn.TR_CONFIG_OFF)
|
||||||
_ResetPreview();
|
_ResetPreview();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user