Fix last-but-one commit.

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

diff --git a/src/wx/audio_dialog.cc b/src/wx/audio_dialog.cc
index 0e1316cf31979f21d3ec4790f1a3ba5bb7154461..1d41fc1854acf23647b9d2fbdf0c85761cded4a4 100644 (file)
--- a/src/wx/audio_dialog.cc
+++ b/src/wx/audio_dialog.cc
@@ -106,6 +106,7 @@ AudioDialog::try_to_load_analysis ()
        }
 
        if (!boost::filesystem::exists (_content->audio_analysis_path())) {
+               _plot->set_analysis (shared_ptr<AudioAnalysis> ());
                _analysis_finished_connection = _content->analyse_audio (bind (&AudioDialog::analysis_finished, this));
                return;
        }
@@ -115,14 +116,28 @@ AudioDialog::try_to_load_analysis ()
        a.reset (new AudioAnalysis (_content->audio_analysis_path ()));
        _plot->set_analysis (a);
 
-       if (_channel_checkbox[0]) {
+       /* Set up some defaults if no check boxes are checked */
+       
+       int i = 0;
+       while (i < MAX_DCP_AUDIO_CHANNELS && (!_channel_checkbox[i] || !_channel_checkbox[i]->GetValue ())) {
+               ++i;
+       }
+
+       if (i == MAX_DCP_AUDIO_CHANNELS && _channel_checkbox[0]) {
                _channel_checkbox[0]->SetValue (true);
+               _plot->set_channel_visible (0, true);
        }
-       _plot->set_channel_visible (0, true);
 
-       for (int i = 0; i < AudioPoint::COUNT; ++i) {
-               _type_checkbox[i]->SetValue (true);
-               _plot->set_type_visible (i, true);
+       i = 0;
+       while (i < AudioPoint::COUNT && !_type_checkbox[i]->GetValue ()) {
+               i++;
+       }
+
+       if (i == AudioPoint::COUNT) {
+               for (int i = 0; i < AudioPoint::COUNT; ++i) {
+                       _type_checkbox[i]->SetValue (true);
+                       _plot->set_type_visible (i, true);
+               }
        }
 }
 
@@ -148,7 +163,7 @@ AudioDialog::channel_clicked (wxCommandEvent& ev)
                ++c;
        }
 
-       assert (c < MAX_DCP_AUDIO_CHANNELS);
+       DCPOMATIC_ASSERT (c < MAX_DCP_AUDIO_CHANNELS);
 
        _plot->set_channel_visible (c, _channel_checkbox[c]->GetValue ());
 }
@@ -158,6 +173,8 @@ AudioDialog::content_changed (int p)
 {
        if (p == AudioContentProperty::AUDIO_GAIN) {
                _plot->set_gain (_content->audio_gain ());
+       } else if (p == AudioContentProperty::AUDIO_MAPPING) {
+               try_to_load_analysis ();
        }
 }
 
@@ -169,7 +186,7 @@ AudioDialog::type_clicked (wxCommandEvent& ev)
                ++t;
        }
 
-       assert (t < AudioPoint::COUNT);
+       DCPOMATIC_ASSERT (t < AudioPoint::COUNT);
 
        _plot->set_type_visible (t, _type_checkbox[t]->GetValue ());
 }