Fix update of reference-dcp-audio button.

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

diff --git a/src/wx/audio_dialog.cc b/src/wx/audio_dialog.cc
index 27b34540611dd76cf94a0af46b1649022e1efe20..8e672150eb8b2f3aa83197c2cd68bba2f5ca75bd 100644 (file)
--- a/src/wx/audio_dialog.cc
+++ b/src/wx/audio_dialog.cc
@@ -27,6 +27,7 @@
 #include "lib/job_manager.h"
 #include <libxml++/libxml++.h>
 #include <boost/filesystem.hpp>
+#include <iostream>
 
 using std::cout;
 using boost::shared_ptr;
@@ -39,6 +40,7 @@ using boost::dynamic_pointer_cast;
 AudioDialog::AudioDialog (wxWindow* parent, shared_ptr<Film> film, shared_ptr<AudioContent> content)
        : wxDialog (parent, wxID_ANY, _("Audio"), wxDefaultPosition, wxSize (640, 512), wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | wxFULL_REPAINT_ON_RESIZE)
        , _film (film)
+       , _channels (film->audio_channels ())
        , _plot (0)
 {
        wxFont subheading_font (*wxNORMAL_FONT);
@@ -64,7 +66,7 @@ AudioDialog::AudioDialog (wxWindow* parent, shared_ptr<Film> film, shared_ptr<Au
                right->Add (m, 1, wxALIGN_CENTER_VERTICAL | wxTOP | wxBOTTOM, 16);
        }
 
-       for (int i = 0; i < MAX_DCP_AUDIO_CHANNELS; ++i) {
+       for (int i = 0; i < _channels; ++i) {
                _channel_checkbox[i] = new wxCheckBox (this, wxID_ANY, std_to_wx (audio_channel_name (i)));
                right->Add (_channel_checkbox[i], 0, wxEXPAND | wxALL, 3);
                _channel_checkbox[i]->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&AudioDialog::channel_clicked, this, _1));
@@ -156,11 +158,11 @@ AudioDialog::try_to_load_analysis ()
        /* 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 ())) {
+       while (i < _channels && (!_channel_checkbox[i] || !_channel_checkbox[i]->GetValue ())) {
                ++i;
        }
 
-       if (i == MAX_DCP_AUDIO_CHANNELS && _channel_checkbox[0]) {
+       if (i == _channels && _channel_checkbox[0]) {
                _channel_checkbox[0]->SetValue (true);
                _plot->set_channel_visible (0, true);
        }
@@ -201,11 +203,11 @@ void
 AudioDialog::channel_clicked (wxCommandEvent& ev)
 {
        int c = 0;
-       while (c < MAX_DCP_AUDIO_CHANNELS && ev.GetEventObject() != _channel_checkbox[c]) {
+       while (c < _channels && ev.GetEventObject() != _channel_checkbox[c]) {
                ++c;
        }
 
-       DCPOMATIC_ASSERT (c < MAX_DCP_AUDIO_CHANNELS);
+       DCPOMATIC_ASSERT (c < _channels);
 
        _plot->set_channel_visible (c, _channel_checkbox[c]->GetValue ());
 }
@@ -216,7 +218,7 @@ AudioDialog::content_changed (int p)
        if (p == AudioContentProperty::AUDIO_STREAMS) {
                try_to_load_analysis ();
        } else if (p == AudioContentProperty::AUDIO_GAIN) {
-               if (_playlist->content().size() == 1) {
+               if (_playlist->content().size() == 1 && _analysis) {
                        /* We can use a short-cut to render the effect of this
                           change, rather than recalculating everything.
                        */