summaryrefslogtreecommitdiff
path: root/src/lib/ffmpeg_content.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-07-12 15:17:45 +0100
committerCarl Hetherington <cth@carlh.net>2013-07-12 15:17:45 +0100
commitc2b6ca1193107581b433d294aa2327a936f77383 (patch)
tree08d26653c408f8af7e070a60f62e6feac1509e58 /src/lib/ffmpeg_content.cc
parent4b971f28170354c415f74fd99cbcc3a328325337 (diff)
Tidy up video state identifer code slightly.
Diffstat (limited to 'src/lib/ffmpeg_content.cc')
-rw-r--r--src/lib/ffmpeg_content.cc20
1 files changed, 20 insertions, 0 deletions
diff --git a/src/lib/ffmpeg_content.cc b/src/lib/ffmpeg_content.cc
index 35f9f71f2..b4c1ecbfa 100644
--- a/src/lib/ffmpeg_content.cc
+++ b/src/lib/ffmpeg_content.cc
@@ -378,3 +378,23 @@ FFmpegContent::set_audio_mapping (AudioMapping m)
audio_stream()->mapping = m;
signal_changed (AudioContentProperty::AUDIO_MAPPING);
}
+
+string
+FFmpegContent::identifier () const
+{
+ stringstream s;
+
+ s << VideoContent::identifier();
+
+ boost::mutex::scoped_lock lm (_mutex);
+
+ if (_subtitle_stream) {
+ s << "_" << _subtitle_stream->id;
+ }
+
+ for (vector<Filter const *>::const_iterator i = _filters.begin(); i != _filters.end(); ++i) {
+ s << "_" << (*i)->id ();
+ }
+
+ return s.str ();
+}