summaryrefslogtreecommitdiff
path: root/src/lib/ffmpeg_content.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-04-06 12:26:12 +0100
committerCarl Hetherington <cth@carlh.net>2013-04-06 12:26:12 +0100
commit1bff0990433ab0ce588acaef7c589fa623bd998b (patch)
tree65cba435e949deb6359bbf75866b52684116df06 /src/lib/ffmpeg_content.cc
parent3429cf48ff2ce056413588be4151be82c8114861 (diff)
Add interface to set up still image lengths.
Diffstat (limited to 'src/lib/ffmpeg_content.cc')
-rw-r--r--src/lib/ffmpeg_content.cc15
1 files changed, 7 insertions, 8 deletions
diff --git a/src/lib/ffmpeg_content.cc b/src/lib/ffmpeg_content.cc
index 7834cb76e..cc95105e5 100644
--- a/src/lib/ffmpeg_content.cc
+++ b/src/lib/ffmpeg_content.cc
@@ -73,7 +73,6 @@ FFmpegContent::FFmpegContent (FFmpegContent const & o)
: Content (o)
, VideoContent (o)
, AudioContent (o)
- , boost::enable_shared_from_this<FFmpegContent> (o)
, _subtitle_streams (o._subtitle_streams)
, _subtitle_stream (o._subtitle_stream)
, _audio_streams (o._audio_streams)
@@ -148,11 +147,11 @@ FFmpegContent::examine (shared_ptr<Film> film, shared_ptr<Job> job, bool quick)
take_from_video_decoder (decoder);
- Changed (VideoContentProperty::VIDEO_LENGTH);
- Changed (FFmpegContentProperty::SUBTITLE_STREAMS);
- Changed (FFmpegContentProperty::SUBTITLE_STREAM);
- Changed (FFmpegContentProperty::AUDIO_STREAMS);
- Changed (FFmpegContentProperty::AUDIO_STREAM);
+ signal_changed (VideoContentProperty::VIDEO_LENGTH);
+ signal_changed (FFmpegContentProperty::SUBTITLE_STREAMS);
+ signal_changed (FFmpegContentProperty::SUBTITLE_STREAM);
+ signal_changed (FFmpegContentProperty::AUDIO_STREAMS);
+ signal_changed (FFmpegContentProperty::AUDIO_STREAM);
}
string
@@ -184,7 +183,7 @@ FFmpegContent::set_subtitle_stream (FFmpegSubtitleStream s)
_subtitle_stream = s;
}
- Changed (FFmpegContentProperty::SUBTITLE_STREAM);
+ signal_changed (FFmpegContentProperty::SUBTITLE_STREAM);
}
void
@@ -195,7 +194,7 @@ FFmpegContent::set_audio_stream (FFmpegAudioStream s)
_audio_stream = s;
}
- Changed (FFmpegContentProperty::AUDIO_STREAM);
+ signal_changed (FFmpegContentProperty::AUDIO_STREAM);
}
ContentAudioFrame