diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-06-17 16:05:42 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-06-17 16:05:42 +0100 |
| commit | c13757391e75cdde7a9cef947c921b7a9ad08003 (patch) | |
| tree | 6a54bcf79031f776c255496a2d94728c88da57b8 /src/lib/player.cc | |
| parent | fc7e80f0808b3729b4ef111b1a19214b0d3c5014 (diff) | |
Hence Player does not need Playlist.
Diffstat (limited to 'src/lib/player.cc')
| -rw-r--r-- | src/lib/player.cc | 6 |
1 files changed, 2 insertions, 4 deletions
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) { |