X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp_subtitle_content.cc;h=858849ca3134f003803abbfcad881dcb890c1d8e;hb=8fedaaa75c4586a4cc7ffb393bd71d1fdb091dc8;hp=b38c0c6a76e0b27ae56a6dd8b77f8547d01b0405;hpb=334b94526f2c1271718a94fe97cfa843cf6ef7a1;p=dcpomatic.git diff --git a/src/lib/dcp_subtitle_content.cc b/src/lib/dcp_subtitle_content.cc index b38c0c6a7..858849ca3 100644 --- a/src/lib/dcp_subtitle_content.cc +++ b/src/lib/dcp_subtitle_content.cc @@ -1,90 +1,96 @@ /* - Copyright (C) 2014-2015 Carl Hetherington + Copyright (C) 2014-2021 Carl Hetherington - This program is free software; you can redistribute it and/or modify + This file is part of DCP-o-matic. + + DCP-o-matic is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, + DCP-o-matic is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with DCP-o-matic. If not, see . */ #include "font.h" #include "dcp_subtitle_content.h" -#include "raw_convert.h" #include "film.h" -#include "subtitle_content.h" +#include "text_content.h" +#include #include #include #include #include -#include #include "i18n.h" -using std::string; +using std::dynamic_pointer_cast; using std::list; -using boost::shared_ptr; -using boost::dynamic_pointer_cast; +using std::make_shared; +using std::shared_ptr; +using std::string; +using dcp::raw_convert; +using namespace dcpomatic; -DCPSubtitleContent::DCPSubtitleContent (shared_ptr film, boost::filesystem::path path) - : Content (film, path) +DCPSubtitleContent::DCPSubtitleContent (boost::filesystem::path path) + : Content (path) { - subtitle.reset (new SubtitleContent (this, film)); + text.push_back (make_shared(this, TextType::OPEN_SUBTITLE, TextType::OPEN_SUBTITLE)); } -DCPSubtitleContent::DCPSubtitleContent (shared_ptr film, cxml::ConstNodePtr node, int version) - : Content (film, node) +DCPSubtitleContent::DCPSubtitleContent (cxml::ConstNodePtr node, int version) + : Content (node) , _length (node->number_child ("Length")) - , _frame_rate (node->optional_number_child("SubtitleFrameRate")) { - subtitle.reset (new SubtitleContent (this, film, node, version)); + text = TextContent::from_xml (this, node, version); } void -DCPSubtitleContent::examine (shared_ptr job) +DCPSubtitleContent::examine (shared_ptr film, shared_ptr job) { - Content::examine (job); + Content::examine (film, job); - shared_ptr sc = load (path (0)); + auto sc = load (path(0)); - /* Default to turning these subtitles on */ - subtitle->set_use_subtitles (true); + auto iop = dynamic_pointer_cast(sc); + auto smpte = dynamic_pointer_cast(sc); + if (smpte) { + set_video_frame_rate (smpte->edit_rate().numerator); + } boost::mutex::scoped_lock lm (_mutex); - shared_ptr iop = dynamic_pointer_cast (sc); - if (iop) { - subtitle->set_subtitle_language (iop->language ()); - } - shared_ptr smpte = dynamic_pointer_cast (sc); - if (smpte) { - subtitle->set_subtitle_language (smpte->language().get_value_or ("")); - _frame_rate = smpte->edit_rate().numerator; - } + /* Default to turning these subtitles on */ + only_text()->set_use (true); - _length = ContentTime::from_seconds (sc->latest_subtitle_out().as_seconds ()); + _length = ContentTime::from_seconds (sc->latest_subtitle_out().as_seconds()); - BOOST_FOREACH (shared_ptr i, sc->load_font_nodes ()) { - subtitle->add_font (shared_ptr (new Font (i->id))); + sc->fix_empty_font_ids (); + + for (auto i: sc->load_font_nodes()) { + only_text()->add_font(make_shared(i->id)); } } DCPTime -DCPSubtitleContent::full_length () const +DCPSubtitleContent::full_length (shared_ptr film) const { - FrameRateChange const frc (subtitle_video_frame_rate(), film()->video_frame_rate()); + FrameRateChange const frc (film, shared_from_this()); return DCPTime (_length, frc); } +DCPTime +DCPSubtitleContent::approximate_length () const +{ + return DCPTime (_length, FrameRateChange()); +} + string DCPSubtitleContent::summary () const { @@ -98,37 +104,14 @@ DCPSubtitleContent::technical_summary () const } void -DCPSubtitleContent::as_xml (xmlpp::Node* node) const +DCPSubtitleContent::as_xml (xmlpp::Node* node, bool with_paths) const { node->add_child("Type")->add_child_text ("DCPSubtitle"); - Content::as_xml (node); - subtitle->as_xml (node); - node->add_child("Length")->add_child_text (raw_convert (_length.get ())); -} - -void -DCPSubtitleContent::set_subtitle_video_frame_rate (int r) -{ - { - boost::mutex::scoped_lock lm (_mutex); - _frame_rate = r; - } - - signal_changed (SubtitleContentProperty::SUBTITLE_VIDEO_FRAME_RATE); -} + Content::as_xml (node, with_paths); -double -DCPSubtitleContent::subtitle_video_frame_rate () const -{ - { - boost::mutex::scoped_lock lm (_mutex); - if (_frame_rate) { - return _frame_rate.get (); - } + if (only_text()) { + only_text()->as_xml (node); } - /* No frame rate specified, so assume this content has been - prepared for any concurrent video content. - */ - return film()->active_frame_rate_change(position()).source; + node->add_child("Length")->add_child_text (raw_convert (_length.get ())); }