X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fsubtitle_content.cc;h=df90a4a1a2630056693bad3623de40935088c8ea;hb=33085e3c0c7257d818339e361ea4f7669ae24ca9;hp=9fefbbfcda7258c5ff66ec01d80658bf46761bfd;hpb=320a74efb8d9c8aacded2799459a92d5b7235d90;p=dcpomatic.git diff --git a/src/lib/subtitle_content.cc b/src/lib/subtitle_content.cc index 9fefbbfcd..df90a4a1a 100644 --- a/src/lib/subtitle_content.cc +++ b/src/lib/subtitle_content.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2013 Carl Hetherington + Copyright (C) 2013-2014 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 @@ -18,55 +18,203 @@ */ #include +#include #include "subtitle_content.h" +#include "util.h" +#include "exceptions.h" +#include "safe_stringstream.h" + +#include "i18n.h" using std::string; +using std::vector; +using std::cout; using boost::shared_ptr; -using boost::lexical_cast; +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_X_SCALE = 502; +int const SubtitleContentProperty::SUBTITLE_Y_SCALE = 503; +int const SubtitleContentProperty::USE_SUBTITLES = 504; +int const SubtitleContentProperty::SUBTITLE_LANGUAGE = 505; -int const SubtitleContentProperty::SUBTITLE_OFFSET = 500; -int const SubtitleContentProperty::SUBTITLE_SCALE = 501; +SubtitleContent::SubtitleContent (shared_ptr f) + : Content (f) + , _use_subtitles (false) + , _subtitle_x_offset (0) + , _subtitle_y_offset (0) + , _subtitle_x_scale (1) + , _subtitle_y_scale (1) +{ + +} SubtitleContent::SubtitleContent (shared_ptr f, boost::filesystem::path p) : Content (f, p) - , _subtitle_offset (0) - , _subtitle_scale (1) + , _use_subtitles (false) + , _subtitle_x_offset (0) + , _subtitle_y_offset (0) + , _subtitle_x_scale (1) + , _subtitle_y_scale (1) { } -SubtitleContent::SubtitleContent (shared_ptr f, shared_ptr node) +SubtitleContent::SubtitleContent (shared_ptr f, cxml::ConstNodePtr node, int version) : Content (f, node) - , _subtitle_offset (0) - , _subtitle_scale (1) + , _use_subtitles (false) + , _subtitle_x_offset (0) + , _subtitle_y_offset (0) + , _subtitle_x_scale (1) + , _subtitle_y_scale (1) +{ + if (version >= 32) { + _use_subtitles = node->bool_child ("UseSubtitles"); + } else { + _use_subtitles = false; + } + + if (version >= 7) { + _subtitle_x_offset = node->number_child ("SubtitleXOffset"); + _subtitle_y_offset = node->number_child ("SubtitleYOffset"); + } else { + _subtitle_y_offset = node->number_child ("SubtitleOffset"); + } + + 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 (""); +} + +SubtitleContent::SubtitleContent (shared_ptr f, vector > c) + : Content (f, c) { - _subtitle_offset = node->number_child ("SubtitleOffset"); - _subtitle_scale = node->number_child ("SubtitleScale"); + shared_ptr ref = dynamic_pointer_cast (c[0]); + assert (ref); + + for (size_t i = 0; i < c.size(); ++i) { + shared_ptr sc = dynamic_pointer_cast (c[i]); + + if (sc->use_subtitles() != ref->use_subtitles()) { + throw JoinError (_("Content to be joined must have the same 'use 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_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.")); + } + } + + _use_subtitles = ref->use_subtitles (); + _subtitle_x_offset = ref->subtitle_x_offset (); + _subtitle_y_offset = ref->subtitle_y_offset (); + _subtitle_x_scale = ref->subtitle_x_scale (); + _subtitle_y_scale = ref->subtitle_y_scale (); + _subtitle_language = ref->subtitle_language (); } void SubtitleContent::as_xml (xmlpp::Node* root) const { - root->add_child("SubtitleOffset")->add_child_text (lexical_cast (_subtitle_offset)); - root->add_child("SubtitleScale")->add_child_text (lexical_cast (_subtitle_scale)); + root->add_child("UseSubtitles")->add_child_text (raw_convert (_use_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("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); } void -SubtitleContent::set_subtitle_offset (double o) +SubtitleContent::set_use_subtitles (bool u) { { boost::mutex::scoped_lock lm (_mutex); - _subtitle_offset = o; + _use_subtitles = u; } - signal_changed (SubtitleContentProperty::SUBTITLE_OFFSET); + signal_changed (SubtitleContentProperty::USE_SUBTITLES); +} + +void +SubtitleContent::set_subtitle_x_offset (double o) +{ + { + boost::mutex::scoped_lock lm (_mutex); + _subtitle_x_offset = o; + } + signal_changed (SubtitleContentProperty::SUBTITLE_X_OFFSET); } void -SubtitleContent::set_subtitle_scale (double s) +SubtitleContent::set_subtitle_y_offset (double o) { { boost::mutex::scoped_lock lm (_mutex); - _subtitle_scale = s; + _subtitle_y_offset = o; } - signal_changed (SubtitleContentProperty::SUBTITLE_SCALE); + signal_changed (SubtitleContentProperty::SUBTITLE_Y_OFFSET); +} + +void +SubtitleContent::set_subtitle_x_scale (double s) +{ + { + boost::mutex::scoped_lock lm (_mutex); + _subtitle_x_scale = s; + } + 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 +{ + SafeStringStream s; + s << Content::identifier() + << "_" << raw_convert (subtitle_x_scale()) + << "_" << raw_convert (subtitle_y_scale()) + << "_" << raw_convert (subtitle_x_offset()) + << "_" << raw_convert (subtitle_y_offset()); + + /* The language is for metadata only, and doesn't affect + how this content looks. + */ + + return s.str (); }