summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2025-09-15 18:00:43 +0200
committerCarl Hetherington <cth@carlh.net>2025-09-15 18:00:43 +0200
commit6735d3e88062d44433a1432bcc2f07ba1a610be4 (patch)
tree9537a031375ee8789c9190032b7b8207dd055471
parent18852c4b98272809f511b76a7167fcb62f3dec99 (diff)
Cleanup: rename frame_info.{cc,h} to j2k_frame_info.{cc,h}
-rw-r--r--src/lib/j2k_frame_info.cc (renamed from src/lib/frame_info.cc)2
-rw-r--r--src/lib/j2k_frame_info.h (renamed from src/lib/frame_info.h)0
-rw-r--r--src/lib/reel_writer.cc2
-rw-r--r--src/lib/writer.cc2
-rw-r--r--src/lib/wscript2
-rw-r--r--test/reel_writer_test.cc2
6 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/frame_info.cc b/src/lib/j2k_frame_info.cc
index e2382376c..0e83c61f0 100644
--- a/src/lib/frame_info.cc
+++ b/src/lib/j2k_frame_info.cc
@@ -19,7 +19,7 @@
*/
-#include "frame_info.h"
+#include "j2k_frame_info.h"
#include <string>
diff --git a/src/lib/frame_info.h b/src/lib/j2k_frame_info.h
index da9503248..da9503248 100644
--- a/src/lib/frame_info.h
+++ b/src/lib/j2k_frame_info.h
diff --git a/src/lib/reel_writer.cc b/src/lib/reel_writer.cc
index 01a798676..11224a9af 100644
--- a/src/lib/reel_writer.cc
+++ b/src/lib/reel_writer.cc
@@ -27,10 +27,10 @@
#include "digester.h"
#include "film.h"
#include "film_util.h"
-#include "frame_info.h"
#include "image.h"
#include "image_png.h"
#include "job.h"
+#include "j2k_frame_info.h"
#include "log.h"
#include "reel_writer.h"
#include "remembered_asset.h"
diff --git a/src/lib/writer.cc b/src/lib/writer.cc
index 80ffb2913..c61ccd4bb 100644
--- a/src/lib/writer.cc
+++ b/src/lib/writer.cc
@@ -30,8 +30,8 @@
#include "dcpomatic_log.h"
#include "film.h"
#include "film_util.h"
-#include "frame_info.h"
#include "job.h"
+#include "j2k_frame_info.h"
#include "log.h"
#include "ratio.h"
#include "reel_writer.h"
diff --git a/src/lib/wscript b/src/lib/wscript
index ce93b5824..990d11547 100644
--- a/src/lib/wscript
+++ b/src/lib/wscript
@@ -104,7 +104,6 @@ sources = """
fcpxml.cc
fcpxml_content.cc
fcpxml_decoder.cc
- frame_info.cc
file_group.cc
file_log.cc
filter_graph.cc
@@ -151,6 +150,7 @@ sources = """
job_manager.cc
j2k_encoder.cc
j2k_encoder_thread.cc
+ j2k_frame_info.cc
j2k_sync_encoder_thread.cc
json_server.cc
kdm_cli.cc
diff --git a/test/reel_writer_test.cc b/test/reel_writer_test.cc
index cb5ad349e..5d853d1c2 100644
--- a/test/reel_writer_test.cc
+++ b/test/reel_writer_test.cc
@@ -30,7 +30,7 @@
#include "lib/content_factory.h"
#include "lib/cross.h"
#include "lib/film.h"
-#include "lib/frame_info.h"
+#include "lib/j2k_frame_info.h"
#include "lib/reel_writer.h"
#include "lib/video_content.h"
#include "test.h"