projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
2abd882
)
Rearrange some includes of dcpomatic_time.h
author
Carl Hetherington
<cth@carlh.net>
Wed, 1 Jun 2022 09:05:53 +0000
(11:05 +0200)
committer
Carl Hetherington
<cth@carlh.net>
Mon, 6 Jun 2022 21:25:56 +0000
(23:25 +0200)
src/lib/dcp_encoder.h
patch
|
blob
|
history
src/lib/ffmpeg_file_encoder.h
patch
|
blob
|
history
src/lib/player_text.h
patch
|
blob
|
history
src/lib/text_ring_buffers.h
patch
|
blob
|
history
src/lib/writer.h
patch
|
blob
|
history
diff --git
a/src/lib/dcp_encoder.h
b/src/lib/dcp_encoder.h
index 3d00e6e9fc2e284ac25413a0817753c9780dfd28..e7514be98716ef48636cb3cc0479d03f8fa3d2bd 100644
(file)
--- 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 "atmos_metadata.h"
#include "dcp_text_track.h"
+#include "dcpomatic_time.h"
#include "encoder.h"
#include "player_text.h"
#include "types.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 fc2b5c654217f8b9963bae8d2b6d7695da29c198..08be9255af451dca68c016803eb2779df5cfff00 100644
(file)
--- a/
src/lib/ffmpeg_file_encoder.h
+++ b/
src/lib/ffmpeg_file_encoder.h
@@
-24,6
+24,7
@@
#include "audio_mapping.h"
#include "audio_mapping.h"
+#include "dcpomatic_time.h"
#include "encoder.h"
#include "event_history.h"
#include "log.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 45c8bf589f39339b35b5df491b96e25d43271c71..36a63f3dab0322d42c93b5e52167e64eab84ffd3 100644
(file)
--- a/
src/lib/player_text.h
+++ b/
src/lib/player_text.h
@@
-24,7
+24,6
@@
#include "bitmap_text.h"
#include "bitmap_text.h"
-#include "dcpomatic_time.h"
#include "string_text.h"
#include "string_text.h"
diff --git
a/src/lib/text_ring_buffers.h
b/src/lib/text_ring_buffers.h
index 2014dacc5e9886a30c00e69cbc735146b13928db..1f366fc0b946f0dcab848c23d68e9519331e6eb6 100644
(file)
--- a/
src/lib/text_ring_buffers.h
+++ b/
src/lib/text_ring_buffers.h
@@
-24,6
+24,7
@@
#include "dcp_text_track.h"
#include "dcp_text_track.h"
+#include "dcpomatic_time.h"
#include "player_text.h"
#include <boost/thread.hpp>
#include <utility>
#include "player_text.h"
#include <boost/thread.hpp>
#include <utility>
diff --git
a/src/lib/writer.h
b/src/lib/writer.h
index 3e81b6448a6ce8d6c88940cee4f784c81f398ba3..67172b0d4de94a8b655f23e5d8ed2c4554d35a27 100644
(file)
--- a/
src/lib/writer.h
+++ b/
src/lib/writer.h
@@
-26,6
+26,7
@@
#include "atmos_metadata.h"
#include "dcp_text_track.h"
#include "atmos_metadata.h"
#include "dcp_text_track.h"
+#include "dcpomatic_time.h"
#include "exception_store.h"
#include "player_text.h"
#include "types.h"
#include "exception_store.h"
#include "player_text.h"
#include "types.h"