/*
- Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-2019 Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
#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 <boost/shared_ptr.hpp>
+#include <boost/weak_ptr.hpp>
class Film;
class Job;
class Font;
class AudioBuffers;
+class InfoFileHandle;
+struct write_frame_info_test;
namespace dcp {
class MonoPictureAsset;
void fake_write (Frame frame, Eyes eyes, int size);
void repeat_write (Frame frame, Eyes eyes);
void write (boost::shared_ptr<const AudioBuffers> audio);
- void write (PlayerText text, TextType type, DCPTimePeriod period);
+ void write (PlayerText text, TextType type, boost::optional<DCPTextTrack> track, DCPTimePeriod period);
void finish ();
boost::shared_ptr<dcp::Reel> create_reel (std::list<ReferencedReelAsset> const & refs, std::list<boost::shared_ptr<Font> > const & fonts);
return _first_nonexistant_frame;
}
- dcp::FrameInfo read_frame_info (FILE* file, Frame frame, Eyes eyes) const;
+ dcp::FrameInfo read_frame_info (boost::shared_ptr<InfoFileHandle> info, Frame frame, Eyes eyes) const;
private:
+ friend struct ::write_frame_info_test;
+
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 ();
- bool existing_picture_frame_ok (FILE* asset_file, FILE* info_file, Frame frame) const;
+ bool existing_picture_frame_ok (FILE* asset_file, boost::shared_ptr<InfoFileHandle> info_file, Frame frame) const;
boost::shared_ptr<const Film> _film;
/** number of reels in the DCP */
int _reel_count;
boost::optional<std::string> _content_summary;
+ boost::weak_ptr<Job> _job;
boost::shared_ptr<dcp::PictureAsset> _picture_asset;
boost::shared_ptr<dcp::PictureAssetWriter> _picture_asset_writer;
boost::shared_ptr<dcp::SoundAsset> _sound_asset;
boost::shared_ptr<dcp::SoundAssetWriter> _sound_asset_writer;
- boost::shared_ptr<dcp::SubtitleAsset> _caption_asset[TEXT_COUNT];
+ boost::shared_ptr<dcp::SubtitleAsset> _subtitle_asset;
+ std::map<DCPTextTrack, boost::shared_ptr<dcp::SubtitleAsset> > _closed_caption_assets;
static int const _info_size;
};