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

Merge remote-tracking branch 'remotes/origin/develop' into develop

Browse Source 
Conflicts:
	Vocaluxe.sln
	Vocaluxe/Base/CConfig.cs
This commit is contained in:
Flamefire committed 2013-02-28 14:13:53 +01:00
2 parents 3101897f57 56bde936b9
commit 51da50bf93
1340 files changed
+155639 -35
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Vocaluxe/Base/CGraphics.cs
+17 -7
View File
@@ -319,6 +319,7 @@ namespace Vocaluxe.Base
Mouse.CopyEvents();
Keys.CopyEvents();
CVideo.Update();
CSound.Update();
CBackgroundMusic.Update();
CInput.Update();
@@ -507,6 +508,11 @@ namespace Vocaluxe.Base
&& _CurrentScreen != EScreens.ScreenCredits && !CBackgroundMusic.Disabled;
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 EventsAvailable = false;
@@ -531,14 +537,9 @@ namespace Vocaluxe.Base
HidePopup(EPopupScreens.PopupPlayerControl);
}
if (PopupVolumeControlAllowed && CConfig.BackgroundMusic == EOffOn.TR_CONFIG_ON)
if (PopupPlayerControlAllowed && CConfig.BackgroundMusic == EOffOn.TR_CONFIG_ON)
{
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;
else if (KeyEvent.Key == Keys.MediaNextTrack)
if (KeyEvent.Key == Keys.MediaNextTrack)
CMain.BackgroundMusic.Next();
else if (KeyEvent.Key == Keys.MediaPreviousTrack)
CMain.BackgroundMusic.Previous();
@@ -549,6 +550,15 @@ namespace Vocaluxe.Base
else
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)
{