Take Film pointer out of Content.

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

diff --git a/src/lib/playlist.h b/src/lib/playlist.h
index 649887f7271f38b2c2fd9c4afdf0f63bb4f0d195..d9140bdfb6d87ead55318bf8ffbac1a6c81dd92e 100644 (file)
--- a/src/lib/playlist.h
+++ b/src/lib/playlist.h
@@ -48,49 +48,42 @@ public:
        void as_xml (xmlpp::Node *, bool with_content_paths);
        void set_from_xml (boost::shared_ptr<const Film> film, cxml::ConstNodePtr node, int version, std::list<std::string>& notes);
 
-       void add (boost::shared_ptr<Content>);
+       void add (boost::shared_ptr<const Film> film, boost::shared_ptr<Content>);
        void remove (boost::shared_ptr<Content>);
        void remove (ContentList);
-       void move_earlier (boost::shared_ptr<Content>);
-       void move_later (boost::shared_ptr<Content>);
+       void move_earlier (boost::shared_ptr<const Film> film, boost::shared_ptr<Content>);
+       void move_later (boost::shared_ptr<const Film> film, boost::shared_ptr<Content>);
 
        ContentList content () const;
 
        std::string video_identifier () const;
 
-       DCPTime length () const;
+       DCPTime length (boost::shared_ptr<const Film> film) const;
        boost::optional<DCPTime> start () const;
-       int64_t required_disk_space (int j2k_bandwidth, int audio_channels, int audio_frame_rate) const;
+       int64_t required_disk_space (boost::shared_ptr<const Film> film, int j2k_bandwidth, int audio_channels, int audio_frame_rate) const;
 
        int best_video_frame_rate () const;
-       DCPTime video_end () const;
-       DCPTime text_end () const;
+       DCPTime video_end (boost::shared_ptr<const Film> film) const;
+       DCPTime text_end (boost::shared_ptr<const Film> film) const;
        FrameRateChange active_frame_rate_change (DCPTime, int dcp_frame_rate) const;
-       std::string content_summary (DCPTimePeriod period) const;
+       std::string content_summary (boost::shared_ptr<const Film> film, DCPTimePeriod period) const;
        std::pair<double, double> speed_up_range (int dcp_video_frame_rate) const;
 
        void set_sequence (bool);
-       void maybe_sequence ();
+       void maybe_sequence (boost::shared_ptr<const Film> film);
 
-       void repeat (ContentList, int);
+       void repeat (boost::shared_ptr<const Film> film, 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 reconnect ();
+       void content_change (boost::weak_ptr<const Film>, ChangeType, boost::weak_ptr<Content>, int, bool);
+       void disconnect ();
+       void reconnect (boost::shared_ptr<const Film> film);
 
        /** List of content.  Kept sorted in position order. */
        ContentList _content;