From 0329a95dfdbcc185346c8431d6bb50df1a521100 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Sun, 7 May 2017 12:39:17 +0100
Subject: [PATCH] Remove unused code.

---
 src/lib/player.cc   | 17 ---------------
 src/lib/player.h    |  2 --
 test/player_test.cc | 51 ---------------------------------------------
 3 files changed, 70 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);
diff --git a/test/player_test.cc b/test/player_test.cc
index 4e6941294..5a31076f2 100644
--- a/test/player_test.cc
+++ b/test/player_test.cc
@@ -40,57 +40,6 @@ using std::list;
 using boost::shared_ptr;
 using boost::bind;
 
-static bool
-valid (Content const *)
-{
-	return true;
-}
-
-/** Player::overlaps */
-BOOST_AUTO_TEST_CASE (player_overlaps_test)
-{
-	shared_ptr<Film> film = new_test_film ("player_overlaps_test");
-	film->set_container (Ratio::from_id ("185"));
-
-	/* This content is 3s long */
-	shared_ptr<FFmpegContent> A (new FFmpegContent (film, "test/data/test.mp4"));
-	shared_ptr<FFmpegContent> B (new FFmpegContent (film, "test/data/test.mp4"));
-	shared_ptr<FFmpegContent> C (new FFmpegContent (film, "test/data/test.mp4"));
-
-	film->examine_and_add_content (A);
-	film->examine_and_add_content (B);
-	film->examine_and_add_content (C);
-	wait_for_jobs ();
-
-	BOOST_CHECK_EQUAL (A->full_length().get(), 288000);
-
-	A->set_position (DCPTime::from_seconds (0));
-	B->set_position (DCPTime::from_seconds (10));
-	C->set_position (DCPTime::from_seconds (20));
-
-	shared_ptr<Player> player (new Player (film, film->playlist ()));
-
-	list<shared_ptr<Piece> > o = player->overlaps (DCPTime::from_seconds (0), DCPTime::from_seconds (5), &valid);
-	BOOST_CHECK_EQUAL (o.size(), 1U);
-	BOOST_CHECK_EQUAL (o.front()->content, A);
-
-	o = player->overlaps (DCPTime::from_seconds (5), DCPTime::from_seconds (8), &valid);
-	BOOST_CHECK_EQUAL (o.size(), 0U);
-
-	o = player->overlaps (DCPTime::from_seconds (8), DCPTime::from_seconds (12), &valid);
-	BOOST_CHECK_EQUAL (o.size(), 1U);
-	BOOST_CHECK_EQUAL (o.front()->content, B);
-
-	o = player->overlaps (DCPTime::from_seconds (2), DCPTime::from_seconds (12), &valid);
-	BOOST_CHECK_EQUAL (o.size(), 2U);
-	BOOST_CHECK_EQUAL (o.front()->content, A);
-	BOOST_CHECK_EQUAL (o.back()->content, B);
-
-	o = player->overlaps (DCPTime::from_seconds (8), DCPTime::from_seconds (11), &valid);
-	BOOST_CHECK_EQUAL (o.size(), 1U);
-	BOOST_CHECK_EQUAL (o.front()->content, B);
-}
-
 static shared_ptr<AudioBuffers> accumulated;
 
 static void
-- 
2.30.2