More fixes for errors / crashes / misbehaviour with content changes

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

diff --git a/src/lib/content.h b/src/lib/content.h
index 23afa2243046d85db3ccbb9ffe823ea58d6905b2..c9edf6e22628fcdca99af1c1c16ed2dbc3caa2dd 100644 (file)
--- a/src/lib/content.h
+++ b/src/lib/content.h
@@ -178,8 +178,15 @@ public:
 
        std::list<UserProperty> user_properties () const;
 
+       /* May be emitted from any thread */
+       boost::signals2::signal<void ()> MayChange;
+
+       /* Emitted from the GUI thread */
        boost::signals2::signal<void (boost::weak_ptr<Content>, int, bool)> Changed;
 
+       /* May be emitted from any thread */
+       boost::signals2::signal<void ()> NotChanged;
+
        boost::shared_ptr<VideoContent> video;
        boost::shared_ptr<AudioContent> audio;
        std::list<boost::shared_ptr<TextContent> > text;
@@ -187,8 +194,6 @@ public:
        boost::shared_ptr<TextContent> only_text () const;
        boost::shared_ptr<TextContent> text_of_original_type (TextType type) const;
 
-       void signal_changed (int);
-
 protected:
 
        virtual void add_properties (std::list<UserProperty> &) const;
@@ -208,6 +213,9 @@ private:
        friend struct best_dcp_frame_rate_test_single;
        friend struct best_dcp_frame_rate_test_double;
        friend struct audio_sampling_rate_test;
+       friend class ContentChange;
+
+       void signal_changed (int);
 
        std::string _digest;
        DCPTime _position;