Hence Player does not need Playlist.

4 files changed, 7 insertions, 11 deletions

diff --git a/src/lib/analyse_audio_job.cc b/src/lib/analyse_audio_job.cc
index b17dd07dc..8800e2657 100644
--- a/src/lib/analyse_audio_job.cc
+++ b/src/lib/analyse_audio_job.cc
@@ -62,7 +62,7 @@ AnalyseAudioJob::json_name () const
 void
 AnalyseAudioJob::run ()
 {
-	shared_ptr<Player> player (new Player (_film, _playlist));
+	shared_ptr<Player> player (new Player (_film));
 	player->set_ignore_video ();
 	
 	int64_t const len = _film->length().frames (_film->audio_frame_rate());
diff --git a/src/lib/film.cc b/src/lib/film.cc
index 19aa6ae9b..d650fa3d3 100644
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -898,7 +898,7 @@ Film::cpls () const
 shared_ptr<Player>
 Film::make_player () const
 {
-	return shared_ptr<Player> (new Player (shared_from_this (), _playlist));
+	return shared_ptr<Player> (new Player (shared_from_this ()));
 }
 
 void
diff --git a/src/lib/player.cc b/src/lib/player.cc
index 235cc8bda..56e2d2749 100644
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -30,7 +30,6 @@
 #include "subrip_decoder.h"
 #include "subrip_content.h"
 #include "dcp_content.h"
-#include "playlist.h"
 #include "job.h"
 #include "image.h"
 #include "raw_image_proxy.h"
@@ -69,9 +68,8 @@ using boost::weak_ptr;
 using boost::dynamic_pointer_cast;
 using boost::optional;
 
-Player::Player (shared_ptr<const Film> f, shared_ptr<const Playlist> p)
+Player::Player (shared_ptr<const Film> f)
 	: _film (f)
-	, _playlist (p)
 	, _have_valid_pieces (false)
 	, _ignore_video (false)
 	, _burn_subtitles (f->burn_subtitles ())
@@ -89,7 +87,7 @@ Player::setup_pieces ()
 	list<shared_ptr<Piece> > old_pieces = _pieces;
 	_pieces.clear ();
 
-	ContentList content = _playlist->content ();
+	ContentList content = _film->content ();
 
 	for (ContentList::iterator i = content.begin(); i != content.end(); ++i) {
 
diff --git a/src/lib/player.h b/src/lib/player.h
index a9504ba05..e515fced3 100644
--- a/src/lib/player.h
+++ b/src/lib/player.h
@@ -20,7 +20,6 @@
 #ifndef DCPOMATIC_PLAYER_H
 #define DCPOMATIC_PLAYER_H
 
-#include "playlist.h"
 #include "content.h"
 #include "film.h"
 #include "rect.h"
@@ -37,7 +36,6 @@
 
 class Job;
 class Film;
-class Playlist;
 class AudioContent;
 class Piece;
 class Image;
@@ -45,6 +43,7 @@ class Decoder;
 class Resampler;
 class PlayerVideo;
 class ImageProxy;
+class Font;
  
 class PlayerStatistics
 {
@@ -79,12 +78,12 @@ public:
 };
 
 /** @class Player
- *  @brief A class which can `play' a Playlist.
+ *  @brief A class which can `play' a Film.
  */
 class Player : public boost::enable_shared_from_this<Player>, public boost::noncopyable
 {
 public:
-	Player (boost::shared_ptr<const Film>, boost::shared_ptr<const Playlist>);
+	Player (boost::shared_ptr<const Film>);
 
 	std::list<boost::shared_ptr<PlayerVideo> > get_video (DCPTime time, bool accurate);
 	boost::shared_ptr<AudioBuffers> get_audio (DCPTime time, DCPTime length, bool accurate);
@@ -147,7 +146,6 @@ private:
 	}
 	
 	boost::shared_ptr<const Film> _film;
-	boost::shared_ptr<const Playlist> _playlist;
 
 	/** Our pieces are ready to go; if this is false the pieces must be (re-)created before they are used */
 	bool _have_valid_pieces;