diff options
| author | Carl Hetherington <cth@carlh.net> | 2017-05-07 12:39:17 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2017-05-07 12:39:17 +0100 |
| commit | 0329a95dfdbcc185346c8431d6bb50df1a521100 (patch) | |
| tree | 3f3813f67879131d3802715e78d52c10c0e6f748 /src/lib | |
| parent | f39c4baa02a51571d08ea87f441ae9c2abafe694 (diff) | |
Remove unused code.
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/player.cc | 17 | ||||
| -rw-r--r-- | src/lib/player.h | 2 |
2 files changed, 0 insertions, 19 deletions
diff --git a/src/lib/player.cc b/src/lib/player.cc index addaa6cac..858e93c04 100644 --- a/src/lib/player.cc +++ b/src/lib/player.cc @@ -507,23 +507,6 @@ Player::get_reel_assets () return a; } -list<shared_ptr<Piece> > -Player::overlaps (DCPTime from, DCPTime to, boost::function<bool (Content *)> valid) -{ - if (!_have_valid_pieces) { - setup_pieces (); - } - - list<shared_ptr<Piece> > overlaps; - BOOST_FOREACH (shared_ptr<Piece> i, _pieces) { - if (valid (i->content.get ()) && i->content->position() < to && i->content->end() > from) { - overlaps.push_back (i); - } - } - - return overlaps; -} - bool Player::pass () { diff --git a/src/lib/player.h b/src/lib/player.h index 18b47043a..6d4f6836f 100644 --- a/src/lib/player.h +++ b/src/lib/player.h @@ -85,7 +85,6 @@ public: private: friend class PlayerWrapper; friend class Piece; - friend struct player_overlaps_test; friend struct player_time_calculation_test1; friend struct player_time_calculation_test2; friend struct player_time_calculation_test3; @@ -103,7 +102,6 @@ private: ContentTime dcp_to_content_time (boost::shared_ptr<const Piece> piece, DCPTime t) const; DCPTime content_time_to_dcp (boost::shared_ptr<const Piece> piece, ContentTime t) const; boost::shared_ptr<PlayerVideo> black_player_video_frame () const; - std::list<boost::shared_ptr<Piece> > overlaps (DCPTime from, DCPTime to, boost::function<bool (Content *)> valid); void video (boost::weak_ptr<Piece>, ContentVideo); void audio (boost::weak_ptr<Piece>, AudioStreamPtr, ContentAudio); void image_subtitle_start (boost::weak_ptr<Piece>, ContentImageSubtitle); |
