summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2023-09-26 13:32:00 +0200
committerCarl Hetherington <cth@carlh.net>2023-12-16 02:07:38 +0100
commitf8b932e0e9a8f33cff0edff0f89e86ae974f3e8e (patch)
treeda7898f2caccce529565db4f3efe87ad3139b2f7 /src/lib
parent050a47be167ad4d48ea1a971f28291ba085ee58f (diff)
Forward-declare grk_plugin stuff.
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/grok_j2k_encoder_thread.cc2
-rw-r--r--src/lib/j2k_encoder.cc1
-rw-r--r--src/lib/j2k_encoder.h8
3 files changed, 8 insertions, 3 deletions
diff --git a/src/lib/grok_j2k_encoder_thread.cc b/src/lib/grok_j2k_encoder_thread.cc
index 8d0dee5a9..d5256619d 100644
--- a/src/lib/grok_j2k_encoder_thread.cc
+++ b/src/lib/grok_j2k_encoder_thread.cc
@@ -1,6 +1,8 @@
+#include "config.h"
#include "cross.h"
#include "dcpomatic_log.h"
#include "dcp_video.h"
+#include "grok/context.h"
#include "grok_j2k_encoder_thread.h"
#include "j2k_encoder.h"
#include "scope_guard.h"
diff --git a/src/lib/j2k_encoder.cc b/src/lib/j2k_encoder.cc
index 1a96eb942..0ed7d20ac 100644
--- a/src/lib/j2k_encoder.cc
+++ b/src/lib/j2k_encoder.cc
@@ -34,6 +34,7 @@
#include "film.h"
#include "cpu_j2k_encoder_thread.h"
#ifdef DCPOMATIC_GROK
+#include "grok/context.h"
#include "grok_j2k_encoder_thread.h"
#endif
#include "remote_j2k_encoder_thread.h"
diff --git a/src/lib/j2k_encoder.h b/src/lib/j2k_encoder.h
index 913beb5a9..0dbe654a4 100644
--- a/src/lib/j2k_encoder.h
+++ b/src/lib/j2k_encoder.h
@@ -32,9 +32,6 @@
#include "enum_indexed_vector.h"
#include "event_history.h"
#include "exception_store.h"
-#ifdef DCPOMATIC_GROK
-#include "grok/context.h"
-#endif
#include "j2k_encoder_thread.h"
#include "writer.h"
#include <boost/optional.hpp>
@@ -52,6 +49,11 @@ class Film;
class Job;
class PlayerVideo;
+namespace grk_plugin {
+ struct DcpomaticContext;
+ struct GrokContext;
+}
+
struct local_threads_created_and_destroyed;
struct remote_threads_created_and_destroyed;
struct frames_not_lost_when_threads_disappear;