Replace May/Done/NotDone signal sets with one signal and extend

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

diff --git a/src/lib/content.h b/src/lib/content.h
index 1e594e136bd50ca22246c623565f16c98e3de2e4..e8710ccb7405b82a837eececb05e770457839f0a 100644 (file)
--- a/src/lib/content.h
+++ b/src/lib/content.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2018 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -67,6 +67,7 @@ public:
        Content (boost::shared_ptr<const Film>, DCPTime);
        Content (boost::shared_ptr<const Film>, boost::filesystem::path);
        Content (boost::shared_ptr<const Film>, cxml::ConstNodePtr);
+       Content (boost::shared_ptr<const Film>, std::vector<boost::shared_ptr<Content> >);
        virtual ~Content () {}
 
        /** Examine the content to establish digest, frame rates and any other
@@ -177,13 +178,15 @@ public:
 
        std::list<UserProperty> user_properties () const;
 
-       boost::signals2::signal<void (boost::weak_ptr<Content>, int, bool)> Changed;
+       /* CHANGE_PENDING and CHANGE_CANCELLED may be emitted from any thread; CHANGE_DONE always from GUI thread */
+       boost::signals2::signal<void (ChangeType, boost::weak_ptr<Content>, int, bool)> Change;
 
        boost::shared_ptr<VideoContent> video;
        boost::shared_ptr<AudioContent> audio;
-       boost::shared_ptr<CaptionContent> caption;
+       std::list<boost::shared_ptr<TextContent> > text;
 
-       void signal_changed (int);
+       boost::shared_ptr<TextContent> only_text () const;
+       boost::shared_ptr<TextContent> text_of_original_type (TextType type) const;
 
 protected:
 
@@ -204,6 +207,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_change (ChangeType, int);
 
        std::string _digest;
        DCPTime _position;