summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2015-06-03 10:46:47 +0100
committerCarl Hetherington <cth@carlh.net>2015-06-03 10:46:47 +0100
commit3b67c79bf4534e72a7eceaa6e566e7b7c949e4f7 (patch)
tree52589e423ad07bc9c14a8f2ed2dee122aebc926f /src/lib
parent8923ed628cff91cb4312f6d1bd27664d3bc6d890 (diff)
Fix confusion with AUDIO_STREAMS property.
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/ffmpeg_content.cc5
-rw-r--r--src/lib/ffmpeg_content.h1
2 files changed, 2 insertions, 4 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;
};