X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplayer.h;h=1ef1f58b7bb693a76b875f3b30bd79be42d7c057;hb=c28b3d6f168607aca9995282b96647eb64a26dc9;hp=377e8bd18e5ae3634d4faa0848f19fbcee088082;hpb=8aeb741ccbe2edb528e98a431bf55459a6836a9b;p=dcpomatic.git

diff --git a/src/lib/player.h b/src/lib/player.h
index 377e8bd18..1ef1f58b7 100644
--- a/src/lib/player.h
+++ b/src/lib/player.h
@@ -23,7 +23,6 @@
 #include <list>
 #include <boost/shared_ptr.hpp>
 #include <boost/enable_shared_from_this.hpp>
-#include <libdcp/subtitle_asset.h>
 #include "playlist.h"
 #include "content.h"
 #include "film.h"
@@ -46,7 +45,7 @@ class Image;
 class PlayerImage
 {
 public:
-	PlayerImage (boost::shared_ptr<const Image>, Crop, libdcp::Size, libdcp::Size, Scaler const *);
+	PlayerImage (boost::shared_ptr<const Image>, Crop, dcp::Size, dcp::Size, Scaler const *);
 
 	void set_subtitle (boost::shared_ptr<const Image>, Position<int>);
 	
@@ -55,8 +54,8 @@ public:
 private:
 	boost::shared_ptr<const Image> _in;
 	Crop _crop;
-	libdcp::Size _inter_size;
-	libdcp::Size _out_size;
+	dcp::Size _inter_size;
+	dcp::Size _out_size;
 	Scaler const * _scaler;
 	boost::shared_ptr<const Image> _subtitle_image;
 	Position<int> _subtitle_position;
@@ -113,7 +112,7 @@ public:
 		return _video_position;
 	}
 
-	void set_video_container_size (libdcp::Size);
+	void set_video_container_size (dcp::Size);
 	void set_approximate_size ();
 
 	bool repeat_last_video ();
@@ -175,7 +174,7 @@ private:
 
 	AudioMerger<DCPTime, AudioFrame> _audio_merger;
 
-	libdcp::Size _video_container_size;
+	dcp::Size _video_container_size;
 	boost::shared_ptr<PlayerImage> _black_frame;
 
 	struct {