/*
- Copyright (C) 2019 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2019-2020 Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
*/
-#include "font.h"
+#include "font_data.h"
#include "subtitle_encoder.h"
#include "player.h"
#include "compose.hpp"
#include <dcp/interop_subtitle_asset.h>
#include <dcp/raw_convert.h>
#include <dcp/smpte_subtitle_asset.h>
-#include <boost/shared_ptr.hpp>
#include <boost/filesystem.hpp>
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
#include "i18n.h"
-using std::string;
using std::make_pair;
+using std::make_shared;
using std::pair;
+using std::shared_ptr;
+using std::string;
using std::vector;
-using boost::shared_ptr;
using boost::optional;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
using dcp::raw_convert;
-/** @param include_font true to refer to and export any font file (for Interop; ignored for SMPTE) */
-SubtitleEncoder::SubtitleEncoder (shared_ptr<const Film> film, shared_ptr<Job> job, boost::filesystem::path output, bool split_reels, bool include_font)
+/** @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).
+ */
+SubtitleEncoder::SubtitleEncoder (shared_ptr<const Film> film, shared_ptr<Job> job, boost::filesystem::path output, string initial_name, bool split_reels, bool include_font)
: Encoder (film, job)
, _split_reels (split_reels)
, _include_font (include_font)
_player->set_ignore_audio ();
_player->Text.connect (boost::bind(&SubtitleEncoder::text, this, _1, _2, _3, _4));
+ string const extension = film->interop() ? ".xml" : ".mxf";
+
int const files = split_reels ? film->reels().size() : 1;
for (int i = 0; i < files; ++i) {
boost::filesystem::path filename = output;
- string extension = boost::filesystem::extension (filename);
- filename = boost::filesystem::change_extension (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.
- filename = filename.string() + String::compose(_("_reel%1"), i + 1);
+ if (boost::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.
+ filename /= String::compose("%1_reel%2", initial_name, i + 1);
+ } else {
+ filename /= initial_name;
+ }
}
- _assets.push_back (make_pair(shared_ptr<dcp::SubtitleAsset>(), boost::filesystem::change_extension(filename, ".xml")));
+ _assets.push_back (make_pair(shared_ptr<dcp::SubtitleAsset>(), boost::filesystem::change_extension(filename, extension)));
}
- BOOST_FOREACH (dcpomatic::DCPTimePeriod i, film->reels()) {
+ for (auto i: film->reels()) {
_reels.push_back (i);
}
+
+ _default_font = dcp::ArrayData (default_font_file());
}
void
}
if (!_film->interop() || _include_font) {
- BOOST_FOREACH (shared_ptr<dcpomatic::Font> j, _player->get_subtitle_fonts()) {
- i->first->add_font (j->id(), default_font_file());
+ for (auto j: _player->get_subtitle_fonts()) {
+ i->first->add_font (j.id, _default_font);
}
}
void
SubtitleEncoder::text (PlayerText subs, TextType type, optional<DCPTextTrack> track, dcpomatic::DCPTimePeriod period)
{
- if (type != TEXT_OPEN_SUBTITLE) {
+ if (type != TextType::OPEN_SUBTITLE) {
return;
}
if (!_assets[_reel_index].first) {
shared_ptr<dcp::SubtitleAsset> asset;
- string lang = _film->subtitle_language ();
+ auto lang = _film->subtitle_languages ();
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_language (lang.empty() ? "Unknown" : lang);
+ if (lang.first) {
+ s->set_language (lang.first->to_string());
+ }
s->set_reel_number (raw_convert<string>(_reel_index + 1));
_assets[_reel_index].first = s;
} else {
- shared_ptr<dcp::SMPTESubtitleAsset> s (new dcp::SMPTESubtitleAsset());
+ auto s = make_shared<dcp::SMPTESubtitleAsset>();
s->set_content_title_text (_film->name());
- if (!lang.empty()) {
- s->set_language (lang);
- } else {
- s->set_language (track->language);
+ if (lang.first) {
+ s->set_language (*lang.first);
+ } else if (track->language) {
+ s->set_language (track->language.get());
}
s->set_edit_rate (dcp::Fraction (_film->video_frame_rate(), 1));
s->set_reel_number (_reel_index + 1);
}
}
- BOOST_FOREACH (StringText i, subs.string) {
+ for (auto i: subs.string) {
/* XXX: couldn't / shouldn't we use period here rather than getting time from the subtitle? */
i.set_in (i.in());
i.set_out (i.out());
projects / dcpomatic.git / blobdiff