Merge.

[dcpomatic.git] / src / lib / subtitle_content.cc

diff --git a/src/lib/subtitle_content.cc b/src/lib/subtitle_content.cc
index 9fd49831fd7f6b98914307501afe3d5def8ec2eb..21bfd8a2d5fbe18ee7ab0f83c66c3d9ef368cb20 100644 (file)
--- a/src/lib/subtitle_content.cc
+++ b/src/lib/subtitle_content.cc
@@ -21,14 +21,12 @@
 #include "subtitle_content.h"
 #include "util.h"
 #include "exceptions.h"
-#include "safe_stringstream.h"
 #include "font.h"
-#include "raw_convert.h"
 #include "content.h"
+#include <dcp/raw_convert.h>
 #include <libcxml/cxml.h>
 #include <libxml++/libxml++.h>
 #include <boost/foreach.hpp>
-#include <boost/make_shared.hpp>
 #include <iostream>
 
 #include "i18n.h"
@@ -38,8 +36,8 @@ using std::vector;
 using std::cout;
 using std::list;
 using boost::shared_ptr;
-using boost::make_shared;
 using boost::dynamic_pointer_cast;
+using dcp::raw_convert;
 
 int const SubtitleContentProperty::X_OFFSET = 500;
 int const SubtitleContentProperty::Y_OFFSET = 501;
@@ -51,7 +49,9 @@ int const SubtitleContentProperty::LANGUAGE = 506;
 int const SubtitleContentProperty::FONTS = 507;
 int const SubtitleContentProperty::COLOUR = 508;
 int const SubtitleContentProperty::OUTLINE = 509;
-int const SubtitleContentProperty::OUTLINE_COLOUR = 510;
+int const SubtitleContentProperty::SHADOW = 510;
+int const SubtitleContentProperty::EFFECT_COLOUR = 511;
+int const SubtitleContentProperty::LINE_SPACING = 512;
 
 SubtitleContent::SubtitleContent (Content* parent)
        : ContentPart (parent)
@@ -63,7 +63,9 @@ SubtitleContent::SubtitleContent (Content* parent)
        , _y_scale (1)
        , _colour (255, 255, 255)
        , _outline (false)
-       , _outline_colour (0, 0, 0)
+       , _shadow (false)
+       , _effect_colour (0, 0, 0)
+       , _line_spacing (1)
 {
 
 }
@@ -86,7 +88,6 @@ SubtitleContent::from_xml (Content* parent, cxml::ConstNodePtr node, int version
                return shared_ptr<SubtitleContent> ();
        }
 
-       /* Can't use make_shared here as the constructor is private */
        return shared_ptr<SubtitleContent> (new SubtitleContent (parent, node, version));
 }
 
@@ -104,11 +105,8 @@ SubtitleContent::SubtitleContent (Content* parent, cxml::ConstNodePtr node, int
                node->optional_number_child<int>("Blue").get_value_or(255)
                )
        , _outline (node->optional_bool_child("Outline").get_value_or(false))
-       , _outline_colour (
-               node->optional_number_child<int>("OutlineRed").get_value_or(255),
-               node->optional_number_child<int>("OutlineGreen").get_value_or(255),
-               node->optional_number_child<int>("OutlineBlue").get_value_or(255)
-               )
+       , _shadow (node->optional_bool_child("Shadow").get_value_or(false))
+       , _line_spacing (node->optional_number_child<double>("LineSpacing").get_value_or (1))
 {
        if (version >= 32) {
                _use = node->bool_child ("UseSubtitles");
@@ -129,11 +127,25 @@ SubtitleContent::SubtitleContent (Content* parent, cxml::ConstNodePtr node, int
                _x_scale = _y_scale = node->number_child<double> ("SubtitleScale");
        }
 
+       if (version >= 36) {
+               _effect_colour = dcp::Colour (
+                       node->optional_number_child<int>("EffectRed").get_value_or(255),
+                       node->optional_number_child<int>("EffectGreen").get_value_or(255),
+                       node->optional_number_child<int>("EffectBlue").get_value_or(255)
+                       );
+       } else {
+               _effect_colour = dcp::Colour (
+                       node->optional_number_child<int>("OutlineRed").get_value_or(255),
+                       node->optional_number_child<int>("OutlineGreen").get_value_or(255),
+                       node->optional_number_child<int>("OutlineBlue").get_value_or(255)
+                       );
+       }
+
        _language = node->optional_string_child ("SubtitleLanguage").get_value_or ("");
 
        list<cxml::NodePtr> fonts = node->node_children ("Font");
        for (list<cxml::NodePtr>::const_iterator i = fonts.begin(); i != fonts.end(); ++i) {
-               _fonts.push_back (make_shared<Font> (*i));
+               _fonts.push_back (shared_ptr<Font> (new Font (*i)));
        }
 
        connect_to_fonts ();
@@ -172,6 +184,10 @@ SubtitleContent::SubtitleContent (Content* parent, vector<shared_ptr<Content> >
                        throw JoinError (_("Content to be joined must have the same subtitle Y scale."));
                }
 
+               if (c[i]->subtitle->line_spacing() != ref->line_spacing()) {
+                       throw JoinError (_("Content to be joined must have the same subtitle line spacing."));
+               }
+
                list<shared_ptr<Font> > fonts = c[i]->subtitle->fonts ();
                if (fonts.size() != ref_fonts.size()) {
                        throw JoinError (_("Content to be joined must use the same fonts."));
@@ -197,6 +213,7 @@ SubtitleContent::SubtitleContent (Content* parent, vector<shared_ptr<Content> >
        _y_scale = ref->y_scale ();
        _language = ref->language ();
        _fonts = ref_fonts;
+       _line_spacing = ref->line_spacing ();
 
        connect_to_fonts ();
 }
@@ -207,8 +224,8 @@ SubtitleContent::as_xml (xmlpp::Node* root) const
 {
        boost::mutex::scoped_lock lm (_mutex);
 
-       root->add_child("UseSubtitles")->add_child_text (raw_convert<string> (_use));
-       root->add_child("BurnSubtitles")->add_child_text (raw_convert<string> (_burn));
+       root->add_child("UseSubtitles")->add_child_text (_use ? "1" : "0");
+       root->add_child("BurnSubtitles")->add_child_text (_burn ? "1" : "0");
        root->add_child("SubtitleXOffset")->add_child_text (raw_convert<string> (_x_offset));
        root->add_child("SubtitleYOffset")->add_child_text (raw_convert<string> (_y_offset));
        root->add_child("SubtitleXScale")->add_child_text (raw_convert<string> (_x_scale));
@@ -217,10 +234,12 @@ SubtitleContent::as_xml (xmlpp::Node* root) const
        root->add_child("Red")->add_child_text (raw_convert<string> (_colour.r));
        root->add_child("Green")->add_child_text (raw_convert<string> (_colour.g));
        root->add_child("Blue")->add_child_text (raw_convert<string> (_colour.b));
-       root->add_child("Outline")->add_child_text (raw_convert<string> (_outline));
-       root->add_child("OutlineRed")->add_child_text (raw_convert<string> (_outline_colour.r));
-       root->add_child("OutlineGreen")->add_child_text (raw_convert<string> (_outline_colour.g));
-       root->add_child("OutlineBlue")->add_child_text (raw_convert<string> (_outline_colour.b));
+       root->add_child("Outline")->add_child_text (_outline ? "1" : "0");
+       root->add_child("Shadow")->add_child_text (_shadow ? "1" : "0");
+       root->add_child("EffectRed")->add_child_text (raw_convert<string> (_effect_colour.r));
+       root->add_child("EffectGreen")->add_child_text (raw_convert<string> (_effect_colour.g));
+       root->add_child("EffectBlue")->add_child_text (raw_convert<string> (_effect_colour.b));
+       root->add_child("LineSpacing")->add_child_text (raw_convert<string> (_line_spacing));
 
        for (list<shared_ptr<Font> >::const_iterator i = _fonts.begin(); i != _fonts.end(); ++i) {
                (*i)->as_xml (root->add_child("Font"));
@@ -230,18 +249,18 @@ SubtitleContent::as_xml (xmlpp::Node* root) const
 string
 SubtitleContent::identifier () const
 {
-       SafeStringStream s;
-       s << raw_convert<string> (x_scale())
-         << "_" << raw_convert<string> (y_scale())
-         << "_" << raw_convert<string> (x_offset())
-         << "_" << raw_convert<string> (y_offset());
+       string s = raw_convert<string> (x_scale())
+               + "_" + raw_convert<string> (y_scale())
+               + "_" + raw_convert<string> (x_offset())
+               + "_" + raw_convert<string> (y_offset())
+               + "_" + raw_convert<string> (line_spacing());
 
        /* XXX: I suppose really _fonts shouldn't be in here, since not all
           types of subtitle content involve fonts.
        */
        BOOST_FOREACH (shared_ptr<Font> f, _fonts) {
                for (int i = 0; i < FontFiles::VARIANTS; ++i) {
-                       s << "_" << f->file(static_cast<FontFiles::Variant>(i)).get_value_or ("Default");
+                       s += "_" + f->file(static_cast<FontFiles::Variant>(i)).get_value_or("Default").string();
                }
        }
 
@@ -249,7 +268,7 @@ SubtitleContent::identifier () const
           how this content looks.
        */
 
-       return s.str ();
+       return s;
 }
 
 void
@@ -292,9 +311,15 @@ SubtitleContent::set_outline (bool o)
 }
 
 void
-SubtitleContent::set_outline_colour (dcp::Colour colour)
+SubtitleContent::set_shadow (bool s)
+{
+       maybe_set (_shadow, s, SubtitleContentProperty::SHADOW);
+}
+
+void
+SubtitleContent::set_effect_colour (dcp::Colour colour)
 {
-       maybe_set (_outline_colour, colour, SubtitleContentProperty::OUTLINE_COLOUR);
+       maybe_set (_effect_colour, colour, SubtitleContentProperty::EFFECT_COLOUR);
 }
 
 void
@@ -338,3 +363,9 @@ SubtitleContent::set_language (string language)
 {
        maybe_set (_language, language, SubtitleContentProperty::LANGUAGE);
 }
+
+void
+SubtitleContent::set_line_spacing (double s)
+{
+       maybe_set (_line_spacing, s, SubtitleContentProperty::LINE_SPACING);
+}