X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Fplaylist.h;h=7dbf416041d8bf4bfa555bf45341ee01e04af812;hb=5f64a83b76dd015cc03d106061bf890d3d80d788;hp=330681c560ac583b1dca3d4ed8ed788f8ba86099;hpb=e5da5518951e91f7bfb80718c9cf546e3ece059c;p=dcpomatic.git

diff --git a/src/lib/playlist.h b/src/lib/playlist.h
index 330681c56..7dbf41604 100644
--- a/src/lib/playlist.h
+++ b/src/lib/playlist.h
@@ -29,8 +29,8 @@
 class Content;
 class FFmpegContent;
 class FFmpegDecoder;
-class ImageMagickContent;
-class ImageMagickDecoder;
+class StillImageMagickContent;
+class StillImageMagickDecoder;
 class SndfileContent;
 class SndfileDecoder;
 class Job;
@@ -60,24 +60,15 @@ public:
 
 	void add (boost::shared_ptr<Content>);
 	void remove (boost::shared_ptr<Content>);
+	void remove (ContentList);
 
 	bool has_subtitles () const;
 
-	typedef std::vector<boost::shared_ptr<Content> > ContentList;
-
-	ContentList content_without_loop () const;
-	ContentList content_with_loop () const;
+	ContentList content () const;
 
 	std::string video_identifier () const;
 
-	int loop () const {
-		return _loop;
-	}
-	
-	void set_loop (int l);
-
-	Time length_without_loop () const;
-	Time length_with_loop () const;
+	Time length () const;
 	
 	int best_dcp_frame_rate () const;
 	Time video_end () const;
@@ -85,6 +76,8 @@ public:
 	void set_sequence_video (bool);
 	void maybe_sequence_video ();
 
+	void repeat (ContentList, int);
+
 	mutable boost::signals2::signal<void ()> Changed;
 	/** Third parameter is true if signals are currently being emitted frequently */
 	mutable boost::signals2::signal<void (boost::weak_ptr<Content>, int, bool)> ContentChanged;
@@ -94,7 +87,6 @@ private:
 	void reconnect ();
 
 	ContentList _content;
-	int _loop;
 	bool _sequence_video;
 	bool _sequencing_video;
 	std::list<boost::signals2::connection> _content_connections;