X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=test%2Fclient_server_test.cc;fp=test%2Fclient_server_test.cc;h=8e4fb0e1867e845e644864012eae8812b2468183;hp=a459e6c71449721620c61ea473c8287b4facb446;hb=39bc73fe192f932ed6695eb87b19de446e8b4f55;hpb=bb0a36c3a6bea9cd1ebdde7b8a3a04765e317569

diff --git a/test/client_server_test.cc b/test/client_server_test.cc
index a459e6c71..8e4fb0e18 100644
--- a/test/client_server_test.cc
+++ b/test/client_server_test.cc
@@ -31,6 +31,9 @@
 #include "lib/image.h"
 #include "lib/cross.h"
 #include "lib/dcp_video_frame.h"
+#include "lib/scaler.h"
+#include "lib/player_video_frame.h"
+#include "lib/image_proxy.h"
 
 using std::list;
 using boost::shared_ptr;
@@ -75,17 +78,27 @@ BOOST_AUTO_TEST_CASE (client_server_test)
 		p += sub_image->stride()[0];
 	}
 
-	/* XXX */
-//	shared_ptr<Subtitle> subtitle (new Subtitle (Position<int> (50, 60), sub_image));
+	shared_ptr<PlayerVideoFrame> pvf (
+		new PlayerVideoFrame (
+			shared_ptr<ImageProxy> (new RawImageProxy (image)),
+			Crop (),
+			dcp::Size (1998, 1080),
+			dcp::Size (1998, 1080),
+			Scaler::from_id ("bicubic"),
+			EYES_BOTH,
+			PART_WHOLE,
+			ColourConversion ()
+			)
+		);
+
+	pvf->set_subtitle (PositionImage (sub_image, Position<int> (50, 60)));
 
 	shared_ptr<FileLog> log (new FileLog ("build/test/client_server_test.log"));
 
 	shared_ptr<DCPVideoFrame> frame (
 		new DCPVideoFrame (
-			image,
+			pvf,
 			0,
-			EYES_BOTH,
-			ColourConversion (),
 			24,
 			200000000,
 			RESOLUTION_2K,