summaryrefslogtreecommitdiff
path: root/src/lib/playlist.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-05-23 17:18:49 +0100
committerCarl Hetherington <cth@carlh.net>2013-05-23 17:18:49 +0100
commit64a2f1bb6a7b972607fa363631ef7a47444e8217 (patch)
tree020c028a93f113e372e70f485857ce04dea5db3d /src/lib/playlist.h
parent8c6fe8e1e8c8f6d5932606f2a5b6e1b87681ae38 (diff)
Various bits and pieces.
Diffstat (limited to 'src/lib/playlist.h')
-rw-r--r--src/lib/playlist.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/playlist.h b/src/lib/playlist.h
index e8cac0247..aff6017fa 100644
--- a/src/lib/playlist.h
+++ b/src/lib/playlist.h
@@ -61,7 +61,7 @@ public:
~Playlist ();
void as_xml (xmlpp::Node *);
- void set_from_xml (boost::shared_ptr<const cxml::Node>);
+ void set_from_xml (boost::shared_ptr<const Film>, boost::shared_ptr<const cxml::Node>);
void add (boost::shared_ptr<Content>);
void remove (boost::shared_ptr<Content>);
@@ -83,7 +83,7 @@ public:
void set_loop (int l);
- Time length (boost::shared_ptr<const Film>) const;
+ Time length () const;
int best_dcp_frame_rate () const;
mutable boost::signals2::signal<void ()> Changed;