diff options
| author | Carl Hetherington <cth@carlh.net> | 2018-08-20 23:01:14 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2018-08-20 23:29:21 +0100 |
| commit | 5dbd022f3abb0ebab57fb67073a07ed60df902a6 (patch) | |
| tree | 25aaae8dcf0268d12e2cdc7e8b99ceb534aed55a /src/lib/content.cc | |
| parent | 0284a5328af3fb41d83d86b8a3b8fffd6d69ddc5 (diff) | |
Make ContentChange into a generic ChangeSignaller and use it for Filmv2.13.44
changes, since we setup_pieces() in response to at least one of these and
hence we must know before it happens so we can suspend the butler and player.
Diffstat (limited to 'src/lib/content.cc')
| -rw-r--r-- | src/lib/content.cc | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/lib/content.cc b/src/lib/content.cc index ae0b08dcc..04bdc8126 100644 --- a/src/lib/content.cc +++ b/src/lib/content.cc @@ -23,6 +23,7 @@ */ #include "content.h" +#include "change_signaller.h" #include "util.h" #include "content_factory.h" #include "video_content.h" @@ -205,7 +206,7 @@ Content::set_position (DCPTime p) audio->modify_position (p); } - ContentChange cc (this, ContentProperty::POSITION); + ChangeSignaller<Content> cc (this, ContentProperty::POSITION); { boost::mutex::scoped_lock lm (_mutex); @@ -231,7 +232,7 @@ Content::set_trim_start (ContentTime t) audio->modify_trim_start (t); } - ContentChange cc (this, ContentProperty::TRIM_START); + ChangeSignaller<Content> cc (this, ContentProperty::TRIM_START); { boost::mutex::scoped_lock lm (_mutex); @@ -242,7 +243,7 @@ Content::set_trim_start (ContentTime t) void Content::set_trim_end (ContentTime t) { - ContentChange cc (this, ContentProperty::TRIM_END); + ChangeSignaller<Content> cc (this, ContentProperty::TRIM_END); { boost::mutex::scoped_lock lm (_mutex); @@ -310,7 +311,7 @@ Content::paths_valid () const void Content::set_path (boost::filesystem::path path) { - ContentChange cc (this, ContentProperty::PATH); + ChangeSignaller<Content> cc (this, ContentProperty::PATH); _paths.clear (); _paths.push_back (path); } @@ -318,7 +319,7 @@ Content::set_path (boost::filesystem::path path) void Content::set_paths (vector<boost::filesystem::path> paths) { - ContentChange cc (this, ContentProperty::PATH); + ChangeSignaller<Content> cc (this, ContentProperty::PATH); _paths = paths; } @@ -369,7 +370,7 @@ Content::reel_split_points () const void Content::set_video_frame_rate (double r) { - ContentChange cc (this, ContentProperty::VIDEO_FRAME_RATE); + ChangeSignaller<Content> cc (this, ContentProperty::VIDEO_FRAME_RATE); { boost::mutex::scoped_lock lm (_mutex); @@ -385,7 +386,7 @@ Content::set_video_frame_rate (double r) void Content::unset_video_frame_rate () { - ContentChange cc (this, ContentProperty::VIDEO_FRAME_RATE); + ChangeSignaller<Content> cc (this, ContentProperty::VIDEO_FRAME_RATE); { boost::mutex::scoped_lock lm (_mutex); |