X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Freel_writer.h;h=17bfc7ba2c191482e674bb0645b470bf965e6e3e;hb=ca981c8cfa23111e92be329f1c2dfbe3a07b4247;hp=d241c0fac16c067336179170050b99a427d66d4b;hpb=895b386b6751afd3d068155f4ea71e762297672a;p=dcpomatic.git

diff --git a/src/lib/reel_writer.h b/src/lib/reel_writer.h
index d241c0fac..17bfc7ba2 100644
--- a/src/lib/reel_writer.h
+++ b/src/lib/reel_writer.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2019 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2020 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,12 +18,14 @@
 
 */
 
+#include "atmos_metadata.h"
 #include "types.h"
 #include "dcpomatic_time.h"
 #include "referenced_reel_asset.h"
 #include "player_text.h"
 #include "dcp_text_track.h"
 #include <dcp/picture_asset_writer.h>
+#include <dcp/atmos_asset_writer.h>
 #include <boost/shared_ptr.hpp>
 #include <boost/weak_ptr.hpp>
 
@@ -47,6 +49,7 @@ namespace dcp {
 	class SoundAsset;
 	class SoundAssetWriter;
 	class SubtitleAsset;
+	class AtmosAsset;
 	class ReelAsset;
 	class Reel;
 }
@@ -64,10 +67,11 @@ public:
 		);
 
 	void write (boost::optional<dcp::Data> encoded, Frame frame, Eyes eyes);
-	void fake_write (Frame frame, Eyes eyes, int size);
+	void fake_write (int size);
 	void repeat_write (Frame frame, Eyes eyes);
 	void write (boost::shared_ptr<const AudioBuffers> audio);
 	void write (PlayerText text, TextType type, boost::optional<DCPTextTrack> track, dcpomatic::DCPTimePeriod period);
+	void write (boost::shared_ptr<const dcp::AtmosFrame> atmos, AtmosMetadata metadata);
 
 	void finish ();
 	boost::shared_ptr<dcp::Reel> create_reel (std::list<ReferencedReelAsset> const & refs, std::list<boost::shared_ptr<dcpomatic::Font> > const & fonts);
@@ -79,14 +83,6 @@ public:
 		return _period;
 	}
 
-	int last_written_video_frame () const {
-		return _last_written_video_frame;
-	}
-
-	Eyes last_written_eyes () const {
-		return _last_written_eyes;
-	}
-
 	int first_nonexistant_frame () const {
 		return _first_nonexistant_frame;
 	}
@@ -109,9 +105,6 @@ private:
 	int _first_nonexistant_frame;
 	/** the data of the last written frame, if there is one */
 	boost::optional<dcp::Data> _last_written[EYES_COUNT];
-	/** the index of the last written video frame within the reel */
-	int _last_written_video_frame;
-	Eyes _last_written_eyes;
 	/** index of this reel within the DCP (starting from 0) */
 	int _reel_index;
 	/** number of reels in the DCP */
@@ -126,6 +119,8 @@ private:
 	boost::shared_ptr<dcp::SoundAssetWriter> _sound_asset_writer;
 	boost::shared_ptr<dcp::SubtitleAsset> _subtitle_asset;
 	std::map<DCPTextTrack, boost::shared_ptr<dcp::SubtitleAsset> > _closed_caption_assets;
+	boost::shared_ptr<dcp::AtmosAsset> _atmos_asset;
+	boost::shared_ptr<dcp::AtmosAssetWriter> _atmos_asset_writer;
 
 	static int const _info_size;
 };