summaryrefslogtreecommitdiff
path: root/src/lib/butler.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2021-01-31 23:47:14 +0100
committerCarl Hetherington <cth@carlh.net>2021-01-31 23:47:14 +0100
commite0255a64d22440d718e5512f34a4f21f0d37a21b (patch)
tree61927018d28794c7c32c238bc37259bfddb2f01c /src/lib/butler.h
parent8fedaaa75c4586a4cc7ffb393bd71d1fdb091dc8 (diff)
Use enum class for Film::Property.
Diffstat (limited to 'src/lib/butler.h')
-rw-r--r--src/lib/butler.h13
1 files changed, 7 insertions, 6 deletions
diff --git a/src/lib/butler.h b/src/lib/butler.h
index 49a57a826..8c7f554cb 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,15 +18,16 @@
*/
-#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;