RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 07:18:11 +00:00
Code Issues Activity Actions

SoundPlayer: Make sample widget display contents of the whole buffer

Browse source 
The SampleWidget now displays the contents of the whole buffer.
This commit is contained in:
Till Mayer 2019-10-29 17:31:49 +01:00 • committed by Andreas Kling
parent 4623811ec3
commit 112d36bfa0
2 changed files with 23 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

32
Applications/SoundPlayer/SampleWidget.cpp
View file

@ -1,6 +1,7 @@
#include "SampleWidget.h" #include "SampleWidget.h"
#include <LibAudio/ABuffer.h> #include <LibAudio/ABuffer.h>
#include <LibGUI/GPainter.h> #include <LibGUI/GPainter.h>
#include <LibM/math.h>
SampleWidget::SampleWidget(GWidget* parent) SampleWidget::SampleWidget(GWidget* parent)
: GFrame(parent) : GFrame(parent)
@ -18,21 +19,34 @@ void SampleWidget::paint_event(GPaintEvent& event)
{ {
GFrame::paint_event(event); GFrame::paint_event(event);
GPainter painter(*this); GPainter painter(*this);
painter.add_clip_rect(event.rect());
painter.add_clip_rect(event.rect());
painter.fill_rect(frame_inner_rect(), Color::Black); painter.fill_rect(frame_inner_rect(), Color::Black);
if (!m_buffer) if (!m_buffer)
return; return;
// FIXME: Right now we only display as many samples from the buffer as we can fit int samples_per_pixel = m_buffer->sample_count() / frame_inner_rect().width();
// in the frame_inner_rect(). Maybe scale the samples or something? float sample_max = 0;
int samples_to_draw = min(m_buffer->sample_count(), frame_inner_rect().width()); int count = 0;
for (int x = 0; x < samples_to_draw; ++x) { int x_offset = frame_inner_rect().x();
// FIXME: This might look nicer if drawn as lines. int x = x_offset;
auto& sample = m_buffer->samples()[x]; int y_offset = frame_inner_rect().center().y();
Point p = { x, frame_inner_rect().center().y() + (int)(sample.left * frame_inner_rect().height() / 2) };
painter.set_pixel(p, Color::Green); for (int sample_index = 0; sample_index < m_buffer->sample_count() && (x - x_offset) < frame_inner_rect().width(); ++sample_index) {
float sample = fabsf(m_buffer->samples()[sample_index].left);
sample_max = max(sample, sample_max);
++count;
if (count >= samples_per_pixel) {
Point min_point = { x, y_offset + static_cast<int>(-sample_max * frame_inner_rect().height() / 2) };
Point max_point = { x++, y_offset + static_cast<int>(sample_max * frame_inner_rect().height() / 2) };
painter.draw_line(min_point, max_point, Color::Green);
count = 0;
sample_max = 0;
}
} }
} }

1
Applications/SoundPlayer/SampleWidget.h
View file

@ -10,7 +10,6 @@ public:
virtual ~SampleWidget() override; virtual ~SampleWidget() override;
void set_buffer(ABuffer*); void set_buffer(ABuffer*);
private: private:
explicit SampleWidget(GWidget* parent); explicit SampleWidget(GWidget* parent);
virtual void paint_event(GPaintEvent&) override; virtual void paint_event(GPaintEvent&) override;