X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fsubtitle_content.cc;h=bdc2b729cf8786757bc7bd3ce044534a7b8916a2;hb=334b94526f2c1271718a94fe97cfa843cf6ef7a1;hp=8c94a94b995f7f35798dc3ec06f1a02a090890a4;hpb=bde76c3341775bd02da59932d285e14eade64ae0;p=dcpomatic.git diff --git a/src/lib/subtitle_content.cc b/src/lib/subtitle_content.cc index 8c94a94b9..bdc2b729c 100644 --- a/src/lib/subtitle_content.cc +++ b/src/lib/subtitle_content.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2014 Carl Hetherington + Copyright (C) 2013-2016 Carl Hetherington This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,116 +17,188 @@ */ -#include -#include #include "subtitle_content.h" #include "util.h" #include "exceptions.h" +#include "safe_stringstream.h" +#include "font.h" +#include "raw_convert.h" +#include +#include +#include +#include #include "i18n.h" using std::string; -using std::stringstream; using std::vector; using std::cout; +using std::list; using boost::shared_ptr; using boost::dynamic_pointer_cast; -using dcp::raw_convert; int const SubtitleContentProperty::SUBTITLE_X_OFFSET = 500; int const SubtitleContentProperty::SUBTITLE_Y_OFFSET = 501; -int const SubtitleContentProperty::SUBTITLE_SCALE = 502; -int const SubtitleContentProperty::SUBTITLE_USE = 503; +int const SubtitleContentProperty::SUBTITLE_X_SCALE = 502; +int const SubtitleContentProperty::SUBTITLE_Y_SCALE = 503; +int const SubtitleContentProperty::USE_SUBTITLES = 504; +int const SubtitleContentProperty::BURN_SUBTITLES = 505; +int const SubtitleContentProperty::SUBTITLE_LANGUAGE = 506; +int const SubtitleContentProperty::FONTS = 507; +int const SubtitleContentProperty::SUBTITLE_VIDEO_FRAME_RATE = 508; -SubtitleContent::SubtitleContent (shared_ptr f) - : Content (f) - , _subtitle_use (false) +SubtitleContent::SubtitleContent (Content* parent, shared_ptr film) + : ContentPart (parent, film) + , _use_subtitles (false) + , _burn_subtitles (false) , _subtitle_x_offset (0) , _subtitle_y_offset (0) - , _subtitle_scale (1) + , _subtitle_x_scale (1) + , _subtitle_y_scale (1) { } -SubtitleContent::SubtitleContent (shared_ptr f, boost::filesystem::path p) - : Content (f, p) - , _subtitle_use (false) +SubtitleContent::SubtitleContent (Content* parent, shared_ptr film, cxml::ConstNodePtr node, int version) + : ContentParet (parent, film) + , _use_subtitles (false) + , _burn_subtitles (false) , _subtitle_x_offset (0) , _subtitle_y_offset (0) - , _subtitle_scale (1) + , _subtitle_x_scale (1) + , _subtitle_y_scale (1) { + if (version >= 32) { + _use_subtitles = node->bool_child ("UseSubtitles"); + _burn_subtitles = node->bool_child ("BurnSubtitles"); + } -} - -SubtitleContent::SubtitleContent (shared_ptr f, cxml::ConstNodePtr node, int version) - : Content (f, node) - , _subtitle_use (false) - , _subtitle_x_offset (0) - , _subtitle_y_offset (0) - , _subtitle_scale (1) -{ if (version >= 7) { - _subtitle_use = node->bool_child ("SubtitleUse"); - _subtitle_x_offset = node->number_child ("SubtitleXOffset"); - _subtitle_y_offset = node->number_child ("SubtitleYOffset"); + _subtitle_x_offset = node->number_child ("SubtitleXOffset"); + _subtitle_y_offset = node->number_child ("SubtitleYOffset"); } else { - _subtitle_y_offset = node->number_child ("SubtitleOffset"); + _subtitle_y_offset = node->number_child ("SubtitleOffset"); } - - _subtitle_scale = node->number_child ("SubtitleScale"); + + if (version >= 10) { + _subtitle_x_scale = node->number_child ("SubtitleXScale"); + _subtitle_y_scale = node->number_child ("SubtitleYScale"); + } else { + _subtitle_x_scale = _subtitle_y_scale = node->number_child ("SubtitleScale"); + } + + _subtitle_language = node->optional_string_child ("SubtitleLanguage").get_value_or (""); + + list fonts = node->node_children ("Font"); + for (list::const_iterator i = fonts.begin(); i != fonts.end(); ++i) { + _fonts.push_back (shared_ptr (new Font (*i))); + } + + connect_to_fonts (); } -SubtitleContent::SubtitleContent (shared_ptr f, vector > c) - : Content (f, c) +SubtitleContent::SubtitleContent (Content* parent, shared_ptr film, vector > c) + : ContentPart (parent, film) { shared_ptr ref = dynamic_pointer_cast (c[0]); - assert (ref); - + DCPOMATIC_ASSERT (ref); + list > ref_fonts = ref->fonts (); + for (size_t i = 0; i < c.size(); ++i) { shared_ptr sc = dynamic_pointer_cast (c[i]); - if (sc->subtitle_use() != ref->subtitle_use()) { + if (sc->use_subtitles() != ref->use_subtitles()) { throw JoinError (_("Content to be joined must have the same 'use subtitles' setting.")); } + if (sc->burn_subtitles() != ref->burn_subtitles()) { + throw JoinError (_("Content to be joined must have the same 'burn subtitles' setting.")); + } + if (sc->subtitle_x_offset() != ref->subtitle_x_offset()) { throw JoinError (_("Content to be joined must have the same subtitle X offset.")); } - + if (sc->subtitle_y_offset() != ref->subtitle_y_offset()) { throw JoinError (_("Content to be joined must have the same subtitle Y offset.")); } - if (sc->subtitle_scale() != ref->subtitle_scale()) { - throw JoinError (_("Content to be joined must have the same subtitle scale.")); + if (sc->subtitle_x_scale() != ref->subtitle_x_scale()) { + throw JoinError (_("Content to be joined must have the same subtitle X scale.")); + } + + if (sc->subtitle_y_scale() != ref->subtitle_y_scale()) { + throw JoinError (_("Content to be joined must have the same subtitle Y scale.")); + } + + list > fonts = sc->fonts (); + if (fonts.size() != ref_fonts.size()) { + throw JoinError (_("Content to be joined must use the same fonts.")); + } + + list >::const_iterator j = ref_fonts.begin (); + list >::const_iterator k = fonts.begin (); + + while (j != ref_fonts.end ()) { + if (**j != **k) { + throw JoinError (_("Content to be joined must use the same fonts.")); + } + ++j; + ++k; } } - _subtitle_use = ref->subtitle_use (); + _use_subtitles = ref->use_subtitles (); + _burn_subtitles = ref->burn_subtitles (); _subtitle_x_offset = ref->subtitle_x_offset (); _subtitle_y_offset = ref->subtitle_y_offset (); - _subtitle_scale = ref->subtitle_scale (); + _subtitle_x_scale = ref->subtitle_x_scale (); + _subtitle_y_scale = ref->subtitle_y_scale (); + _subtitle_language = ref->subtitle_language (); + _fonts = ref_fonts; + + connect_to_fonts (); } +/** _mutex must not be held on entry */ void SubtitleContent::as_xml (xmlpp::Node* root) const { - root->add_child("SubtitleUse")->add_child_text (raw_convert (_subtitle_use)); + boost::mutex::scoped_lock lm (_mutex); + + root->add_child("UseSubtitles")->add_child_text (raw_convert (_use_subtitles)); + root->add_child("BurnSubtitles")->add_child_text (raw_convert (_burn_subtitles)); root->add_child("SubtitleXOffset")->add_child_text (raw_convert (_subtitle_x_offset)); root->add_child("SubtitleYOffset")->add_child_text (raw_convert (_subtitle_y_offset)); - root->add_child("SubtitleScale")->add_child_text (raw_convert (_subtitle_scale)); + root->add_child("SubtitleXScale")->add_child_text (raw_convert (_subtitle_x_scale)); + root->add_child("SubtitleYScale")->add_child_text (raw_convert (_subtitle_y_scale)); + root->add_child("SubtitleLanguage")->add_child_text (_subtitle_language); + + for (list >::const_iterator i = _fonts.begin(); i != _fonts.end(); ++i) { + (*i)->as_xml (root->add_child("Font")); + } } void -SubtitleContent::set_subtitle_use (bool u) +SubtitleContent::set_use_subtitles (bool u) { { boost::mutex::scoped_lock lm (_mutex); - _subtitle_use = u; + _use_subtitles = u; } - signal_changed (SubtitleContentProperty::SUBTITLE_USE); + signal_changed (SubtitleContentProperty::USE_SUBTITLES); } - + +void +SubtitleContent::set_burn_subtitles (bool b) +{ + { + boost::mutex::scoped_lock lm (_mutex); + _burn_subtitles = b; + } + signal_changed (SubtitleContentProperty::BURN_SUBTITLES); +} + void SubtitleContent::set_subtitle_x_offset (double o) { @@ -148,23 +220,90 @@ SubtitleContent::set_subtitle_y_offset (double o) } void -SubtitleContent::set_subtitle_scale (double s) +SubtitleContent::set_subtitle_x_scale (double s) { { boost::mutex::scoped_lock lm (_mutex); - _subtitle_scale = s; + _subtitle_x_scale = s; } - signal_changed (SubtitleContentProperty::SUBTITLE_SCALE); + signal_changed (SubtitleContentProperty::SUBTITLE_X_SCALE); +} + +void +SubtitleContent::set_subtitle_y_scale (double s) +{ + { + boost::mutex::scoped_lock lm (_mutex); + _subtitle_y_scale = s; + } + signal_changed (SubtitleContentProperty::SUBTITLE_Y_SCALE); +} + +void +SubtitleContent::set_subtitle_language (string language) +{ + { + boost::mutex::scoped_lock lm (_mutex); + _subtitle_language = language; + } + signal_changed (SubtitleContentProperty::SUBTITLE_LANGUAGE); } string SubtitleContent::identifier () const { - stringstream s; + SafeStringStream s; s << Content::identifier() - << "_" << raw_convert (subtitle_scale()) + << "_" << raw_convert (subtitle_x_scale()) + << "_" << raw_convert (subtitle_y_scale()) << "_" << raw_convert (subtitle_x_offset()) << "_" << raw_convert (subtitle_y_offset()); + /* XXX: I suppose really _fonts shouldn't be in here, since not all + types of subtitle content involve fonts. + */ + BOOST_FOREACH (shared_ptr f, _fonts) { + for (int i = 0; i < FontFiles::VARIANTS; ++i) { + s << "_" << f->file(static_cast(i)).get_value_or ("Default"); + } + } + + /* The language is for metadata only, and doesn't affect + how this content looks. + */ + return s.str (); } + +void +SubtitleContent::add_font (shared_ptr font) +{ + _fonts.push_back (font); + connect_to_fonts (); +} + +void +SubtitleContent::connect_to_fonts () +{ + BOOST_FOREACH (boost::signals2::connection& i, _font_connections) { + i.disconnect (); + } + + _font_connections.clear (); + + BOOST_FOREACH (shared_ptr i, _fonts) { + _font_connections.push_back (i->Changed.connect (boost::bind (&SubtitleContent::font_changed, this))); + } +} + +void +SubtitleContent::font_changed () +{ + signal_changed (SubtitleContentProperty::FONTS); +} + +bool +SubtitleContent::has_subtitles () const +{ + return has_text_subtitles() || has_image_subtitles(); +}