Projects/Vocaluxe
2
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix some errors with volume-control, closes #10

Browse Source
This commit is contained in:
Florian Küpper committed 2013-02-22 23:56:33 +01:00
1 parent 6be397ac5b
commit 0d79abcda8
1 file changed
+16 -7
Download Patch File Download Diff File Expand all files Collapse all files
Vocaluxe/Base/CGraphics.cs
+16 -7
View File
@@ -507,6 +507,11 @@ namespace Vocaluxe.Base
&& _CurrentScreen != EScreens.ScreenCredits && !CBackgroundMusic.Disabled; && _CurrentScreen != EScreens.ScreenCredits && !CBackgroundMusic.Disabled;
bool PopupVolumeControlAllowed = _CurrentScreen != EScreens.ScreenCredits && _CurrentScreen != EScreens.ScreenOptionsRecord; bool PopupVolumeControlAllowed = _CurrentScreen != EScreens.ScreenCredits && _CurrentScreen != EScreens.ScreenOptionsRecord;
//Hide volume control for bg-music if bg-music is disabled
if (PopupVolumeControlAllowed && (_CurrentScreen != EScreens.ScreenSong || (_CurrentScreen == EScreens.ScreenSong && CSongs.Category == -1))
&& _CurrentScreen != EScreens.ScreenSing && CConfig.BackgroundMusic == EOffOn.TR_CONFIG_OFF)
PopupVolumeControlAllowed = false;
bool Resume = true; bool Resume = true;
bool EventsAvailable = false; bool EventsAvailable = false;
@@ -531,14 +536,9 @@ namespace Vocaluxe.Base
HidePopup(EPopupScreens.PopupPlayerControl); HidePopup(EPopupScreens.PopupPlayerControl);
} }
if (PopupVolumeControlAllowed && CConfig.BackgroundMusic == EOffOn.TR_CONFIG_ON) if (PopupPlayerControlAllowed && CConfig.BackgroundMusic == EOffOn.TR_CONFIG_ON)
{ {
int Diff = 0; if (KeyEvent.Key == Keys.MediaNextTrack)
if ((KeyEvent.ModSHIFT && (KeyEvent.Key == Keys.Add || KeyEvent.Key == Keys.PageUp)) || (KeyEvent.Sender == ESender.WiiMote && KeyEvent.Key == Keys.Add))
Diff = 5;
else if ((KeyEvent.ModSHIFT && (KeyEvent.Key == Keys.Subtract || KeyEvent.Key == Keys.PageDown)) || (KeyEvent.Sender == ESender.WiiMote && KeyEvent.Key == Keys.Subtract))
Diff = -5;
else if (KeyEvent.Key == Keys.MediaNextTrack)
CMain.BackgroundMusic.Next(); CMain.BackgroundMusic.Next();
else if (KeyEvent.Key == Keys.MediaPreviousTrack) else if (KeyEvent.Key == Keys.MediaPreviousTrack)
CMain.BackgroundMusic.Previous(); CMain.BackgroundMusic.Previous();
@@ -549,6 +549,15 @@ namespace Vocaluxe.Base
else else
CMain.BackgroundMusic.Play(); CMain.BackgroundMusic.Play();
} }
}
if (PopupVolumeControlAllowed)
{
int Diff = 0;
if ((KeyEvent.ModSHIFT && (KeyEvent.Key == Keys.Add || KeyEvent.Key == Keys.PageUp)) || (KeyEvent.Sender == ESender.WiiMote && KeyEvent.Key == Keys.Add))
Diff = 5;
else if ((KeyEvent.ModSHIFT && (KeyEvent.Key == Keys.Subtract || KeyEvent.Key == Keys.PageDown)) || (KeyEvent.Sender == ESender.WiiMote && KeyEvent.Key == Keys.Subtract))
Diff = -5;
if (Diff != 0) if (Diff != 0)
{ {