X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fcontent_part.h;h=590be311289406c738b153423d5a6ab206a8d9e2;hb=0330b684fe616b465e65b67f7d995e659fa83fca;hp=a81334270edc369fa24f5b4a449ca6e180d78d28;hpb=dd9be86db6cde0afa5da0d1d1ac43b42e05dca26;p=dcpomatic.git diff --git a/src/lib/content_part.h b/src/lib/content_part.h index a81334270..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,16 +18,20 @@ */ + #ifndef DCPOMATIC_CONTENT_PART_H #define DCPOMATIC_CONTENT_PART_H -#include "content.h" + #include "change_signaller.h" +#include "content.h" #include + class Content; class Film; + class ContentPart { public: @@ -41,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) { @@ -56,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) { @@ -71,4 +74,5 @@ protected: mutable boost::mutex _mutex; }; + #endif