Fix confusion with AUDIO_STREAMS property.

diff --git a/src/lib/ffmpeg_content.cc b/src/lib/ffmpeg_content.cc
index eab11023618e182b20d71a9357ff9580fe8886f0..1278c4c10767125d38ebbee063d7b086c8d77b7d 100644 (file)
--- a/src/lib/ffmpeg_content.cc
+++ b/src/lib/ffmpeg_content.cc
@@ -51,8 +51,7 @@ using boost::dynamic_pointer_cast;
 
 int const FFmpegContentProperty::SUBTITLE_STREAMS = 100;
 int const FFmpegContentProperty::SUBTITLE_STREAM = 101;
-int const FFmpegContentProperty::AUDIO_STREAMS = 102;
-int const FFmpegContentProperty::FILTERS = 103;
+int const FFmpegContentProperty::FILTERS = 102;
 
 FFmpegContent::FFmpegContent (shared_ptr<const Film> f, boost::filesystem::path p)
        : Content (f, p)
@@ -183,7 +182,7 @@ FFmpegContent::examine (shared_ptr<Job> job)
 
        signal_changed (FFmpegContentProperty::SUBTITLE_STREAMS);
        signal_changed (FFmpegContentProperty::SUBTITLE_STREAM);
-       signal_changed (FFmpegContentProperty::AUDIO_STREAMS);
+       signal_changed (AudioContentProperty::AUDIO_STREAMS);
 }
 
 string

diff --git a/src/lib/ffmpeg_content.h b/src/lib/ffmpeg_content.h
index b9ae4707a3420cfc150927952a5baccdaba82346..04523b117a49b51784e8ddc3c5cfb2286bc4cf33 100644 (file)
--- a/src/lib/ffmpeg_content.h
+++ b/src/lib/ffmpeg_content.h
@@ -41,7 +41,6 @@ class FFmpegContentProperty : public VideoContentProperty
 public:
        static int const SUBTITLE_STREAMS;
        static int const SUBTITLE_STREAM;
-       static int const AUDIO_STREAMS;
        static int const FILTERS;
 };
 

diff --git a/src/wx/audio_panel.cc b/src/wx/audio_panel.cc
index 8b2682762c4984fbfcd83e03958481eb07982767..c34a67032b04dca916d564cc3918ec96da9c6aa2 100644 (file)
--- a/src/wx/audio_panel.cc
+++ b/src/wx/audio_panel.cc
@@ -220,5 +220,5 @@ AudioPanel::content_selection_changed ()
        _show->Enable (sel.size() == 1);
        _mapping->Enable (sel.size() == 1);
 
-       film_content_changed (FFmpegContentProperty::AUDIO_STREAMS);
+       film_content_changed (AudioContentProperty::AUDIO_STREAMS);
 }

diff --git a/src/wx/dcp_panel.cc b/src/wx/dcp_panel.cc
index 786f294b0cb03474fbc4f1f46625e27074f58f2d..7a5f0554f00bb836fe87b8e8d300bb972207c3ae 100644 (file)
--- a/src/wx/dcp_panel.cc
+++ b/src/wx/dcp_panel.cc
@@ -370,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 ();