Salastil/ncmpcpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

visualizer: stereo ellipse: scale the samples to fill the whole screen

Browse Source
This commit is contained in:
Andrzej Rybczak
2014-11-09 13:17:36 +01:00
parent e54f2aa38a
commit 25708093e6
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/visualizer.cpp
View File

@@ -362,22 +362,26 @@ void Visualizer::DrawSoundEllipse(int16_t *buf, ssize_t samples, size_t, size_t
// is skinner or wider than this, instead of a circle it will be an ellipse. // is skinner or wider than this, instead of a circle it will be an ellipse.
void Visualizer::DrawSoundEllipseStereo(int16_t *buf_left, int16_t *buf_right, ssize_t samples, size_t half_height) void Visualizer::DrawSoundEllipseStereo(int16_t *buf_left, int16_t *buf_right, ssize_t samples, size_t half_height)
{ {
const size_t half_width = w.getWidth()/2; const size_t width = w.getWidth();
const size_t left_half_width = width/2;
const size_t right_half_width = width - left_half_width;
const size_t top_half_height = half_height;
const size_t bottom_half_height = w.getHeight() - half_height;
// Makes the radius of each ring be approximately 2 cells wide. // Makes the radius of each ring be approximately 2 cells wide.
const int32_t radius = 2*Config.visualizer_colors.size(); const int32_t radius = 2*Config.visualizer_colors.size();
int32_t x, y; int32_t x, y;
for (ssize_t i = 0; i < samples; ++i) for (ssize_t i = 0; i < samples; ++i)
{ {
x = double(buf_left[i]) * half_width / 32768.0; x = buf_left[i]/32768.0 * (buf_left[i] < 0 ? left_half_width : right_half_width);
y = double(buf_right[i]) * half_height / 32768.0; y = buf_right[i]/32768.0 * (buf_right[i] < 0 ? top_half_height : bottom_half_height);
// The arguments to the toColor function roughly follow a circle equation where // The arguments to the toColor function roughly follow a circle equation where
// the center is not centered around (0,0). For example (x - w)^2 + (y-h)+2 = r^2 // the center is not centered around (0,0). For example (x - w)^2 + (y-h)+2 = r^2
// centers the circle around the point (w,h). Because fonts are not all the same // centers the circle around the point (w,h). Because fonts are not all the same
// size, this will not always generate a perfect circle. // size, this will not always generate a perfect circle.
w << toColor(sqrt(x*x + 4*y*y), radius) w << toColor(sqrt(x*x + 4*y*y), radius)
<< NC::XY(half_width + x, half_height + y) << NC::XY(left_half_width + x, top_half_height + y)
<< Config.visualizer_chars[1] << Config.visualizer_chars[1]
<< NC::Color::End; << NC::Color::End;
} }