Play song-preview instead of bg-music (if enabled) on names-, score- and highscore-screen.

Vocaluxe/Base/CGraphics.cs

@@ -60,6 +60,11 @@ namespace Vocaluxe.Base
             get { return _CurrentScreen; }
         }
 
+        public static EScreens NextScreen
+        {
+            get { return _NextScreen; }
+        }
+
         #region public methods
         public static void Init()
         {

Vocaluxe/Base/CMain.cs

@@ -77,6 +77,11 @@ namespace Vocaluxe.Base
             return CConfig.BackgroundMusicVolume;
         }
 
+        public EOffOn GetBackgroundMusicStatus()
+        {
+            return CConfig.BackgroundMusic;
+        }
+
         public int GetPreviewMusicVolume()
         {
             return CConfig.PreviewMusicVolume;
@@ -436,6 +441,11 @@ namespace Vocaluxe.Base
         {
             return CGraphics.GlobalAlpha;
         }
+
+        public EScreens GetNextScreen()
+        {
+            return CGraphics.NextScreen;
+        }
     }
 
     class CBlog : ILog
@@ -979,9 +989,9 @@ namespace Vocaluxe.Base
             CPreviewPlayer.Stop();
         }
 
-        public void Pause()
+        public void TogglePause()
         {
-            CPreviewPlayer.Pause();
+            CPreviewPlayer.TogglePause();
         }
 
         public CTexture GetCover()

Vocaluxe/Base/CPreviewPlayer.cs

@@ -51,7 +51,7 @@ namespace Vocaluxe.Base
             _Player.Play();
         }
 
-        public static void Pause()
+        public static void TogglePause()
         {
             _Player.TogglePause();
         }

Vocaluxe/Screens/CScreenNames.cs

@@ -566,6 +566,9 @@ namespace Vocaluxe.Screens
         {
             base.OnClose();
             CRecord.Stop();
+
+            if (CGraphics.NextScreen != EScreens.ScreenSong && CPreviewPlayer.IsPlaying)
+                CPreviewPlayer.TogglePause();
         }
 
         public override bool Draw()

Vocaluxe/Screens/CScreenScore.cs

@@ -123,6 +123,9 @@ namespace Vocaluxe.Screens
 
         public override void OnShow()
         {
+            if (CConfig.BackgroundMusic == EOffOn.TR_CONFIG_ON)
+                CPreviewPlayer.TogglePause();
+
             base.OnShow();
             //-1 --> Show average
             _Round = CGame.NumRounds > 1 ? -1 : 0;

Vocaluxe/Screens/CScreenSing.cs

@@ -537,8 +537,6 @@ namespace Vocaluxe.Screens
             _CloseSong();
             if (_Webcam)
                 CWebcam.Stop();
-            CBackgroundMusic.Disabled = false;
-            CSound.SetGlobalVolume(CConfig.BackgroundMusicVolume);
         }
 
         private void _CloseSong()

Vocaluxe/Screens/CScreenSong.cs

@@ -716,9 +716,14 @@ namespace Vocaluxe.Screens
         public override void OnClose()
         {
             base.OnClose();
-            CBackgroundMusic.Disabled = false;
+
-            CSound.SetGlobalVolume(CConfig.BackgroundMusicVolume);
             _SongMenu.OnHide();
+
+            if (CGraphics.NextScreen != EScreens.ScreenNames || CConfig.BackgroundMusic == EOffOn.TR_CONFIG_OFF)
+            {
+                CBackgroundMusic.Disabled = false;
+                CSound.SetGlobalVolume(CConfig.BackgroundMusicVolume);
+            }
         }
 
         private void _HandlePartySongSelection(int songNr)

VocaluxeLib/IBasic.cs

@@ -35,6 +35,8 @@ namespace VocaluxeLib
         void SetBackgroundMusicVolume(int newVolume);
         int GetBackgroundMusicVolume();
 
+        EOffOn GetBackgroundMusicStatus();
+
         int GetPreviewMusicVolume();
 
         EOffOn GetVideosToBackground();
@@ -150,6 +152,8 @@ namespace VocaluxeLib
         void FadeTo(EScreens nextScreen);
 
         float GetGlobalAlpha();
+
+        EScreens GetNextScreen();
     }
 
     public interface ILog
@@ -321,7 +325,7 @@ namespace VocaluxeLib
         void Play(float start = -1);
         void Load(CSong song, float start = 0f);
         void Stop();
-        void Pause();
+        void TogglePause();
         CTexture GetCover();
         CTexture GetVideoTexture();
         bool IsPlaying();

VocaluxeLib/Menu/SongMenu/CSongMenuFramework.cs

@@ -379,7 +379,8 @@ namespace VocaluxeLib.Menu.SongMenu
         
         public virtual void OnHide()
         {
-            _ResetPreview();
+            if(CBase.Graphics.GetNextScreen() != EScreens.ScreenNames || CBase.Config.GetBackgroundMusicStatus() == EOffOn.TR_CONFIG_OFF)
+                _ResetPreview();
         }
 
         public abstract bool HandleInput(ref SKeyEvent keyEvent, SScreenSongOptions options);

VocaluxeLib/Menu/SongMenu/CSongMenuTileBoard.cs

@@ -110,7 +110,11 @@ namespace VocaluxeLib.Menu.SongMenu
             set
             {
                 if (value == base._PreviewNr)
+                {
+                    if (!CBase.PreviewPlayer.IsPlaying())
+                        CBase.PreviewPlayer.Play();
                     return;
+                }
                 base._PreviewNr = value;
                 _UpdatePreview();
             }

VocaluxeLib/Utils/Player/CSongPlayer.cs

@@ -159,11 +159,15 @@ namespace VocaluxeLib.Utils.Player
         public new void TogglePause()
         {
             base.TogglePause();
-            if (_Video != -1)
+            if (!IsPlaying && _Video != -1)
             {
                 CBase.Video.Pause(_Video);
                 CBase.Video.Skip(_Video, CBase.Sound.GetPosition(_StreamID) + _FadeTime, _Song.VideoGap);
             }
+            else if(_Video != -1)
+            {
+                CBase.Video.Resume(_Video);
+            }
         }
 
         public new void Update()

VocaluxeLib/VocaluxeLib.csproj

@@ -135,7 +135,6 @@
     <Compile Include="PartyModes\IPartyMode.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Utils\CWavFile.cs" />
-    <Compile Include="Utils\Player\CPreviewPlayer.cs" />
     <Compile Include="Utils\Player\CSongPlayer.cs" />
     <Compile Include="Utils\Player\CSoundPlayer.cs" />
   </ItemGroup>