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

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

Browse Source
This commit is contained in:
Alexander Eckart committed 2013-02-22 22:04:12 +01:00
2 parents 521033ed97 57c7f6ca2e
commit f33aee9c14
2 files changed
+12 -2
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Vocaluxe/Base/CGraphics.cs
+5 -1
View File
@@ -503,7 +503,8 @@ namespace Vocaluxe.Base
MouseEvent InputMouseEvent = new MouseEvent();
bool PopupPlayerControlAllowed = _CurrentScreen != EScreens.ScreenOptionsRecord && _CurrentScreen != EScreens.ScreenSing &&
_CurrentScreen != EScreens.ScreenSong && _CurrentScreen != EScreens.ScreenCredits && !CBackgroundMusic.Disabled;
(_CurrentScreen != EScreens.ScreenSong || (_CurrentScreen == EScreens.ScreenSong && CSongs.Category == -1 && CConfig.Tabs ==EOffOn.TR_CONFIG_ON))
&& _CurrentScreen != EScreens.ScreenCredits && !CBackgroundMusic.Disabled;
bool PopupVolumeControlAllowed = _CurrentScreen != EScreens.ScreenCredits && _CurrentScreen != EScreens.ScreenOptionsRecord;
@@ -560,7 +561,10 @@ namespace Vocaluxe.Base
_Screens[(int)_CurrentScreen].ApplyVolume();
}
else
{
CConfig.BackgroundMusicVolume += Diff;
CBackgroundMusic.ApplyVolume();
}
break;
case EScreens.ScreenSing:
Vocaluxe/Screens/CPopupScreenVolumeControl.cs
+7 -1
View File
@@ -113,7 +113,10 @@ namespace Vocaluxe.Screens
if (CSongs.Category != -1)
CConfig.PreviewMusicVolume = SelectSlides[htSelectSlides(SelectSlideVolume)].Selection * 5;
else
{
CConfig.BackgroundMusicVolume = SelectSlides[htSelectSlides(SelectSlideVolume)].Selection * 5;
CBackgroundMusic.ApplyVolume();
}
break;
case EScreens.ScreenSing:
@@ -133,7 +136,10 @@ namespace Vocaluxe.Screens
switch (CGraphics.CurrentScreen)
{
case EScreens.ScreenSong:
SelectSlides[htSelectSlides(SelectSlideVolume)].Selection = (int)(CConfig.PreviewMusicVolume / 5);
if(CSongs.Category != -1)
SelectSlides[htSelectSlides(SelectSlideVolume)].Selection = (int)(CConfig.PreviewMusicVolume / 5);
else
SelectSlides[htSelectSlides(SelectSlideVolume)].Selection = ((int)CConfig.BackgroundMusicVolume / 5);
break;
case EScreens.ScreenSing: