X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Freel_writer.h;h=e578a481317b995984996f890536286e052ef2d4;hp=019917abc9a3f3a8095975e6e61528bf082cb33f;hb=5a820bb8fae34591be5ac6d19a73461b9dab532a;hpb=dd9be86db6cde0afa5da0d1d1ac43b42e05dca26

diff --git a/src/lib/reel_writer.h b/src/lib/reel_writer.h
index 019917abc..e578a4813 100644
--- a/src/lib/reel_writer.h
+++ b/src/lib/reel_writer.h
@@ -18,42 +18,43 @@
 
 */
 
+
 #include "atmos_metadata.h"
-#include "types.h"
+#include "dcp_text_track.h"
 #include "dcpomatic_time.h"
-#include "referenced_reel_asset.h"
+#include "font_id_map.h"
 #include "player_text.h"
-#include "dcp_text_track.h"
+#include "referenced_reel_asset.h"
+#include "types.h"
 #include "weak_film.h"
-#include <dcp/picture_asset_writer.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:
@@ -70,18 +71,19 @@ public:
 	void fake_write (int size);
 	void repeat_write (Frame frame, Eyes eyes);
 	void write (std::shared_ptr<const AudioBuffers> audio);
-	void write (PlayerText text, TextType type, boost::optional<DCPTextTrack> track, dcpomatic::DCPTimePeriod period);
+	void write (PlayerText text, TextType type, boost::optional<DCPTextTrack> track, dcpomatic::DCPTimePeriod period, FontIdMap const& fonts);
 	void write (std::shared_ptr<const dcp::AtmosFrame> atmos, AtmosMetadata metadata);
 
 	void finish (boost::filesystem::path output_dcp);
 	std::shared_ptr<dcp::Reel> create_reel (
 		std::list<ReferencedReelAsset> const & refs,
-		std::vector<dcpomatic::FontData> const & fonts,
+		FontIdMap const & fonts,
+		std::shared_ptr<dcpomatic::Font> chosen_interop_font,
 		boost::filesystem::path output_dcp,
 		bool ensure_subtitles,
 		std::set<DCPTextTrack> ensure_closed_captions
 		);
-	void calculate_digests (boost::function<void (float)> set_progress);
+	void calculate_digests (std::function<void (float)> set_progress);
 
 	Frame start () const;
 
@@ -102,15 +104,16 @@ private:
 	void write_frame_info (Frame frame, Eyes eyes, dcp::FrameInfo info) const;
 	long frame_info_position (Frame frame, Eyes eyes) const;
 	Frame check_existing_picture_asset (boost::filesystem::path asset);
-	bool existing_picture_frame_ok (FILE* asset_file, std::shared_ptr<InfoFileHandle> info_file, Frame frame) const;
-	std::shared_ptr<dcp::SubtitleAsset> empty_text_asset (TextType type, boost::optional<DCPTextTrack> track) const;
+	bool existing_picture_frame_ok (dcp::File& asset_file, std::shared_ptr<InfoFileHandle> info_file, Frame frame) const;
+	std::shared_ptr<dcp::SubtitleAsset> empty_text_asset (TextType type, boost::optional<DCPTextTrack> track, bool with_dummy) const;
 
 	std::shared_ptr<dcp::ReelPictureAsset> create_reel_picture (std::shared_ptr<dcp::Reel> reel, std::list<ReferencedReelAsset> const & refs) const;
 	void create_reel_sound (std::shared_ptr<dcp::Reel> reel, std::list<ReferencedReelAsset> const & refs) const;
 	void create_reel_text (
 		std::shared_ptr<dcp::Reel> reel,
 		std::list<ReferencedReelAsset> const & refs,
-		std::vector<dcpomatic::FontData> const& fonts,
+		FontIdMap const& fonts,
+		std::shared_ptr<dcpomatic::Font> chosen_interop_font,
 		int64_t duration,
 		boost::filesystem::path output_dcp,
 		bool ensure_subtitles,
@@ -122,7 +125,7 @@ private:
 	/** the first picture frame index that does not already exist in our MXF */
 	int _first_nonexistant_frame;
 	/** the data of the last written frame, if there is one */
-	std::shared_ptr<const dcp::Data> _last_written[EYES_COUNT];
+	std::shared_ptr<const dcp::Data> _last_written[static_cast<int>(Eyes::COUNT)];
 	/** index of this reel within the DCP (starting from 0) */
 	int _reel_index;
 	/** number of reels in the DCP */
@@ -139,7 +142,7 @@ private:
 	std::shared_ptr<dcp::SoundAsset> _sound_asset;
 	std::shared_ptr<dcp::SoundAssetWriter> _sound_asset_writer;
 	std::shared_ptr<dcp::SubtitleAsset> _subtitle_asset;
-	std::map<DCPTextTrack, std::shared_ptr<dcp::SubtitleAsset> > _closed_caption_assets;
+	std::map<DCPTextTrack, std::shared_ptr<dcp::SubtitleAsset>> _closed_caption_assets;
 	std::shared_ptr<dcp::AtmosAsset> _atmos_asset;
 	std::shared_ptr<dcp::AtmosAssetWriter> _atmos_asset_writer;