X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Faudio_plot.cc;h=7ed792351bb30e49ecbfa33fdb1ad12b72a3e286;hb=16a7ea91e973b327735658857cbf996cc740be77;hp=cf44eb69fa59c84c93011619c99718b5a0f27b2e;hpb=324278cc8459e4d7d907b03e0748cf1b33f294f4;p=dcpomatic.git

diff --git a/src/wx/audio_plot.cc b/src/wx/audio_plot.cc
index cf44eb69f..7ed792351 100644
--- a/src/wx/audio_plot.cc
+++ b/src/wx/audio_plot.cc
@@ -21,7 +21,6 @@
 #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"
@@ -38,11 +37,14 @@ int const AudioPlot::_minimum = -70;
 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;
@@ -52,14 +54,14 @@ AudioPlot::AudioPlot (wxWindow* parent)
 		_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));
 }
@@ -95,7 +97,14 @@ AudioPlot::set_type_visible (int t, bool v)
 }
 
 void
-AudioPlot::paint (wxPaintEvent &)
+AudioPlot::set_message (wxString s)
+{
+	_message = s;
+	Refresh ();
+}
+
+void
+AudioPlot::paint ()
 {
 	wxPaintDC dc (this);
 
@@ -106,7 +115,7 @@ AudioPlot::paint (wxPaintEvent &)
 
 	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;
 	}
 
@@ -146,11 +155,7 @@ AudioPlot::paint (wxPaintEvent &)
 				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);
 		}
 	}
@@ -162,11 +167,7 @@ AudioPlot::paint (wxPaintEvent &)
 				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);
 		}
 	}
@@ -190,6 +191,10 @@ AudioPlot::y_for_linear (float p) const
 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;
@@ -210,6 +215,10 @@ AudioPlot::plot_peak (wxGraphicsPath& path, int channel) const
 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;