Rename ExternalAudioDecoder -> SndfileDecoder.

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

diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc
index dcd18c97f4d0385a95830f3bd673e4bc8cba2e0d..2553d0bd51a9c58d01439f17bcc9ebe849d850a4 100644 (file)
--- a/src/wx/film_editor.cc
+++ b/src/wx/film_editor.cc
@@ -37,7 +37,6 @@
 #include "lib/filter.h"
 #include "lib/config.h"
 #include "lib/ffmpeg_decoder.h"
-#include "lib/external_audio_decoder.h"
 #include "filter_dialog.h"
 #include "wx_util.h"
 #include "film_editor.h"
@@ -698,8 +697,6 @@ FilmEditor::film_changed (Film::Property p)
                        _trim_end->SetRange (0, _film->length().get());
                }
                break;
-       case Film::DCP_INTRINSIC_DURATION:
-               break;
        case Film::DCP_CONTENT_TYPE:
                checked_set (_dcp_content_type, DCPContentType::as_index (_film->dcp_content_type ()));
                setup_dcp_name ();
@@ -1129,7 +1126,7 @@ FilmEditor::setup_subtitle_control_sensitivity ()
 void
 FilmEditor::setup_audio_control_sensitivity ()
 {
-       _use_content_audio->Enable (_generally_sensitive);
+       _use_content_audio->Enable (_generally_sensitive && _film && !_film->content_audio_streams().empty());
        _use_external_audio->Enable (_generally_sensitive);
        
        bool const source = _generally_sensitive && _use_content_audio->GetValue();
@@ -1224,7 +1221,7 @@ FilmEditor::subtitle_stream_changed (wxCommandEvent &)
 void
 FilmEditor::setup_audio_details ()
 {
-       if (!_film->audio_stream()) {
+       if (!_film->content_audio_stream()) {
                _audio->SetLabel (wxT (""));
        } else {
                stringstream s;