X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fsubtitle_content.cc;h=5b370847ba08d2f2f156301f5864982f7820efae;hb=3e12c68dc0451e73b5bc1a84d1d70f4999f7b4b5;hp=4c6e601926d2ebf096450a443ee7560bda152fba;hpb=0412f1a2b29f380cb4ca35787fc7174d6948072c;p=dcpomatic.git diff --git a/src/lib/subtitle_content.cc b/src/lib/subtitle_content.cc index 4c6e60192..5b370847b 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,9 +18,11 @@ */ #include +#include #include "subtitle_content.h" #include "util.h" #include "exceptions.h" +#include "safe_stringstream.h" #include "i18n.h" @@ -28,38 +30,64 @@ 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_SCALE = 502; +int const SubtitleContentProperty::SUBTITLE_X_SCALE = 502; +int const SubtitleContentProperty::SUBTITLE_Y_SCALE = 503; +int const SubtitleContentProperty::USE_SUBTITLES = 504; + +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) + , _use_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, shared_ptr node, int version) +SubtitleContent::SubtitleContent (shared_ptr f, cxml::ConstNodePtr node, int version) : Content (f, node) + , _use_subtitles (false) , _subtitle_x_offset (0) , _subtitle_y_offset (0) - , _subtitle_scale (1) + , _subtitle_x_scale (1) + , _subtitle_y_scale (1) { - LocaleGuard lg; - + 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"); } - - _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"); + } } SubtitleContent::SubtitleContent (shared_ptr f, vector > c) @@ -71,6 +99,10 @@ SubtitleContent::SubtitleContent (shared_ptr f, vector 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.")); } @@ -79,26 +111,42 @@ SubtitleContent::SubtitleContent (shared_ptr f, vectorsubtitle_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.")); } } + _use_subtitles = ref->use_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 (); } void SubtitleContent::as_xml (xmlpp::Node* root) const { - LocaleGuard lg; - - root->add_child("SubtitleXOffset")->add_child_text (lexical_cast (_subtitle_x_offset)); - root->add_child("SubtitleYOffset")->add_child_text (lexical_cast (_subtitle_y_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)); } +void +SubtitleContent::set_use_subtitles (bool u) +{ + { + boost::mutex::scoped_lock lm (_mutex); + _use_subtitles = u; + } + signal_changed (SubtitleContentProperty::USE_SUBTITLES); +} + void SubtitleContent::set_subtitle_x_offset (double o) { @@ -120,11 +168,34 @@ 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_x_scale = s; + } + signal_changed (SubtitleContentProperty::SUBTITLE_X_SCALE); +} + +void +SubtitleContent::set_subtitle_y_scale (double s) { { boost::mutex::scoped_lock lm (_mutex); - _subtitle_scale = s; + _subtitle_y_scale = s; } - signal_changed (SubtitleContentProperty::SUBTITLE_SCALE); + signal_changed (SubtitleContentProperty::SUBTITLE_Y_SCALE); +} + +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()); + + return s.str (); }