Fix confusion with AUDIO_STREAMS property.

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

diff --git a/src/wx/dcp_panel.cc b/src/wx/dcp_panel.cc
index cf5c509773dc19fbee844283fd1bbef212f4ae50..7a5f0554f00bb836fe87b8e8d300bb972207c3ae 100644 (file)
--- a/src/wx/dcp_panel.cc
+++ b/src/wx/dcp_panel.cc
@@ -355,6 +355,13 @@ DCPPanel::film_changed (int p)
                checked_set (_standard, _film->interop() ? 1 : 0);
                setup_dcp_name ();
                break;
+       case Film::AUDIO_PROCESSOR:
+               if (_film->audio_processor ()) {
+                       checked_set (_audio_processor, _film->audio_processor()->id());
+               } else {
+                       checked_set (_audio_processor, 0);
+               }
+               break;
        default:
                break;
        }
@@ -363,7 +370,7 @@ DCPPanel::film_changed (int p)
 void
 DCPPanel::film_content_changed (int property)
 {
-       if (property == FFmpegContentProperty::AUDIO_STREAMS ||
+       if (property == AudioContentProperty::AUDIO_STREAMS ||
            property == SubtitleContentProperty::USE_SUBTITLES ||
            property == VideoContentProperty::VIDEO_SCALE) {
                setup_dcp_name ();
@@ -446,6 +453,7 @@ DCPPanel::set_film (shared_ptr<Film> film)
        film_changed (Film::SEQUENCE_VIDEO);
        film_changed (Film::THREE_D);
        film_changed (Film::INTEROP);
+       film_changed (Film::AUDIO_PROCESSOR);
 }
 
 void
@@ -655,6 +663,7 @@ DCPPanel::make_audio_panel ()
                _audio_channels->Append (wxString::Format ("%d", i));
        }
        grid->Add (_audio_channels, wxGBPosition (r, 1));
+       ++r;
 
        add_label_to_grid_bag_sizer (grid, panel, _("Processor"), true, wxGBPosition (r, 0));
        _audio_processor = new wxChoice (panel, wxID_ANY);