summaryrefslogtreecommitdiff
path: root/src/lib/content_part.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2018-08-20 23:01:14 +0100
committerCarl Hetherington <cth@carlh.net>2018-08-20 23:29:21 +0100
commit5dbd022f3abb0ebab57fb67073a07ed60df902a6 (patch)
tree25aaae8dcf0268d12e2cdc7e8b99ceb534aed55a /src/lib/content_part.h
parent0284a5328af3fb41d83d86b8a3b8fffd6d69ddc5 (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_part.h')
-rw-r--r--src/lib/content_part.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/content_part.h b/src/lib/content_part.h
index 58833655f..eb96b1371 100644
--- a/src/lib/content_part.h
+++ b/src/lib/content_part.h
@@ -23,7 +23,7 @@
#define DCPOMATIC_CONTENT_PART_H
#include "content.h"
-#include "content_change.h"
+#include "change_signaller.h"
#include <boost/weak_ptr.hpp>
#include <boost/thread/mutex.hpp>
@@ -42,7 +42,7 @@ protected:
void
maybe_set (T& member, T new_value, int property) const
{
- ContentChange cc (_parent, property);
+ ChangeSignaller<Content> cc (_parent, property);
{
boost::mutex::scoped_lock lm (_mutex);
if (member == new_value) {
@@ -57,7 +57,7 @@ protected:
void
maybe_set (boost::optional<T>& member, T new_value, int property) const
{
- ContentChange cc (_parent, property);
+ ChangeSignaller<Content> cc (_parent, property);
{
boost::mutex::scoped_lock lm (_mutex);
if (member && member.get() == new_value) {