X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fcontent_part.h;h=590be311289406c738b153423d5a6ab206a8d9e2;hp=eb96b13710e210593ca47c8911225362d5bfb084;hb=HEAD;hpb=5dbd022f3abb0ebab57fb67073a07ed60df902a6 diff --git a/src/lib/content_part.h b/src/lib/content_part.h index eb96b1371..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 "content.h" + #include "change_signaller.h" -#include +#include "content.h" #include + class Content; class Film; + class ContentPart { public: @@ -42,7 +44,7 @@ protected: void maybe_set (T& member, T new_value, int property) const { - ChangeSignaller 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 { - ChangeSignaller 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