Tidying.

diff --git a/src/lib/dcp_encoder.h b/src/lib/dcp_encoder.h
index cc4e7ae7f50b2ca492d0d1de20879194217fc51d..3d00e6e9fc2e284ac25413a0817753c9780dfd28 100644 (file)
--- a/src/lib/dcp_encoder.h
+++ b/src/lib/dcp_encoder.h
@@ -18,20 +18,23 @@
 
 */
 
+
 #include "atmos_metadata.h"
-#include "types.h"
-#include "player_text.h"
 #include "dcp_text_track.h"
 #include "encoder.h"
+#include "player_text.h"
+#include "types.h"
 #include <dcp/atmos_frame.h>
 
+
+class AudioBuffers;
 class Film;
 class J2KEncoder;
-class Player;
-class Writer;
 class Job;
+class Player;
 class PlayerVideo;
-class AudioBuffers;
+class Writer;
+
 
 /** @class DCPEncoder */
 class DCPEncoder : public Encoder

diff --git a/src/lib/reel_writer.h b/src/lib/reel_writer.h
index bee76ded3fd65b5fb6cbe7272d98c8ad2a3a7cd4..d08b5b1f009b0e5a6f4424a96e2d5d8e9d4969aa 100644 (file)
--- a/src/lib/reel_writer.h
+++ b/src/lib/reel_writer.h
@@ -18,43 +18,46 @@
 
 */
 
+
 #include "atmos_metadata.h"
-#include "types.h"
+#include "dcp_text_track.h"
 #include "dcpomatic_time.h"
-#include "referenced_reel_asset.h"
 #include "player_text.h"
-#include "dcp_text_track.h"
+#include "referenced_reel_asset.h"
+#include "types.h"
 #include "weak_film.h"
 #include <dcp/atmos_asset_writer.h>
 #include <dcp/file.h>
 #include <dcp/picture_asset_writer.h>
 
+
 namespace dcpomatic {
        class FontData;
 }
 
-class Film;
-class Job;
 class AudioBuffers;
+class Film;
 class InfoFileHandle;
+class Job;
 struct write_frame_info_test;
 
 namespace dcp {
+       class AtmosAsset;
        class MonoPictureAsset;
        class MonoPictureAssetWriter;
-       class StereoPictureAsset;
-       class StereoPictureAssetWriter;
        class PictureAsset;
        class PictureAssetWriter;
+       class Reel;
+       class ReelAsset;
+       class ReelPictureAsset;
        class SoundAsset;
        class SoundAssetWriter;
+       class StereoPictureAsset;
+       class StereoPictureAssetWriter;
        class SubtitleAsset;
-       class AtmosAsset;
-       class ReelAsset;
-       class Reel;
-       class ReelPictureAsset;
 }
 
+
 class ReelWriter : public WeakConstFilm
 {
 public:

diff --git a/src/lib/writer.h b/src/lib/writer.h
index 1e25c3bdf644d455434622e761629af9fcc3cb90..3e81b6448a6ce8d6c88940cee4f784c81f398ba3 100644 (file)
--- a/src/lib/writer.h
+++ b/src/lib/writer.h
@@ -25,10 +25,10 @@
 
 
 #include "atmos_metadata.h"
-#include "types.h"
-#include "player_text.h"
-#include "exception_store.h"
 #include "dcp_text_track.h"
+#include "exception_store.h"
+#include "player_text.h"
+#include "types.h"
 #include "weak_film.h"
 #include <dcp/atmos_frame.h>
 #include <boost/thread.hpp>
@@ -44,11 +44,11 @@ namespace dcpomatic {
        class FontData;
 }
 
-class Film;
 class AudioBuffers;
+class Film;
 class Job;
-class ReferencedReelAsset;
 class ReelWriter;
+class ReferencedReelAsset;
 
 
 struct QueueItem