Change MagickImageProxy to FFmpegImageProxy and make it use FFmpeg

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

diff --git a/src/lib/playlist.h b/src/lib/playlist.h
index e84b51a73e84c91372fb132ca05e59de258ddba4..d55232dadb8898793417165ed3b955290a39db14 100644 (file)
--- a/src/lib/playlist.h
+++ b/src/lib/playlist.h
@@ -45,8 +45,8 @@ public:
        Playlist ();
        ~Playlist ();
 
-       void as_xml (xmlpp::Node *);
-       void set_from_xml (boost::shared_ptr<const Film>, cxml::ConstNodePtr, int, std::list<std::string> &);
+       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 remove (boost::shared_ptr<Content>);
@@ -64,9 +64,10 @@ public:
 
        int best_video_frame_rate () const;
        DCPTime video_end () const;
-       DCPTime subtitle_end () const;
+       DCPTime text_end () const;
        FrameRateChange active_frame_rate_change (DCPTime, int dcp_frame_rate) const;
        std::string content_summary (DCPTimePeriod period) const;
+       std::pair<double, double> speed_up_range (int dcp_video_frame_rate) const;
 
        void set_sequence (bool);
        void maybe_sequence ();
@@ -74,16 +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;
-       /** 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 (ChangeType, boost::weak_ptr<Content>, int, bool)> ContentChange;
 
 private:
-       void content_changed (boost::weak_ptr<Content>, int, bool);
+       void content_change (ChangeType, boost::weak_ptr<Content>, int, bool);
        void reconnect ();
 
        /** List of content.  Kept sorted in position order. */