X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fplay_test.cc;h=8ad2180b8adb341ee8c97536e5705c6a825f7a03;hb=e60bb3e51bd1508b149e6b8f6608f09b5196ae26;hp=1ba2e7d88338179e0f698d7aafae2304a34c4e27;hpb=9e758fddfb8bbadb1fc84e393daa815445d5e9d5;p=dcpomatic.git

diff --git a/test/play_test.cc b/test/play_test.cc
index 1ba2e7d88..8ad2180b8 100644
--- a/test/play_test.cc
+++ b/test/play_test.cc
@@ -51,7 +51,7 @@ public:
 	{
 		Video v;
 		v.content = _player->_last_video;
-		v.image = i->image ();
+		v.image = i->image (PIX_FMT_RGB24);
 		v.time = t;
 		_queue.push_front (v);
 	}
@@ -62,7 +62,7 @@ public:
 		if (_queue.empty ()) {
 			return optional<Video> ();
 		}
-		
+
 		Video v = _queue.back ();
 		_queue.pop_back ();
 		return v;
@@ -82,7 +82,7 @@ private:
 BOOST_AUTO_TEST_CASE (play_test)
 {
 	shared_ptr<Film> film = new_test_film ("play_test");
-	film->set_dcp_content_type (DCPContentType::from_dci_name ("FTR"));
+	film->set_dcp_content_type (DCPContentType::from_isdcf_name ("FTR"));
 	film->set_container (Ratio::from_id ("185"));
 	film->set_name ("play_test");
 
@@ -97,7 +97,7 @@ BOOST_AUTO_TEST_CASE (play_test)
 	wait_for_jobs ();
 
 	BOOST_CHECK_EQUAL (B->video_length_after_3d_combine(), 16);
-	
+
 	/* Film should have been set to 25fps */
 	BOOST_CHECK_EQUAL (film->video_frame_rate(), 25);
 
@@ -105,7 +105,7 @@ BOOST_AUTO_TEST_CASE (play_test)
 	/* A is 16 frames long at 25 fps */
 	BOOST_CHECK_EQUAL (B->position(), 16 * TIME_HZ / 25);
 
-	shared_ptr<Player> player = film->make_player ();
+	shared_ptr<Player> player (new Player (film));
 	PlayerWrapper wrap (player);
 	/* Seek and audio don't get on at the moment */
 	player->disable_audio ();
@@ -120,7 +120,7 @@ BOOST_AUTO_TEST_CASE (play_test)
 		}
 	}
 
-	player->seek (10 * TIME_HZ / 25, true);
+	wrap.seek (10 * TIME_HZ / 25, true);
 	optional<Video> v = wrap.get_video ();
 	BOOST_CHECK (v);
 	BOOST_CHECK_EQUAL (v.get().time, 10 * TIME_HZ / 25);