X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplaylist.h;h=d9c035ac77b2b628113098c4cf1e9ee32fd22f84;hb=f227d182fa5a829fdeabf9eca8f33da5ce7f4e0d;hp=4295a3e3512da7de78a1444a5194f826e763a89f;hpb=2f61270d2726445f562efc0e4b33fa19ba235183;p=dcpomatic.git

diff --git a/src/lib/playlist.h b/src/lib/playlist.h
index 4295a3e35..d9c035ac7 100644
--- a/src/lib/playlist.h
+++ b/src/lib/playlist.h
@@ -20,23 +20,14 @@
 #ifndef DCPOMATIC_PLAYLIST_H
 #define DCPOMATIC_PLAYLIST_H
 
-#include <list>
-#include <boost/shared_ptr.hpp>
-#include <boost/enable_shared_from_this.hpp>
-#include "ffmpeg_content.h"
-#include "audio_mapping.h"
 #include "util.h"
+#include "frame_rate_change.h"
+#include <libcxml/cxml.h>
+#include <boost/shared_ptr.hpp>
+#include <boost/signals2.hpp>
+#include <list>
 
-class Content;
-class FFmpegContent;
-class FFmpegDecoder;
-class StillImageMagickContent;
-class StillImageMagickDecoder;
-class SndfileContent;
-class SndfileDecoder;
-class Job;
 class Film;
-class Region;
 
 struct ContentSorter
 {
@@ -54,7 +45,7 @@ public:
 	~Playlist ();
 
 	void as_xml (xmlpp::Node *);
-	void set_from_xml (boost::shared_ptr<const Film>, boost::shared_ptr<const cxml::Node>, int, std::list<std::string> &);
+	void set_from_xml (boost::shared_ptr<const Film>, cxml::ConstNodePtr, int, std::list<std::string> &);
 
 	void add (boost::shared_ptr<Content>);
 	void remove (boost::shared_ptr<Content>);
@@ -62,14 +53,12 @@ public:
 	void move_earlier (boost::shared_ptr<Content>);
 	void move_later (boost::shared_ptr<Content>);
 
-	bool has_subtitles () const;
-
 	ContentList content () const;
 
 	std::string video_identifier () const;
 
 	DCPTime length () const;
-	
+
 	int best_dcp_frame_rate () const;
 	DCPTime video_end () const;
 	FrameRateChange active_frame_rate_change (DCPTime, int dcp_frame_rate) const;
@@ -79,10 +68,14 @@ public:
 
 	void repeat (ContentList, int);
 
+	/** Emitted when content has been added to or removed from the playlist */
 	mutable boost::signals2::signal<void ()> Changed;
-	/** Third parameter is true if signals are currently being emitted frequently */
+	/** 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;
-	
+
 private:
 	void content_changed (boost::weak_ptr<Content>, int, bool);
 	void reconnect ();