From c1a45f6ed5c529dcafeec5949d9143a72e469a9e Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Fri, 7 Jul 2023 23:24:45 +0200
Subject: [PATCH] Move grok headers into src/lib/grok

---
 src/lib/{grok_context.h => grok/context.h}     | 11 ++++++-----
 src/lib/{grok_messenger.h => grok/messenger.h} |  0
 src/lib/j2k_encoder.h                          |  3 +--
 3 files changed, 7 insertions(+), 7 deletions(-)
 rename src/lib/{grok_context.h => grok/context.h} (97%)
 rename src/lib/{grok_messenger.h => grok/messenger.h} (100%)

diff --git a/src/lib/grok_context.h b/src/lib/grok/context.h
similarity index 97%
rename from src/lib/grok_context.h
rename to src/lib/grok/context.h
index 1f9726aae..7a447d35a 100644
--- a/src/lib/grok_context.h
+++ b/src/lib/grok/context.h
@@ -20,11 +20,12 @@
 
 #pragma once
 
-#include "config.h"
-#include "log.h"
-#include "dcpomatic_log.h"
-#include "writer.h"
-#include "grok_messenger.h"
+#include "../config.h"
+#include "../dcp_video.h"
+#include "../log.h"
+#include "../dcpomatic_log.h"
+#include "../writer.h"
+#include "messenger.h"
 
 class Film;
 using dcp::Data;
diff --git a/src/lib/grok_messenger.h b/src/lib/grok/messenger.h
similarity index 100%
rename from src/lib/grok_messenger.h
rename to src/lib/grok/messenger.h
diff --git a/src/lib/j2k_encoder.h b/src/lib/j2k_encoder.h
index 6df30a3f7..a3ea9f3e8 100644
--- a/src/lib/j2k_encoder.h
+++ b/src/lib/j2k_encoder.h
@@ -27,6 +27,7 @@
  *  @brief J2KEncoder class.
  */
 
+#include "grok/context.h"
 
 #include "cross.h"
 #include "dcp_video.h"
@@ -42,8 +43,6 @@
 #include <list>
 #include <stdint.h>
 
-#include "grok_context.h"
-
 class EncodeServerDescription;
 class Film;
 class Job;
-- 
2.30.2