Fix some spelling mistakes (mostly in comments).

[dcpomatic.git] / src / lib / reel_writer.h

diff --git a/src/lib/reel_writer.h b/src/lib/reel_writer.h
index 5de00f641be5fe577da14ee158fa507f39d2d510..6e92e89230937bb2f8555b5e6c0695d6c6120462 100644 (file)
--- 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,13 +71,14 @@ 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
@@ -89,8 +91,8 @@ public:
                return _period;
        }
 
-       int first_nonexistant_frame () const {
-               return _first_nonexistant_frame;
+       int first_nonexistent_frame () const {
+               return _first_nonexistent_frame;
        }
 
        dcp::FrameInfo read_frame_info (std::shared_ptr<InfoFileHandle> info, Frame frame, Eyes eyes) const;
@@ -102,7 +104,7 @@ 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;
+       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;
@@ -110,7 +112,8 @@ private:
        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,
@@ -120,7 +123,7 @@ private:
 
        dcpomatic::DCPTimePeriod _period;
        /** the first picture frame index that does not already exist in our MXF */
-       int _first_nonexistant_frame;
+       int _first_nonexistent_frame;
        /** the data of the last written frame, if there is one */
        std::shared_ptr<const dcp::Data> _last_written[static_cast<int>(Eyes::COUNT)];
        /** index of this reel within the DCP (starting from 0) */
@@ -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;