summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2024-08-14 00:11:18 +0200
committerCarl Hetherington <cth@carlh.net>2024-08-14 00:16:10 +0200
commit11456e09fd0a18ff9bd4c8421514b707d5d0c2fe (patch)
treea2657bbe0f3183dfb58e615918964b99d6b59ea6
parent0880ffd9eee7630fabc320024e6b293fb98b7b65 (diff)
Cleanup: header/using sorting.
-rw-r--r--src/lib/dcp_subtitle_content.cc9
-rw-r--r--src/lib/video_mxf_content.cc16
2 files changed, 14 insertions, 11 deletions
diff --git a/src/lib/dcp_subtitle_content.cc b/src/lib/dcp_subtitle_content.cc
index 9ca3750d1..d381ca7cb 100644
--- a/src/lib/dcp_subtitle_content.cc
+++ b/src/lib/dcp_subtitle_content.cc
@@ -18,19 +18,21 @@
*/
-#include "font.h"
+
#include "dcp_subtitle_content.h"
#include "film.h"
+#include "font.h"
#include "font_id_allocator.h"
#include "text_content.h"
-#include <dcp/raw_convert.h>
+#include <dcp/interop_load_font_node.h>
#include <dcp/interop_subtitle_asset.h>
+#include <dcp/raw_convert.h>
#include <dcp/smpte_subtitle_asset.h>
-#include <dcp/interop_load_font_node.h>
#include <libxml++/libxml++.h>
#include "i18n.h"
+
using std::dynamic_pointer_cast;
using std::list;
using std::make_shared;
@@ -39,6 +41,7 @@ using std::string;
using dcp::raw_convert;
using namespace dcpomatic;
+
DCPSubtitleContent::DCPSubtitleContent (boost::filesystem::path path)
: Content (path)
{
diff --git a/src/lib/video_mxf_content.cc b/src/lib/video_mxf_content.cc
index eeee6222c..822d37214 100644
--- a/src/lib/video_mxf_content.cc
+++ b/src/lib/video_mxf_content.cc
@@ -19,25 +19,25 @@
*/
-#include "video_mxf_examiner.h"
-#include "video_mxf_content.h"
-#include "video_content.h"
-#include "job.h"
-#include "film.h"
#include "compose.hpp"
+#include "film.h"
+#include "job.h"
+#include "video_content.h"
+#include "video_mxf_content.h"
+#include "video_mxf_examiner.h"
#include <asdcp/KM_log.h>
+#include <dcp/exceptions.h>
#include <dcp/mono_j2k_picture_asset.h>
#include <dcp/stereo_j2k_picture_asset.h>
-#include <dcp/exceptions.h>
#include <libxml++/libxml++.h>
#include "i18n.h"
using std::list;
-using std::string;
-using std::shared_ptr;
using std::make_shared;
+using std::shared_ptr;
+using std::string;
using namespace dcpomatic;