X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fcontent_part.h;h=590be311289406c738b153423d5a6ab206a8d9e2;hb=f5c1d56e9a15975f587a8d9c5255aea608d8abe9;hp=58833655fb5dcb9d503b1e0fc2f87ef8f62c1f67;hpb=1fe6bd7f8ba059322b8357b2210f0fd590567ce2;p=dcpomatic.git diff --git a/src/lib/content_part.h b/src/lib/content_part.h index 58833655f..590be3112 100644 --- a/src/lib/content_part.h +++ b/src/lib/content_part.h @@ -1,6 +1,5 @@ - /* - Copyright (C) 2016 Carl Hetherington + Copyright (C) 2016-2021 Carl Hetherington This file is part of DCP-o-matic. @@ -19,17 +18,20 @@ */ + #ifndef DCPOMATIC_CONTENT_PART_H #define DCPOMATIC_CONTENT_PART_H + +#include "change_signaller.h" #include "content.h" -#include "content_change.h" -#include #include + class Content; class Film; + class ContentPart { public: @@ -42,7 +44,7 @@ protected: void maybe_set (T& member, T new_value, int property) const { - ContentChange cc (_parent, property); + ContentChangeSignaller cc (_parent, property); { boost::mutex::scoped_lock lm (_mutex); if (member == new_value) { @@ -57,7 +59,7 @@ protected: void maybe_set (boost::optional& member, T new_value, int property) const { - ContentChange cc (_parent, property); + ContentChangeSignaller cc (_parent, property); { boost::mutex::scoped_lock lm (_mutex); if (member && member.get() == new_value) { @@ -72,4 +74,5 @@ protected: mutable boost::mutex _mutex; }; + #endif