Final tweaks and removal of Film::playlist().

[dcpomatic.git] / src / lib / film.cc

diff --git a/src/lib/film.cc b/src/lib/film.cc
index 19aa6ae9b344e36ef64277f19de0e21585ae49a3..f41371892963b1d22df478be6d2a1f15786d2d99 100644 (file)
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -249,12 +249,12 @@ Film::filename_safe_name () const
 }
 
 boost::filesystem::path
-Film::audio_analysis_path (shared_ptr<const Playlist> playlist) const
+Film::audio_analysis_path () const
 {
        boost::filesystem::path p = dir ("analysis");
 
        MD5Digester digester;
-       BOOST_FOREACH (shared_ptr<Content> i, playlist->content ()) {
+       BOOST_FOREACH (shared_ptr<Content> i, content ()) {
                shared_ptr<AudioContent> ac = dynamic_pointer_cast<AudioContent> (i);
                if (!ac) {
                        continue;
@@ -895,12 +895,6 @@ Film::cpls () const
        return out;
 }
 
-shared_ptr<Player>
-Film::make_player () const
-{
-       return shared_ptr<Player> (new Player (shared_from_this (), _playlist));
-}
-
 void
 Film::set_signed (bool s)
 {
@@ -922,12 +916,6 @@ Film::set_key (dcp::Key key)
        signal_changed (KEY);
 }
 
-shared_ptr<Playlist>
-Film::playlist () const
-{
-       return _playlist;
-}
-
 ContentList
 Film::content () const
 {
@@ -1232,3 +1220,15 @@ Film::audio_output_names () const
 
        return vector<string> (n.begin(), n.begin() + audio_channels ());
 }
+
+void
+Film::repeat_content (ContentList c, int n)
+{
+       _playlist->repeat (c, n);
+}
+
+void
+Film::remove_content (ContentList c)
+{
+       _playlist->remove (c);
+}