Merge master.

[dcpomatic.git] / src / wx / audio_plot.cc

diff --git a/src/wx/audio_plot.cc b/src/wx/audio_plot.cc
index 124b927367da0a69773a3e2d05171e176fa186ee..c4e5d992fe2c11a3dbc107b287a1462e8437ca54 100644 (file)
--- a/src/wx/audio_plot.cc
+++ b/src/wx/audio_plot.cc
@@ -40,13 +40,12 @@ AudioPlot::AudioPlot (wxWindow* 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) {
+       for (int i = 0; i < MAX_DCP_AUDIO_CHANNELS; ++i) {
                _channel_visible[i] = false;
        }
 
@@ -67,8 +66,10 @@ AudioPlot::AudioPlot (wxWindow* parent)
        _colours.push_back (wxColour (255,   0, 139));
        _colours.push_back (wxColour (139,   0, 255));
 
-#if MAX_AUDIO_CHANNELS != 12
-#warning AudioPlot::AudioPlot is expecting the wrong MAX_AUDIO_CHANNELS
+       set_analysis (shared_ptr<AudioAnalysis> ());
+
+#if MAX_DCP_AUDIO_CHANNELS != 12
+#warning AudioPlot::AudioPlot is expecting the wrong MAX_DCP_AUDIO_CHANNELS
 #endif 
        
        Bind (wxEVT_PAINT, boost::bind (&AudioPlot::paint, this));
@@ -81,14 +82,10 @@ AudioPlot::set_analysis (shared_ptr<AudioAnalysis> a)
 {
        _analysis = a;
 
-       for (int i = 0; i < MAX_AUDIO_CHANNELS; ++i) {
-               _channel_visible[i] = false;
+       if (!a) {
+               _message = _("Please wait; audio is being analysed...");
        }
 
-       for (int i = 0; i < AudioPoint::COUNT; ++i) {
-               _type_visible[i] = false;
-       }
-       
        Refresh ();
 }
 
@@ -168,7 +165,7 @@ AudioPlot::paint ()
        gc->DrawText (_("Time"), data_width, metrics.height - metrics.y_origin + db_label_height / 2);
        
        if (_type_visible[AudioPoint::PEAK]) {
-               for (int c = 0; c < MAX_AUDIO_CHANNELS; ++c) {
+               for (int c = 0; c < MAX_DCP_AUDIO_CHANNELS; ++c) {
                        wxGraphicsPath p = gc->CreatePath ();
                        if (_channel_visible[c] && c < _analysis->channels()) {
                                plot_peak (p, c, metrics);
@@ -180,7 +177,7 @@ AudioPlot::paint ()
        }
 
        if (_type_visible[AudioPoint::RMS]) {
-               for (int c = 0; c < MAX_AUDIO_CHANNELS; ++c) {
+               for (int c = 0; c < MAX_DCP_AUDIO_CHANNELS; ++c) {
                        wxGraphicsPath p = gc->CreatePath ();
                        if (_channel_visible[c] && c < _analysis->channels()) {
                                plot_rms (p, c, metrics);