* New Menu system

- Class-based
- Supports multiple pages
* Configurable DirectSound effects
- Dedicated page (F11) and menus (F1-F8)
* Apply some optimizations
- Use static for compile-time constants inside functions
- Envelope generator handles zero-time values without conditionals

Author: [email protected]

Console.cpp

@@ -37,12 +37,12 @@ int PrintConsoleWithAttribute(HANDLE out, COORD pos, WORD attrib, char const *fo
 void Clear(HANDLE hOut)
 {
 	CONSOLE_SCREEN_BUFFER_INFO bufInfo;
-	COORD osc_phase = { 0, 0 };
+	static COORD const zero = { 0, 0 };
 	DWORD written;
 	DWORD size;
 	GetConsoleScreenBufferInfo(hOut, &bufInfo);
 	size = bufInfo.dwSize.X * bufInfo.dwSize.Y;
-	FillConsoleOutputCharacter(hOut, (TCHAR)' ', size, osc_phase, &written);
-	FillConsoleOutputAttribute(hOut, FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE, size, osc_phase, &written);
-	SetConsoleCursorPosition(hOut, osc_phase);
+	FillConsoleOutputCharacter(hOut, 0, size, zero, &written);
+	FillConsoleOutputAttribute(hOut, FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE, size, zero, &written);
+	SetConsoleCursorPosition(hOut, zero);
 }

DisplayLowFrequencyOscillator.cpp

@@ -8,9 +8,15 @@ Low-Frequency Oscillator Display
 
 #include "DisplayLowFrequencyOscillator.h"
 #include "Menu.h"
+#include "MenuLFO.h"
 #include "Math.h"
 #include "OscillatorLFO.h"
 
+// local position
+static COORD const pos = { 0, 0 };
+static COORD const size = { 18, 1 };
+
+// plotting characters
 static CHAR_INFO const negative = { 0, BACKGROUND_RED | FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE };
 static CHAR_INFO const positive = { 0, BACKGROUND_GREEN | FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE };
 static WORD const plot[2] = { 221, 222 };
@@ -26,15 +32,13 @@ void UpdateLowFrequencyOscillatorDisplay(HANDLE hOut)
 
 	// plot low-frequency oscillator value
 	float const lfo = lfo_state.Update(lfo_config, 0.0f);
-	int grid_x = Clamp(FloorInt(18.0f * lfo + 18.0f), 0, 35);
+	int const grid_x = Clamp(FloorInt(18.0f * lfo + 18.0f), 0, 35);
 	buf[grid_x / 2].Char.UnicodeChar = plot[grid_x & 1];
 
 	// draw the gauge
-	COORD const pos = { 0, 0 };
-	COORD const size = { 18, 1 };
 	SMALL_RECT region = {
-		Menu::pos[Menu::MENU_LFO].X, Menu::pos[Menu::MENU_LFO].Y + 4,
-		Menu::pos[Menu::MENU_LFO].X + 19, Menu::pos[Menu::MENU_LFO].Y + 4
+		Menu::menu_lfo.pos.X, Menu::menu_lfo.pos.Y + 4,
+		Menu::menu_lfo.pos.X + 19, Menu::menu_lfo.pos.Y + 4
 	};
 	WriteConsoleOutput(hOut, &buf[0], size, pos, &region);
 }

DisplayOscillatorFrequency.cpp

@@ -8,6 +8,7 @@ Oscillator Frequency Display
 
 #include "DisplayOscillatorFrequency.h"
 #include "Menu.h"
+#include "MenuOSC.h"
 #include "Voice.h"
 #include "Control.h"
 #include "Console.h"
@@ -20,10 +21,9 @@ void UpdateOscillatorFrequencyDisplay(HANDLE hOut, int const v, int const o)
 	float const key_freq = Control::pitch_scale * note_frequency[voice_note[v]];
 
 	// get attributes to use
-	Menu::MenuMode menu = Menu::MenuMode(Menu::MENU_OSC1 + o);
-	COORD const pos = { Menu::pos[menu].X + 8, Menu::pos[menu].Y };
-	bool const selected = (Menu::active == menu);
-	bool const title_selected = selected && Menu::item[menu] == 0;
+	COORD const pos = { Menu::menu_osc[o].pos.X + 8, Menu::menu_osc[o].pos.Y };
+	bool const selected = (Menu::active_page == Menu::PAGE_MAIN && Menu::active_menu == Menu::MAIN_OSC1 + o);
+	bool const title_selected = selected && Menu::menu_osc[o].item == 0;
 	WORD const title_attrib = Menu::title_attrib[true][selected + title_selected];
 	WORD const num_attrib = (title_attrib & 0xF8) | (FOREGROUND_GREEN);
 	WORD const unit_attrib = (title_attrib & 0xF8) | (FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE);

DisplaySpectrumAnalyzer.cpp

@@ -11,6 +11,16 @@ Spectrum Analyzer Display
 
 #define FREQUENCY_BINS 4096
 
+// frequency constants
+static float const semitone = 1.0594630943592952645618252949463f;	//powf(2.0f, 1.0f / 12.0f);
+static float const quartertone = 0.97153194115360586874328941582127f;	//1/sqrtf(semitone)
+static float const freq_scale = FREQUENCY_BINS * 2.0f * quartertone;
+
+// position and size
+static COORD const pos = { 0, 0 };
+static COORD const size = { SPECTRUM_WIDTH, SPECTRUM_HEIGHT };
+
+// plotting characters
 static CHAR_INFO const bar_full = { 0, BACKGROUND_GREEN };
 static CHAR_INFO const bar_top = { 223, BACKGROUND_GREEN | FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE };
 static CHAR_INFO const bar_bottom = { 220, BACKGROUND_BLUE | FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE };
@@ -28,8 +38,7 @@ void UpdateSpectrumAnalyzer(HANDLE hOut, DWORD stream, BASS_INFO const &info, fl
 
 	// get the lower frequency bin for the zeroth semitone band
 	// (half a semitone down from the center frequency)
-	float const semitone = powf(2.0f, 1.0f / 12.0f);
-	float freq = freq_min * FREQUENCY_BINS * 2.0f / info.freq / sqrtf(semitone);
+	float freq = freq_scale * freq_min / info.freq;
 	int b0 = Max(RoundInt(freq), 0);
 
 	// get power in each semitone band
@@ -62,13 +71,11 @@ void UpdateSpectrumAnalyzer(HANDLE hOut, DWORD stream, BASS_INFO const &info, fl
 	}
 
 	// inaudible band
-	int xinaudible = RoundInt(logf(20000 / freq_min) * 12 / logf(2));
+	int xinaudible = RoundInt(log2f(20000 / freq_min) * 12);
 
 	// plot log-log spectrum
 	// each grid cell is one semitone wide and 6 dB high
 	CHAR_INFO buf[SPECTRUM_HEIGHT][SPECTRUM_WIDTH];
-	COORD const pos = { 0, 0 };
-	COORD const size = { SPECTRUM_WIDTH, SPECTRUM_HEIGHT };
 	SMALL_RECT region = { 0, 0, 79, 49 };
 	float threshold = 1.0f;
 	for (int y = 0; y < SPECTRUM_HEIGHT; ++y)

Effect.cpp

@@ -14,7 +14,6 @@ char const * const fx_name[9] =
 };
 
 // effect config
-bool fx_enable;
 bool fx_active[9];
 
 // effect handles
@@ -23,14 +22,38 @@ HFX fx[9];
 // channel to apply effects
 DWORD fx_channel;
 
+// effect parameters
+BASS_DX8_CHORUS fx_chorus = { 50, 10, 25, 1, 1, 16, 3 };	// 1.1f
+BASS_DX8_COMPRESSOR fx_compressor = { 0, 10, 200, -20, 3, 4 };
+BASS_DX8_DISTORTION fx_distortion = { -18, 15, 2400, 2400, 8000 };
+BASS_DX8_ECHO fx_echo = { 50, 50, 500, 500, 0 };
+BASS_DX8_FLANGER fx_flanger = { 50, 100, -50, 0.25f, 1, 2, 2 };
+BASS_DX8_GARGLE fx_gargle = { 20, 0 };
+BASS_DX8_I3DL2REVERB fx_reverb3d = { -1000, -100, 0, 1.49f, 0.83f, -2602, 0.007f, 200, 0.011f, 100, 100, 5000 };
+BASS_DX8_PARAMEQ fx_parameq = { 8000, 12, 0 };	// should be an array of these
+BASS_DX8_REVERB fx_reverb = { 0, 0, 1000, 0.001f };
+
+// map index to parameters
+void *fx_params[] =
+{
+	&fx_chorus,
+	&fx_compressor,
+	&fx_distortion,
+	&fx_echo,
+	&fx_flanger,
+	&fx_gargle,
+	&fx_reverb3d,
+	&fx_parameq,
+	&fx_reverb
+};
+
 // enable/disable effect
 void EnableEffect(int index, bool enable)
 {
 	if (enable)
 	{
 		if (!fx[index])
 		{
-			// set the effect, not bothering with parameters (use defaults)
 			fx[index] = BASS_ChannelSetFX(fx_channel, BASS_FX_DX8_CHORUS + index, 0);
 		}
 	}
@@ -43,3 +66,12 @@ void EnableEffect(int index, bool enable)
 		}
 	}
 }
+
+// update effect
+void UpdateEffect(int index)
+{
+	if (fx[index])
+	{
+		BASS_FXSetParameters(fx[index], fx_params[index]);
+	}
+}

Effect.h

@@ -18,5 +18,19 @@ extern HFX fx[9];
 // channel to apply effects
 extern DWORD fx_channel;
 
+// effect parameters
+extern BASS_DX8_CHORUS fx_chorus;
+extern BASS_DX8_COMPRESSOR fx_compressor;
+extern BASS_DX8_DISTORTION fx_distortion;
+extern BASS_DX8_ECHO fx_echo;
+extern BASS_DX8_FLANGER fx_flanger;
+extern BASS_DX8_GARGLE fx_gargle;
+extern BASS_DX8_I3DL2REVERB fx_reverb3d;
+extern BASS_DX8_PARAMEQ fx_parameq;
+extern BASS_DX8_REVERB fx_reverb;
+
 // enable/disable effect
 extern void EnableEffect(int index, bool enable);
+
+// update effect (after changing parameters)
+extern void UpdateEffect(int index);

Envelope.cpp

@@ -21,12 +21,12 @@ static float const ENV_DECAY_BIAS = 1.0f - 1.0f / (1.0f - expf(-ENV_DECAY_CONSTA
 EnvelopeConfig::EnvelopeConfig(bool const enable, float const attack_time, float const decay_time, float const sustain_level, float const release_time)
 : enable(enable)
 , attack_time(attack_time)
-, attack_rate(1 / Max(attack_time, 0.0001f))
+, attack_rate(1 / (attack_time + FLT_MIN))
 , decay_time(decay_time)
-, decay_rate(1 / Max(decay_time, 0.0001f))
+, decay_rate(1 / (decay_time + FLT_MIN))
 , sustain_level(sustain_level)
 , release_time(release_time)
-, release_rate(1 / Max(release_time, 0.0001f))
+, release_rate(1 / (release_time + FLT_MIN))
 {
 }