X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fbutler.h;h=29966b956b2b491d7c7d82c85f2adc5128842927;hb=8963f0007af1a312017b9627c18b82ec2a577591;hp=49a57a826e4acdcad84c1568f5c3e059d7f00657;hpb=dd9be86db6cde0afa5da0d1d1ac43b42e05dca26;p=dcpomatic.git

diff --git a/src/lib/butler.h b/src/lib/butler.h
index 49a57a826..29966b956 100644
--- a/src/lib/butler.h
+++ b/src/lib/butler.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2016-2017 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2016-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,20 +18,21 @@
 
 */
 
-#include "video_ring_buffers.h"
-#include "audio_ring_buffers.h"
-#include "text_ring_buffers.h"
 #include "audio_mapping.h"
+#include "audio_ring_buffers.h"
+#include "change_signaller.h"
 #include "exception_store.h"
+#include "text_ring_buffers.h"
+#include "video_ring_buffers.h"
+#include <boost/asio.hpp>
+#include <boost/signals2.hpp>
 #include <boost/thread.hpp>
 #include <boost/thread/condition.hpp>
-#include <boost/signals2.hpp>
-#include <boost/asio.hpp>
 
 class Player;
 class PlayerVideo;
 
-class Butler : public ExceptionStore, public boost::noncopyable
+class Butler : public ExceptionStore
 {
 public:
 	Butler (
@@ -39,7 +40,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
@@ -47,6 +48,9 @@ public:
 
 	~Butler ();
 
+	Butler (Butler const&) = delete;
+	Butler& operator= (Butler const&) = delete;
+
 	void seek (dcpomatic::DCPTime position, bool accurate);
 
 	class Error {
@@ -115,7 +119,7 @@ private:
 
 	bool _disable_audio;
 
-	boost::function<AVPixelFormat (AVPixelFormat)> _pixel_format;
+	std::function<AVPixelFormat (AVPixelFormat)> _pixel_format;
 	VideoRange _video_range;
 	bool _aligned;
 	bool _fast;