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

visualizer: simplify computing number of read samples

Browse Source
This commit is contained in:
Andrzej Rybczak
2011-11-09 20:31:13 +01:00
parent 0e6306849c
commit e31dec7005
1 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/visualizer.cpp
View File

@@ -126,21 +126,21 @@ void Visualizer::Update()
draw = &Visualizer::DrawSoundWave; draw = &Visualizer::DrawSoundWave;
w->Clear(); w->Clear();
ssize_t samples_read = data/sizeof(int16_t);
if (Config.visualizer_in_stereo) if (Config.visualizer_in_stereo)
{ {
ssize_t bytes_read = data/sizeof(int16_t); int16_t buf_left[samples_read/2], buf_right[samples_read/2];
int16_t buf_left[bytes_read/2], buf_right[bytes_read/2]; for (ssize_t i = 0, j = 0; i < samples_read; i += 2, ++j)
for (ssize_t i = 0, j = 0; i < bytes_read; i += 2, ++j)
{ {
buf_left[j] = buf[i]; buf_left[j] = buf[i];
buf_right[j] = buf[i+1]; buf_right[j] = buf[i+1];
} }
size_t half_height = MainHeight/2; size_t half_height = MainHeight/2;
(this->*draw)(buf_left, data/2, 0, half_height); (this->*draw)(buf_left, samples_read/2, 0, half_height);
(this->*draw)(buf_right, data/2, half_height+(draw == &Visualizer::DrawSoundWave ? 1 : 0), half_height+(draw != &Visualizer::DrawSoundWave ? 1 : 0)); (this->*draw)(buf_right, samples_read/2, half_height+(draw == &Visualizer::DrawSoundWave ? 1 : 0), half_height+(draw != &Visualizer::DrawSoundWave ? 1 : 0));
} }
else else
(this->*draw)(buf, data, 0, MainHeight); (this->*draw)(buf, samples_read, 0, MainHeight);
w->Refresh(); w->Refresh();
} }
@@ -152,9 +152,9 @@ void Visualizer::SpacePressed()
# endif // HAVE_FFTW3_H # endif // HAVE_FFTW3_H
} }
void Visualizer::DrawSoundWave(int16_t *buf, ssize_t data, size_t y_offset, size_t height) void Visualizer::DrawSoundWave(int16_t *buf, ssize_t samples, size_t y_offset, size_t height)
{ {
const int samples_per_col = data/sizeof(int16_t)/COLS; const int samples_per_col = samples/COLS;
const int half_height = height/2; const int half_height = height/2;
*w << fmtAltCharset; *w << fmtAltCharset;
double prev_point_pos = 0; double prev_point_pos = 0;
@@ -182,12 +182,15 @@ void Visualizer::DrawSoundWave(int16_t *buf, ssize_t data, size_t y_offset, size
} }
#ifdef HAVE_FFTW3_H #ifdef HAVE_FFTW3_H
void Visualizer::DrawFrequencySpectrum(int16_t *buf, ssize_t data, size_t y_offset, size_t height) void Visualizer::DrawFrequencySpectrum(int16_t *buf, ssize_t samples, size_t y_offset, size_t height)
{ {
// zero old values for (unsigned i = 0, j = 0; i < itsSamples; ++i)
std::fill(buf+data/sizeof(int16_t), buf+data/2, 0); {
for (unsigned i = 0; i < data/2; ++i) if (j < samples)
itsInput[i] = buf[i]; itsInput[i] = buf[j++];
else
itsInput[i] = 0;
}
fftw_execute(itsPlan); fftw_execute(itsPlan);