X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fbutler.h;h=1dba6e129839ab1ff9920bd1ee61d3cac622d2c3;hb=d3ecb8495a42d039b07313e393734c49fdc6be66;hp=87408646bc28e3e458e23f75757cc5a81b80da44;hpb=d6aeaf8dd1b3158689da7b75c7417c1838af9c95;p=dcpomatic.git

diff --git a/src/lib/butler.h b/src/lib/butler.h
index 87408646b..1dba6e129 100644
--- a/src/lib/butler.h
+++ b/src/lib/butler.h
@@ -19,6 +19,10 @@
 */
 
 
+#ifndef DCPOMATIC_BUTLER_H
+#define DCPOMATIC_BUTLER_H
+
+
 #include "audio_mapping.h"
 #include "audio_ring_buffers.h"
 #include "change_signaller.h"
@@ -46,7 +50,7 @@ public:
 
 	Butler (
 		std::weak_ptr<const Film> film,
-		std::shared_ptr<Player> player,
+		Player& player,
 		AudioMapping map,
 		int audio_channels,
 		std::function<AVPixelFormat (AVPixelFormat)> pixel_format,
@@ -101,7 +105,7 @@ private:
 	void seek_unlocked (dcpomatic::DCPTime position, bool accurate);
 
 	std::weak_ptr<const Film> _film;
-	std::shared_ptr<Player> _player;
+	Player& _player;
 	boost::thread _thread;
 
 	VideoRingBuffers _video;
@@ -152,3 +156,7 @@ private:
 	boost::signals2::scoped_connection _player_text_connection;
 	boost::signals2::scoped_connection _player_change_connection;
 };
+
+
+#endif
+