X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fbutler.h;h=a231fd0990bf75f8f4e0f8f5bfe4eab50f9bff26;hb=2e2f11b29651cffe37c64275dbd45c7563310020;hp=8c7f554cb800f4ef94a4a40278463748616cc8f8;hpb=e0255a64d22440d718e5512f34a4f21f0d37a21b;p=dcpomatic.git

diff --git a/src/lib/butler.h b/src/lib/butler.h
index 8c7f554cb..a231fd099 100644
--- a/src/lib/butler.h
+++ b/src/lib/butler.h
@@ -18,6 +18,7 @@
 
 */
 
+
 #include "audio_mapping.h"
 #include "audio_ring_buffers.h"
 #include "change_signaller.h"
@@ -29,10 +30,12 @@
 #include <boost/thread.hpp>
 #include <boost/thread/condition.hpp>
 
+
 class Player;
 class PlayerVideo;
 
-class Butler : public ExceptionStore, public boost::noncopyable
+
+class Butler : public ExceptionStore
 {
 public:
 	Butler (
@@ -40,7 +43,7 @@ public:
 		std::shared_ptr<Player> player,
 		AudioMapping map,
 		int audio_channels,
-		boost::function<AVPixelFormat (AVPixelFormat)> pixel_format,
+		std::function<AVPixelFormat (AVPixelFormat)> pixel_format,
 		VideoRange video_range,
 		bool aligned,
 		bool fast
@@ -48,6 +51,9 @@ public:
 
 	~Butler ();
 
+	Butler (Butler const&) = delete;
+	Butler& operator= (Butler const&) = delete;
+
 	void seek (dcpomatic::DCPTime position, bool accurate);
 
 	class Error {
@@ -116,7 +122,7 @@ private:
 
 	bool _disable_audio;
 
-	boost::function<AVPixelFormat (AVPixelFormat)> _pixel_format;
+	std::function<AVPixelFormat (AVPixelFormat)> _pixel_format;
 	VideoRange _video_range;
 	bool _aligned;
 	bool _fast;