From 1cca599a74ea1cda67567f40e035d3025aba2070 Mon Sep 17 00:00:00 2001 From: Florian Kuepper Date: Fri, 27 Jul 2012 17:50:50 +0200 Subject: [PATCH] Equalizers could only used, when they are handled by screen. Later we will give possibility to add "normal" equalizers which shows bg-music. --- Vocaluxe/Menu/CMenu.cs | 3 ++- Vocaluxe/Screens/CScreenNames.cs | 5 +++++ Vocaluxe/Screens/CScreenOptionsRecord.cs | 3 +++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/Vocaluxe/Menu/CMenu.cs b/Vocaluxe/Menu/CMenu.cs index ed731ad2..3677b369 100644 --- a/Vocaluxe/Menu/CMenu.cs +++ b/Vocaluxe/Menu/CMenu.cs @@ -1911,7 +1911,8 @@ namespace Vocaluxe.Menu case EType.TEqualizer: if (!_Equalizers[_Interactions[interaction].Num].ScreenHandles) { - //_Equalizers[_Interactions[interaction].Num].Update(CSound.Get + //TODO: + //Call Update-Method of Equalizer and give infos about bg-sound. //_Equalizers[_Interactions[interaction].Num].Draw(); } break; diff --git a/Vocaluxe/Screens/CScreenNames.cs b/Vocaluxe/Screens/CScreenNames.cs index 9c8962e4..e43e2f5b 100644 --- a/Vocaluxe/Screens/CScreenNames.cs +++ b/Vocaluxe/Screens/CScreenNames.cs @@ -107,6 +107,11 @@ namespace Vocaluxe.Screens { OriginalPlayerAvatarTextures[i] = Statics[htStatics(StaticPlayerAvatar[i])].Texture; } + + for (int i = 1; i <= CSettings.MaxNumPlayer; i++) + { + Equalizers[htEqualizer("EqualizerPlayer" + i)].ScreenHandles = true; + } } public override bool HandleInput(KeyEvent KeyEvent) diff --git a/Vocaluxe/Screens/CScreenOptionsRecord.cs b/Vocaluxe/Screens/CScreenOptionsRecord.cs index 9cf27630..c4566428 100644 --- a/Vocaluxe/Screens/CScreenOptionsRecord.cs +++ b/Vocaluxe/Screens/CScreenOptionsRecord.cs @@ -109,6 +109,9 @@ namespace Vocaluxe.Screens Statics[htStatics(StaticEnergyChannel[i])].Visible = false; ChannelEnergy[i] = 0f; } + + Equalizers[htEqualizer(EqualizerChannel1)].ScreenHandles = true; + Equalizers[htEqualizer(EqualizerChannel2)].ScreenHandles = true; } public override bool HandleInput(KeyEvent KeyEvent)