Extract common code out into kdm_for_screen()

[dcpomatic.git] / src / lib / content_part.h

diff --git a/src/lib/content_part.h b/src/lib/content_part.h
index d3b9b310d97747a31af4fe3ebfafb02a03df50a3..eb96b13710e210593ca47c8911225362d5bfb084 100644 (file)
--- a/src/lib/content_part.h
+++ b/src/lib/content_part.h
@@ -1,3 +1,4 @@
+
 /*
     Copyright (C) 2016 Carl Hetherington <cth@carlh.net>
 
@@ -22,6 +23,7 @@
 #define DCPOMATIC_CONTENT_PART_H
 
 #include "content.h"
+#include "change_signaller.h"
 #include <boost/weak_ptr.hpp>
 #include <boost/thread/mutex.hpp>
 
@@ -31,7 +33,7 @@ class Film;
 class ContentPart
 {
 public:
-       ContentPart (Content* parent)
+       explicit ContentPart (Content* parent)
                : _parent (parent)
        {}
 
@@ -40,28 +42,30 @@ protected:
        void
        maybe_set (T& member, T new_value, int property) const
        {
+               ChangeSignaller<Content> cc (_parent, property);
                {
                        boost::mutex::scoped_lock lm (_mutex);
                        if (member == new_value) {
+                               cc.abort ();
                                return;
                        }
                        member = new_value;
                }
-               _parent->signal_changed (property);
        }
 
        template <class T>
        void
        maybe_set (boost::optional<T>& member, T new_value, int property) const
        {
+               ChangeSignaller<Content> cc (_parent, property);
                {
                        boost::mutex::scoped_lock lm (_mutex);
                        if (member && member.get() == new_value) {
+                               cc.abort ();
                                return;
                        }
                        member = new_value;
                }
-               _parent->signal_changed (property);
        }
 
        Content* _parent;