projects
/
libdcp.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
a1e7f77
)
Cleanup: include sorting.
author
Carl Hetherington
<cth@carlh.net>
Tue, 25 Jul 2023 12:58:02 +0000
(14:58 +0200)
committer
Carl Hetherington
<cth@carlh.net>
Tue, 25 Jul 2023 13:21:39 +0000
(15:21 +0200)
src/mono_picture_asset.cc
patch
|
blob
|
history
src/picture_asset.cc
patch
|
blob
|
history
src/reel.cc
patch
|
blob
|
history
src/stereo_picture_asset.cc
patch
|
blob
|
history
src/subtitle.cc
patch
|
blob
|
history
diff --git
a/src/mono_picture_asset.cc
b/src/mono_picture_asset.cc
index b58a5d89a380b291ed5352340b1e4cd5559cdee0..934d3aa9af310167861bcd0b2972a4b8b9e510f7 100644
(file)
--- a/
src/mono_picture_asset.cc
+++ b/
src/mono_picture_asset.cc
@@
-37,13
+37,13
@@
*/
*/
+#include "compose.hpp"
+#include "dcp_assert.h"
+#include "exceptions.h"
#include "mono_picture_asset.h"
#include "mono_picture_asset.h"
-#include "mono_picture_asset_writer.h"
#include "mono_picture_asset_reader.h"
#include "mono_picture_asset_reader.h"
-#include "exceptions.h"
-#include "dcp_assert.h"
+#include "mono_picture_asset_writer.h"
#include "mono_picture_frame.h"
#include "mono_picture_frame.h"
-#include "compose.hpp"
#include <asdcp/AS_DCP.h>
#include <asdcp/KM_fileio.h>
#include <asdcp/AS_DCP.h>
#include <asdcp/KM_fileio.h>
diff --git
a/src/picture_asset.cc
b/src/picture_asset.cc
index 56f383e08e4a1e20924d7fd75b74571813f5f0aa..426dbdb1312ae4475c492a5ccb38682ddf496f38 100644
(file)
--- a/
src/picture_asset.cc
+++ b/
src/picture_asset.cc
@@
-37,14
+37,14
@@
*/
*/
-#include "
picture_asset.h
"
-#include "
util
.h"
+#include "
compose.hpp
"
+#include "
dcp_assert
.h"
#include "exceptions.h"
#include "exceptions.h"
+#include "j2k_transcode.h"
#include "openjpeg_image.h"
#include "openjpeg_image.h"
+#include "picture_asset.h"
#include "picture_asset_writer.h"
#include "picture_asset_writer.h"
-#include "dcp_assert.h"
-#include "compose.hpp"
-#include "j2k_transcode.h"
+#include "util.h"
#include <asdcp/AS_DCP.h>
#include <asdcp/KM_fileio.h>
#include <libxml++/nodes/element.h>
#include <asdcp/AS_DCP.h>
#include <asdcp/KM_fileio.h>
#include <libxml++/nodes/element.h>
diff --git
a/src/reel.cc
b/src/reel.cc
index 454028cd0f31f5320c42121c727c24a505a8141a..33a852cce6a5c22c5dd1d7aba10f65434959c513 100644
(file)
--- a/
src/reel.cc
+++ b/
src/reel.cc
@@
-37,28
+37,28
@@
*/
*/
-#include "
reel
.h"
-#include "
util
.h"
-#include "
pictur
e_asset.h"
+#include "
decrypted_kdm
.h"
+#include "
decrypted_kdm_key
.h"
+#include "
interop_subtitl
e_asset.h"
#include "mono_picture_asset.h"
#include "mono_picture_asset.h"
-#include "stereo_picture_asset.h"
-#include "sound_asset.h"
-#include "subtitle_asset.h"
-#include "reel_mono_picture_asset.h"
-#include "reel_stereo_picture_asset.h"
-#include "reel_sound_asset.h"
+#include "picture_asset.h"
+#include "reel.h"
+#include "reel_atmos_asset.h"
+#include "reel_closed_caption_asset.h"
#include "reel_interop_closed_caption_asset.h"
#include "reel_interop_subtitle_asset.h"
#include "reel_interop_closed_caption_asset.h"
#include "reel_interop_subtitle_asset.h"
+#include "reel_markers_asset.h"
+#include "reel_mono_picture_asset.h"
#include "reel_smpte_closed_caption_asset.h"
#include "reel_smpte_subtitle_asset.h"
#include "reel_smpte_closed_caption_asset.h"
#include "reel_smpte_subtitle_asset.h"
+#include "reel_sound_asset.h"
+#include "reel_stereo_picture_asset.h"
#include "reel_subtitle_asset.h"
#include "reel_subtitle_asset.h"
-#include "reel_markers_asset.h"
-#include "decrypted_kdm_key.h"
-#include "decrypted_kdm.h"
-#include "interop_subtitle_asset.h"
#include "smpte_subtitle_asset.h"
#include "smpte_subtitle_asset.h"
-#include "reel_atmos_asset.h"
-#include "reel_closed_caption_asset.h"
+#include "sound_asset.h"
+#include "stereo_picture_asset.h"
+#include "subtitle_asset.h"
+#include "util.h"
#include <libxml++/nodes/element.h>
#include <stdint.h>
#include <libxml++/nodes/element.h>
#include <stdint.h>
diff --git
a/src/stereo_picture_asset.cc
b/src/stereo_picture_asset.cc
index 35e3909348daf94740416b6f25bb149359655291..193829024683808dcac50616006c898b6721c593 100644
(file)
--- a/
src/stereo_picture_asset.cc
+++ b/
src/stereo_picture_asset.cc
@@
-37,12
+37,12
@@
*/
*/
-#include "stereo_picture_asset.h"
-#include "stereo_picture_frame.h"
+#include "dcp_assert.h"
#include "exceptions.h"
#include "exceptions.h"
-#include "stereo_picture_asset
_writer
.h"
+#include "stereo_picture_asset.h"
#include "stereo_picture_asset_reader.h"
#include "stereo_picture_asset_reader.h"
-#include "dcp_assert.h"
+#include "stereo_picture_asset_writer.h"
+#include "stereo_picture_frame.h"
#include <asdcp/AS_DCP.h>
#include <asdcp/AS_DCP.h>
diff --git
a/src/subtitle.cc
b/src/subtitle.cc
index 65ea9ff5bcb269df71b608fae69153a24b4dccc4..ecf364646cc9a861b37e19ad4e257b7bd511c8ce 100644
(file)
--- a/
src/subtitle.cc
+++ b/
src/subtitle.cc
@@
-38,8
+38,8
@@
#include "compose.hpp"
#include "compose.hpp"
-#include "subtitle.h"
#include "dcp_time.h"
#include "dcp_time.h"
+#include "subtitle.h"
using std::shared_ptr;
using std::shared_ptr;