From a3252e1e314a9ba16bd71575fbd86a0538b0ccde Mon Sep 17 00:00:00 2001
From: Andrzej Rybczak <electricityispower@gmail.com>
Date: Tue, 2 Sep 2014 18:34:52 +0200
Subject: [PATCH] visualizer: make frequency spectrum watchable

---
 doc/config         |  2 +-
 src/settings.cpp   |  2 +-
 src/visualizer.cpp | 34 +++++++++++++++++++++++++---------
 src/visualizer.h   |  2 +-
 4 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/doc/config b/doc/config
index 8917cf1c..b6d926b7 100644
--- a/doc/config
+++ b/doc/config
@@ -88,7 +88,7 @@
 ##
 #visualizer_type = wave
 #
-#visualizer_look = "◆│"
+#visualizer_look = ●▮
 #
 ##### system encoding #####
 ##
diff --git a/src/settings.cpp b/src/settings.cpp
index fcf634b2..04cd9b77 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -235,7 +235,7 @@ bool Configuration::read(const std::string &config_path)
 	}, defaults_to(visualizer_use_wave, true)
 	));
 	p.add("visualizer_look", assign_default<std::string>(
-		visualizer_chars, "◆│", [](std::string &&s) {
+		visualizer_chars, "●▮", [](std::string &&s) {
 			auto result = ToWString(std::move(s));
 			typedef std::wstring::size_type size_type;
 			boundsCheck(result.size(), size_type(2), size_type(2));
diff --git a/src/visualizer.cpp b/src/visualizer.cpp
index 2fa06ae0..3c54ea98 100644
--- a/src/visualizer.cpp
+++ b/src/visualizer.cpp
@@ -42,14 +42,22 @@ using Global::MainHeight;
 
 Visualizer *myVisualizer;
 
+namespace {
+
+const int fps = 25;
+
+}
+
 Visualizer::Visualizer()
 : Screen(NC::Window(0, MainStartY, COLS, MainHeight, "", Config.visualizer_color, NC::Border::None))
 {
 	ResetFD();
-	m_samples = Config.visualizer_in_stereo ? 4096 : 2048;
+	m_samples = 44100/fps;
+	if (Config.visualizer_in_stereo)
+		m_samples *= 2;
 #	ifdef HAVE_FFTW3_H
 	m_fftw_results = m_samples/2+1;
-	m_freq_magnitudes = new unsigned[m_fftw_results];
+	m_freq_magnitudes = new double[m_fftw_results];
 	m_fftw_input = static_cast<double *>(fftw_malloc(sizeof(double)*m_samples));
 	m_fftw_output = static_cast<fftw_complex *>(fftw_malloc(sizeof(fftw_complex)*m_fftw_results));
 	m_fftw_plan = fftw_plan_dft_r2c_1d(m_samples, m_fftw_input, m_fftw_output, FFTW_ESTIMATE);
@@ -61,6 +69,7 @@ void Visualizer::switchTo()
 	SwitchTo::execute(this);
 	w.clear();
 	SetFD();
+	m_timer = boost::posix_time::from_time_t(0);
 	drawHeader();
 }
 
@@ -127,7 +136,7 @@ void Visualizer::update()
 int Visualizer::windowTimeout()
 {
 	if (m_fifo >= 0 && Status::State::player() == MPD::psPlay)
-		return 1000/25; // 25 fps
+		return 1000/fps;
 	else
 		return Screen<WindowType>::windowTimeout();
 }
@@ -185,18 +194,25 @@ void Visualizer::DrawFrequencySpectrum(int16_t *buf, ssize_t samples, size_t y_o
 	
 	// count magnitude of each frequency and scale it to fit the screen
 	for (unsigned i = 0; i < m_fftw_results; ++i)
-		m_freq_magnitudes[i] = sqrt(m_fftw_output[i][0]*m_fftw_output[i][0] + m_fftw_output[i][1]*m_fftw_output[i][1])/1e5*height/5;
+		m_freq_magnitudes[i] = sqrt(m_fftw_output[i][0]*m_fftw_output[i][0] + m_fftw_output[i][1]*m_fftw_output[i][1])/1e5*height;
 	
 	const size_t win_width = w.getWidth();
-	const int freqs_per_col = m_fftw_results/win_width /* cut bandwidth a little to achieve better look */ * 7/10;
+	// cut bandwidth a little to achieve better look
+	const int freqs_per_col = m_fftw_results/win_width * 7/10;
+	double bar_height;
+	size_t bar_real_height;
 	for (size_t i = 0; i < win_width; ++i)
 	{
-		size_t bar_height = 0;
+		bar_height = 0;
 		for (int j = 0; j < freqs_per_col; ++j)
 			bar_height += m_freq_magnitudes[i*freqs_per_col+j];
-		bar_height = std::min(bar_height/freqs_per_col, height);
-		const size_t start_y = y_offset > 0 ? y_offset : height-bar_height;
-		const size_t stop_y = std::min(bar_height+start_y, w.getHeight());
+		// buff higher frequencies
+		bar_height *= log2(2 + i);
+		// moderately normalize the heights
+		bar_height = pow(bar_height, 0.6);
+		bar_real_height = std::min(size_t(bar_height/freqs_per_col), height);
+		const size_t start_y = y_offset > 0 ? y_offset : height-bar_real_height;
+		const size_t stop_y = std::min(bar_real_height+start_y, w.getHeight());
 		for (size_t j = start_y; j < stop_y; ++j)
 			w << NC::XY(i, j) << Config.visualizer_chars[1];
 	}
diff --git a/src/visualizer.h b/src/visualizer.h
index ed174eee..f050fad7 100644
--- a/src/visualizer.h
+++ b/src/visualizer.h
@@ -76,7 +76,7 @@ private:
 	unsigned m_samples;
 #	ifdef HAVE_FFTW3_H
 	unsigned m_fftw_results;
-	unsigned *m_freq_magnitudes;
+	double *m_freq_magnitudes;
 	double *m_fftw_input;
 	fftw_complex *m_fftw_output;
 	fftw_plan m_fftw_plan;