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

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

diff --git a/src/lib/playlist.h b/src/lib/playlist.h
index 649887f7271f38b2c2fd9c4afdf0f63bb4f0d195..d55232dadb8898793417165ed3b955290a39db14 100644 (file)
--- a/src/lib/playlist.h
+++ b/src/lib/playlist.h
@@ -75,21 +75,13 @@ public:
        void repeat (ContentList, int);
 
        /** Emitted when content has been added to or removed from the playlist; implies OrderChanged */
-       mutable boost::signals2::signal<void ()> Changed;
+       mutable boost::signals2::signal<void (ChangeType)> Change;
        mutable boost::signals2::signal<void ()> OrderChanged;
 
-       mutable boost::signals2::signal<void ()> ContentMayChange;
-       /** Emitted when something about a piece of our content has changed;
-        *  these emissions include when the position of the content changes.
-        *  Third parameter is true if signals are currently being emitted frequently.
-        */
-       mutable boost::signals2::signal<void (boost::weak_ptr<Content>, int, bool)> ContentChanged;
-       mutable boost::signals2::signal<void ()> ContentNotChanged;
+       mutable boost::signals2::signal<void (ChangeType, boost::weak_ptr<Content>, int, bool)> ContentChange;
 
 private:
-       void content_may_change ();
-       void content_changed (boost::weak_ptr<Content>, int, bool);
-       void content_not_changed ();
+       void content_change (ChangeType, boost::weak_ptr<Content>, int, bool);
        void reconnect ();
 
        /** List of content.  Kept sorted in position order. */