Merge remote-tracking branch 'remotes/flokuep/develop' into develop
This commit is contained in:
commit
f33aee9c14
2 files changed
+12
-2
No files matched your search
@@ -503,7 +503,8 @@ namespace Vocaluxe.Base
|
|||||||
MouseEvent InputMouseEvent = new MouseEvent();
|
MouseEvent InputMouseEvent = new MouseEvent();
|
||||||
|
|
||||||
bool PopupPlayerControlAllowed = _CurrentScreen != EScreens.ScreenOptionsRecord && _CurrentScreen != EScreens.ScreenSing &&
|
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;
|
bool PopupVolumeControlAllowed = _CurrentScreen != EScreens.ScreenCredits && _CurrentScreen != EScreens.ScreenOptionsRecord;
|
||||||
|
|
||||||
@@ -560,7 +561,10 @@ namespace Vocaluxe.Base
|
|||||||
_Screens[(int)_CurrentScreen].ApplyVolume();
|
_Screens[(int)_CurrentScreen].ApplyVolume();
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
{
|
||||||
CConfig.BackgroundMusicVolume += Diff;
|
CConfig.BackgroundMusicVolume += Diff;
|
||||||
|
CBackgroundMusic.ApplyVolume();
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case EScreens.ScreenSing:
|
case EScreens.ScreenSing:
|
||||||
|
|||||||
@@ -113,7 +113,10 @@ namespace Vocaluxe.Screens
|
|||||||
if (CSongs.Category != -1)
|
if (CSongs.Category != -1)
|
||||||
CConfig.PreviewMusicVolume = SelectSlides[htSelectSlides(SelectSlideVolume)].Selection * 5;
|
CConfig.PreviewMusicVolume = SelectSlides[htSelectSlides(SelectSlideVolume)].Selection * 5;
|
||||||
else
|
else
|
||||||
|
{
|
||||||
CConfig.BackgroundMusicVolume = SelectSlides[htSelectSlides(SelectSlideVolume)].Selection * 5;
|
CConfig.BackgroundMusicVolume = SelectSlides[htSelectSlides(SelectSlideVolume)].Selection * 5;
|
||||||
|
CBackgroundMusic.ApplyVolume();
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case EScreens.ScreenSing:
|
case EScreens.ScreenSing:
|
||||||
@@ -133,7 +136,10 @@ namespace Vocaluxe.Screens
|
|||||||
switch (CGraphics.CurrentScreen)
|
switch (CGraphics.CurrentScreen)
|
||||||
{
|
{
|
||||||
case EScreens.ScreenSong:
|
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;
|
break;
|
||||||
|
|
||||||
case EScreens.ScreenSing:
|
case EScreens.ScreenSing:
|
||||||
|
|||||||
Reference in new issue
Block a user