diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-05-27 21:54:50 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-05-27 21:54:50 +0100 |
| commit | 6166c045a8de42edd09924fdd995a77a3b753e54 (patch) | |
| tree | 91da3177d9802c0b9da84607eb3c3831ffc975b5 /src/lib/imagemagick_content.cc | |
| parent | a4642b6463430175d0f4e1ca284a4bf08bcf4de9 (diff) | |
Support for keeping video in sequence when changing lengths; tie selection in timeline with that in the editor.
Diffstat (limited to 'src/lib/imagemagick_content.cc')
| -rw-r--r-- | src/lib/imagemagick_content.cc | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/src/lib/imagemagick_content.cc b/src/lib/imagemagick_content.cc index ac04fb15b..a4777e3cd 100644 --- a/src/lib/imagemagick_content.cc +++ b/src/lib/imagemagick_content.cc @@ -75,15 +75,8 @@ ImageMagickContent::examine (shared_ptr<Job> job) shared_ptr<ImageMagickDecoder> decoder (new ImageMagickDecoder (film, shared_from_this())); - { - boost::mutex::scoped_lock lm (_mutex); - /* Initial length */ - _video_length = Config::instance()->default_still_length() * 24; - } - + set_video_length (Config::instance()->default_still_length() * 24); take_from_video_decoder (decoder); - - signal_changed (VideoContentProperty::VIDEO_LENGTH); } shared_ptr<Content> @@ -100,7 +93,7 @@ ImageMagickContent::set_video_length (ContentVideoFrame len) _video_length = len; } - signal_changed (VideoContentProperty::VIDEO_LENGTH); + signal_changed (ContentProperty::LENGTH); } Time |