summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2023-06-26 02:13:22 +0200
committerCarl Hetherington <cth@carlh.net>2023-06-27 00:10:55 +0200
commit5fa31cd1ed5ebc1446008150f052cceab8d09efe (patch)
tree1b318a9afc7503c08893e1b7c33b3807033516b3
parent113f1062f131577cb169fe1516d49d1f79fa16cf (diff)
Cleanup: sorting.
-rw-r--r--test/dcp_test.cc29
1 files changed, 16 insertions, 13 deletions
diff --git a/test/dcp_test.cc b/test/dcp_test.cc
index 7b2eb4ef..9320d4f1 100644
--- a/test/dcp_test.cc
+++ b/test/dcp_test.cc
@@ -31,32 +31,35 @@
files in the program, then also delete it here.
*/
+
+#include "atmos_asset.h"
+#include "compose.hpp"
+#include "cpl.h"
#include "dcp.h"
#include "metadata.h"
-#include "cpl.h"
#include "mono_picture_asset.h"
-#include "stereo_picture_asset.h"
#include "picture_asset_writer.h"
-#include "reel_picture_asset.h"
-#include "sound_asset_writer.h"
-#include "sound_asset.h"
-#include "atmos_asset.h"
#include "reel.h"
-#include "test.h"
-#include "reel_mono_picture_asset.h"
-#include "reel_stereo_picture_asset.h"
-#include "reel_sound_asset.h"
#include "reel_atmos_asset.h"
#include "reel_markers_asset.h"
+#include "reel_mono_picture_asset.h"
+#include "reel_picture_asset.h"
+#include "reel_sound_asset.h"
+#include "reel_stereo_picture_asset.h"
+#include "sound_asset.h"
+#include "sound_asset_writer.h"
+#include "stereo_picture_asset.h"
+#include "test.h"
#include <asdcp/KM_util.h>
#include <sndfile.h>
#include <boost/test/unit_test.hpp>
-using std::string;
-using std::vector;
+
using std::dynamic_pointer_cast;
-using std::shared_ptr;
using std::make_shared;
+using std::shared_ptr;
+using std::string;
+using std::vector;
#if BOOST_VERSION >= 106100
using namespace boost::placeholders;
#endif