/*
- Copyright (C) 2019-2020 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2019-2021 Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
*/
-#include "font_data.h"
-#include "subtitle_encoder.h"
-#include "player.h"
+
#include "compose.hpp"
+#include "film.h"
#include "job.h"
+#include "player.h"
+#include "subtitle_encoder.h"
+#include <dcp/filesystem.h>
#include <dcp/interop_subtitle_asset.h>
#include <dcp/raw_convert.h>
#include <dcp/smpte_subtitle_asset.h>
#include "i18n.h"
+
using std::make_pair;
using std::make_shared;
using std::pair;
#endif
using dcp::raw_convert;
+
/** @param output Directory, if there will be multiple output files, or a filename.
* @param initial_name Hint that may be used to create filenames, if @ref output is a directory.
* @param include_font true to refer to and export any font file (for Interop; ignored for SMPTE).
, _reel_index (0)
, _length (film->length())
{
- _player->set_play_referenced ();
- _player->set_ignore_video ();
- _player->set_ignore_audio ();
- _player->Text.connect (boost::bind(&SubtitleEncoder::text, this, _1, _2, _3, _4));
+ _player.set_play_referenced();
+ _player.set_ignore_video();
+ _player.set_ignore_audio();
+ _player.Text.connect(boost::bind(&SubtitleEncoder::text, this, _1, _2, _3, _4));
string const extension = film->interop() ? ".xml" : ".mxf";
for (int i = 0; i < files; ++i) {
boost::filesystem::path filename = output;
- if (boost::filesystem::is_directory(filename)) {
+ if (dcp::filesystem::is_directory(filename)) {
if (files > 1) {
/// TRANSLATORS: _reel%1 here is to be added to an export filename to indicate
/// which reel it is. Preserve the %1; it will be replaced with the reel number.
}
}
- _assets.push_back (make_pair(shared_ptr<dcp::SubtitleAsset>(), boost::filesystem::change_extension(filename, extension)));
+ _assets.push_back(make_pair(shared_ptr<dcp::SubtitleAsset>(), dcp::filesystem::change_extension(filename, extension)));
}
for (auto i: film->reels()) {
_default_font = dcp::ArrayData (default_font_file());
}
+
void
SubtitleEncoder::go ()
{
_reel_index = 0;
- while (!_player->pass()) {}
+ while (!_player.pass()) {}
int reel = 0;
- for (vector<pair<shared_ptr<dcp::SubtitleAsset>, boost::filesystem::path> >::iterator i = _assets.begin(); i != _assets.end(); ++i) {
- if (!i->first) {
+ for (auto& i: _assets) {
+ if (!i.first) {
/* No subtitles arrived for this asset; make an empty one so we write something to the output */
if (_film->interop()) {
- shared_ptr<dcp::InteropSubtitleAsset> s (new dcp::InteropSubtitleAsset());
+ auto s = make_shared<dcp::InteropSubtitleAsset>();
s->set_movie_title (_film->name());
s->set_reel_number (raw_convert<string>(reel + 1));
- i->first = s;
+ i.first = s;
} else {
- shared_ptr<dcp::SMPTESubtitleAsset> s (new dcp::SMPTESubtitleAsset());
+ auto s = make_shared<dcp::SMPTESubtitleAsset>();
s->set_content_title_text (_film->name());
s->set_reel_number (reel + 1);
- i->first = s;
+ i.first = s;
}
}
if (!_film->interop() || _include_font) {
- for (auto j: _player->get_subtitle_fonts()) {
- i->first->add_font (j.id, _default_font);
+ for (auto j: _player.get_subtitle_fonts()) {
+ i.first->add_font(j->id(), j->data().get_value_or(_default_font));
}
}
- i->first->write (i->second);
+ i.first->write (i.second);
++reel;
}
}
+
void
SubtitleEncoder::text (PlayerText subs, TextType type, optional<DCPTextTrack> track, dcpomatic::DCPTimePeriod period)
{
if (_film->interop() && !_include_font) {
i.unset_font ();
}
- _assets[_reel_index].first->add (shared_ptr<dcp::Subtitle>(new dcp::SubtitleString(i)));
+ _assets[_reel_index].first->add (make_shared<dcp::SubtitleString>(i));
}
if (_split_reels && (_reel_index < int(_reels.size()) - 1) && period.from > _reels[_reel_index].from) {
_last = period.from;
- shared_ptr<Job> job = _job.lock ();
+ auto job = _job.lock ();
if (job) {
job->set_progress (float(period.from.get()) / _length.get());
}
}
+
Frame
SubtitleEncoder::frames_done () const
{