diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-06-03 10:46:47 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-06-03 10:46:47 +0100 |
| commit | 3b67c79bf4534e72a7eceaa6e566e7b7c949e4f7 (patch) | |
| tree | 52589e423ad07bc9c14a8f2ed2dee122aebc926f /src | |
| parent | 8923ed628cff91cb4312f6d1bd27664d3bc6d890 (diff) | |
Fix confusion with AUDIO_STREAMS property.
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/ffmpeg_content.cc | 5 | ||||
| -rw-r--r-- | src/lib/ffmpeg_content.h | 1 | ||||
| -rw-r--r-- | src/wx/audio_panel.cc | 2 | ||||
| -rw-r--r-- | src/wx/dcp_panel.cc | 2 |
4 files changed, 4 insertions, 6 deletions
diff --git a/src/lib/ffmpeg_content.cc b/src/lib/ffmpeg_content.cc index eab110236..1278c4c10 100644 --- 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 b9ae4707a..04523b117 100644 --- 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 8b2682762..c34a67032 100644 --- 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 786f294b0..7a5f0554f 100644 --- 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 (); |