From 3ee25c2fabd43040f9388efa89482b90cb4ccadc Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 1 Jun 2022 11:05:53 +0200 Subject: [PATCH] Rearrange some includes of dcpomatic_time.h --- src/lib/dcp_encoder.h | 1 + src/lib/ffmpeg_file_encoder.h | 1 + src/lib/player_text.h | 1 - src/lib/text_ring_buffers.h | 1 + src/lib/writer.h | 1 + 5 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/lib/dcp_encoder.h b/src/lib/dcp_encoder.h index 3d00e6e9f..e7514be98 100644 --- a/src/lib/dcp_encoder.h +++ b/src/lib/dcp_encoder.h @@ -21,6 +21,7 @@ #include "atmos_metadata.h" #include "dcp_text_track.h" +#include "dcpomatic_time.h" #include "encoder.h" #include "player_text.h" #include "types.h" diff --git a/src/lib/ffmpeg_file_encoder.h b/src/lib/ffmpeg_file_encoder.h index fc2b5c654..08be9255a 100644 --- a/src/lib/ffmpeg_file_encoder.h +++ b/src/lib/ffmpeg_file_encoder.h @@ -24,6 +24,7 @@ #include "audio_mapping.h" +#include "dcpomatic_time.h" #include "encoder.h" #include "event_history.h" #include "log.h" diff --git a/src/lib/player_text.h b/src/lib/player_text.h index 45c8bf589..36a63f3da 100644 --- a/src/lib/player_text.h +++ b/src/lib/player_text.h @@ -24,7 +24,6 @@ #include "bitmap_text.h" -#include "dcpomatic_time.h" #include "string_text.h" diff --git a/src/lib/text_ring_buffers.h b/src/lib/text_ring_buffers.h index 2014dacc5..1f366fc0b 100644 --- a/src/lib/text_ring_buffers.h +++ b/src/lib/text_ring_buffers.h @@ -24,6 +24,7 @@ #include "dcp_text_track.h" +#include "dcpomatic_time.h" #include "player_text.h" #include #include diff --git a/src/lib/writer.h b/src/lib/writer.h index 3e81b6448..67172b0d4 100644 --- a/src/lib/writer.h +++ b/src/lib/writer.h @@ -26,6 +26,7 @@ #include "atmos_metadata.h" #include "dcp_text_track.h" +#include "dcpomatic_time.h" #include "exception_store.h" #include "player_text.h" #include "types.h" -- 2.30.2