#include <boost/bind.hpp>
#include <wx/graphics.h>
#include "audio_plot.h"
-#include "lib/decoder_factory.h"
#include "lib/audio_decoder.h"
#include "lib/audio_analysis.h"
#include "wx/wx_util.h"
int const AudioPlot::max_smoothing = 128;
AudioPlot::AudioPlot (wxWindow* parent)
- : wxPanel (parent)
+ : wxPanel (parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxFULL_REPAINT_ON_RESIZE)
, _gain (0)
, _smoothing (max_smoothing / 2)
+ , _message (_("Please wait; audio is being analysed..."))
{
+#ifndef __WXOSX__
SetDoubleBuffered (true);
+#endif
for (int i = 0; i < MAX_AUDIO_CHANNELS; ++i) {
_channel_visible[i] = false;
_type_visible[i] = false;
}
- _colours.push_back (wxColour ( 0, 0, 0));
- _colours.push_back (wxColour (255, 0, 0));
- _colours.push_back (wxColour ( 0, 255, 0));
+ _colours.push_back (wxColour ( 0, 0, 0));
+ _colours.push_back (wxColour (255, 0, 0));
+ _colours.push_back (wxColour ( 0, 255, 0));
_colours.push_back (wxColour (139, 0, 204));
- _colours.push_back (wxColour ( 0, 0, 255));
+ _colours.push_back (wxColour ( 0, 0, 255));
_colours.push_back (wxColour (100, 100, 100));
- Connect (wxID_ANY, wxEVT_PAINT, wxPaintEventHandler (AudioPlot::paint), 0, this);
+ Bind (wxEVT_PAINT, boost::bind (&AudioPlot::paint, this));
SetMinSize (wxSize (640, 512));
}
}
void
-AudioPlot::paint (wxPaintEvent &)
+AudioPlot::set_message (wxString s)
+{
+ _message = s;
+ Refresh ();
+}
+
+void
+AudioPlot::paint ()
{
wxPaintDC dc (this);
if (!_analysis || _analysis->channels() == 0) {
gc->SetFont (gc->CreateFont (*wxNORMAL_FONT));
- gc->DrawText (_("Please wait; audio is being analysed..."), 32, 32);
+ gc->DrawText (_message, 32, 32);
return;
}
wxDouble db_label_height;
wxDouble db_label_descent;
wxDouble db_label_leading;
- gc->GetTextExtent (_("-80dB"), &_db_label_width, &db_label_height, &db_label_descent, &db_label_leading);
+ gc->GetTextExtent (wxT ("-80dB"), &_db_label_width, &db_label_height, &db_label_descent, &db_label_leading);
_db_label_width += 8;
gc->SetPen (*wxLIGHT_GREY_PEN);
gc->StrokePath (grid);
- gc->DrawText (_("Time"), data_width, _height - _y_origin + db_label_height / 2);
-
+ gc->DrawText (_("DCPTime"), data_width, _height - _y_origin + db_label_height / 2);
if (_type_visible[AudioPoint::PEAK]) {
for (int c = 0; c < MAX_AUDIO_CHANNELS; ++c) {
plot_peak (p, c);
}
wxColour const col = _colours[c];
-#if wxMAJOR_VERSION == 2 && wxMINOR_VERSION >= 9
gc->SetPen (*wxThePenList->FindOrCreatePen (wxColour (col.Red(), col.Green(), col.Blue(), col.Alpha() / 2), 1, wxPENSTYLE_SOLID));
-#else
- gc->SetPen (*wxThePenList->FindOrCreatePen (wxColour (col.Red(), col.Green(), col.Blue(), col.Alpha() / 2), 1, wxSOLID));
-#endif
gc->StrokePath (p);
}
}
plot_rms (p, c);
}
wxColour const col = _colours[c];
-#if wxMAJOR_VERSION == 2 && wxMINOR_VERSION >= 9
gc->SetPen (*wxThePenList->FindOrCreatePen (col, 1, wxPENSTYLE_SOLID));
-#else
- gc->SetPen (*wxThePenList->FindOrCreatePen (col, 1, wxSOLID));
-#endif
gc->StrokePath (p);
}
}
void
AudioPlot::plot_peak (wxGraphicsPath& path, int channel) const
{
+ if (_analysis->points (channel) == 0) {
+ return;
+ }
+
path.MoveToPoint (_db_label_width, y_for_linear (_analysis->get_point(channel, 0)[AudioPoint::PEAK]));
float peak = 0;
void
AudioPlot::plot_rms (wxGraphicsPath& path, int channel) const
{
+ if (_analysis->points (channel) == 0) {
+ return;
+ }
+
path.MoveToPoint (_db_label_width, y_for_linear (_analysis->get_point(channel, 0)[AudioPoint::RMS]));
list<float> smoothing;
+
int const N = _analysis->points(channel);
+
+ float const first = _analysis->get_point(channel, 0)[AudioPoint::RMS];
+ float const last = _analysis->get_point(channel, N - 1)[AudioPoint::RMS];
+
+ int const before = _smoothing / 2;
+ int const after = _smoothing - before;
+
+ /* Pre-load the smoothing list */
+ for (int i = 0; i < before; ++i) {
+ smoothing.push_back (first);
+ }
+ for (int i = 0; i < after; ++i) {
+ if (i < N) {
+ smoothing.push_back (_analysis->get_point(channel, i)[AudioPoint::RMS]);
+ } else {
+ smoothing.push_back (last);
+ }
+ }
+
for (int i = 0; i < N; ++i) {
- smoothing.push_back (_analysis->get_point(channel, i)[AudioPoint::RMS]);
- if (int(smoothing.size()) > _smoothing) {
- smoothing.pop_front ();
+ int const next_for_window = i + after;
+
+ if (next_for_window < N) {
+ smoothing.push_back (_analysis->get_point(channel, i)[AudioPoint::RMS]);
+ } else {
+ smoothing.push_back (last);
}
+ smoothing.pop_front ();
+
float p = 0;
for (list<float>::const_iterator j = smoothing.begin(); j != smoothing.end(); ++j) {
p += pow (*j, 2);
p = sqrt (p / smoothing.size ());
- int const ind = max (0, i - int(smoothing.size() / 2));
- path.AddLineToPoint (_db_label_width + ind * _x_scale, y_for_linear (p));
+ path.AddLineToPoint (_db_label_width + i * _x_scale, y_for_linear (p));
}
}