Stop double-calculation of hashes.

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

diff --git a/src/lib/subtitle_content.cc b/src/lib/subtitle_content.cc
index f03968d91db3cfbc134bf7c54fb5277a605ff0d0..48c9e9cf6c8fb673df9f8b94582be870ba3d896c 100644 (file)
--- a/src/lib/subtitle_content.cc
+++ b/src/lib/subtitle_content.cc
@@ -24,7 +24,9 @@
 #include "font.h"
 #include "raw_convert.h"
 #include <libcxml/cxml.h>
+#include <libxml++/libxml++.h>
 #include <boost/foreach.hpp>
+#include <iostream>
 
 #include "i18n.h"
 
@@ -40,12 +42,15 @@ 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::FONTS = 506;
+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<const Film> f)
-       : Content (f)
+SubtitleContent::SubtitleContent (shared_ptr<const Film> film)
+       : Content (film)
        , _use_subtitles (false)
+       , _burn_subtitles (false)
        , _subtitle_x_offset (0)
        , _subtitle_y_offset (0)
        , _subtitle_x_scale (1)
@@ -54,9 +59,10 @@ SubtitleContent::SubtitleContent (shared_ptr<const Film> f)
 
 }
 
-SubtitleContent::SubtitleContent (shared_ptr<const Film> f, boost::filesystem::path p)
-       : Content (f, p)
+SubtitleContent::SubtitleContent (shared_ptr<const Film> film, boost::filesystem::path p)
+       : Content (film, p)
        , _use_subtitles (false)
+       , _burn_subtitles (false)
        , _subtitle_x_offset (0)
        , _subtitle_y_offset (0)
        , _subtitle_x_scale (1)
@@ -65,9 +71,10 @@ SubtitleContent::SubtitleContent (shared_ptr<const Film> f, boost::filesystem::p
 
 }
 
-SubtitleContent::SubtitleContent (shared_ptr<const Film> f, cxml::ConstNodePtr node, int version)
-       : Content (f, node)
+SubtitleContent::SubtitleContent (shared_ptr<const Film> film, cxml::ConstNodePtr node, int version)
+       : Content (film, node)
        , _use_subtitles (false)
+       , _burn_subtitles (false)
        , _subtitle_x_offset (0)
        , _subtitle_y_offset (0)
        , _subtitle_x_scale (1)
@@ -75,22 +82,21 @@ SubtitleContent::SubtitleContent (shared_ptr<const Film> f, cxml::ConstNodePtr n
 {
        if (version >= 32) {
                _use_subtitles = node->bool_child ("UseSubtitles");
-       } else {
-               _use_subtitles = false;
+               _burn_subtitles = node->bool_child ("BurnSubtitles");
        }
-       
+
        if (version >= 7) {
-               _subtitle_x_offset = node->number_child<float> ("SubtitleXOffset");
-               _subtitle_y_offset = node->number_child<float> ("SubtitleYOffset");
+               _subtitle_x_offset = node->number_child<double> ("SubtitleXOffset");
+               _subtitle_y_offset = node->number_child<double> ("SubtitleYOffset");
        } else {
-               _subtitle_y_offset = node->number_child<float> ("SubtitleOffset");
+               _subtitle_y_offset = node->number_child<double> ("SubtitleOffset");
        }
 
        if (version >= 10) {
-               _subtitle_x_scale = node->number_child<float> ("SubtitleXScale");
-               _subtitle_y_scale = node->number_child<float> ("SubtitleYScale");
+               _subtitle_x_scale = node->number_child<double> ("SubtitleXScale");
+               _subtitle_y_scale = node->number_child<double> ("SubtitleYScale");
        } else {
-               _subtitle_x_scale = _subtitle_y_scale = node->number_child<float> ("SubtitleScale");
+               _subtitle_x_scale = _subtitle_y_scale = node->number_child<double> ("SubtitleScale");
        }
 
        _subtitle_language = node->optional_string_child ("SubtitleLanguage").get_value_or ("");
@@ -103,13 +109,13 @@ SubtitleContent::SubtitleContent (shared_ptr<const Film> f, cxml::ConstNodePtr n
        connect_to_fonts ();
 }
 
-SubtitleContent::SubtitleContent (shared_ptr<const Film> f, vector<shared_ptr<Content> > c)
-       : Content (f, c)
+SubtitleContent::SubtitleContent (shared_ptr<const Film> film, vector<shared_ptr<Content> > c)
+       : Content (film, c)
 {
        shared_ptr<SubtitleContent> ref = dynamic_pointer_cast<SubtitleContent> (c[0]);
        DCPOMATIC_ASSERT (ref);
        list<shared_ptr<Font> > ref_fonts = ref->fonts ();
-       
+
        for (size_t i = 0; i < c.size(); ++i) {
                shared_ptr<SubtitleContent> sc = dynamic_pointer_cast<SubtitleContent> (c[i]);
 
@@ -117,10 +123,14 @@ SubtitleContent::SubtitleContent (shared_ptr<const Film> f, vector<shared_ptr<Co
                        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."));
                }
@@ -151,6 +161,7 @@ SubtitleContent::SubtitleContent (shared_ptr<const Film> f, vector<shared_ptr<Co
        }
 
        _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_x_scale = ref->subtitle_x_scale ();
@@ -166,8 +177,9 @@ void
 SubtitleContent::as_xml (xmlpp::Node* root) const
 {
        boost::mutex::scoped_lock lm (_mutex);
-       
+
        root->add_child("UseSubtitles")->add_child_text (raw_convert<string> (_use_subtitles));
+       root->add_child("BurnSubtitles")->add_child_text (raw_convert<string> (_burn_subtitles));
        root->add_child("SubtitleXOffset")->add_child_text (raw_convert<string> (_subtitle_x_offset));
        root->add_child("SubtitleYOffset")->add_child_text (raw_convert<string> (_subtitle_y_offset));
        root->add_child("SubtitleXScale")->add_child_text (raw_convert<string> (_subtitle_x_scale));
@@ -188,7 +200,17 @@ SubtitleContent::set_use_subtitles (bool u)
        }
        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)
 {
@@ -249,6 +271,15 @@ SubtitleContent::identifier () const
          << "_" << raw_convert<string> (subtitle_x_offset())
          << "_" << raw_convert<string> (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<Font> f, _fonts) {
+               for (int i = 0; i < FontFiles::VARIANTS; ++i) {
+                       s << "_" << f->file(static_cast<FontFiles::Variant>(i)).get_value_or ("Default");
+               }
+       }
+
        /* The language is for metadata only, and doesn't affect
           how this content looks.
        */
@@ -283,3 +314,8 @@ SubtitleContent::font_changed ()
        signal_changed (SubtitleContentProperty::FONTS);
 }
 
+bool
+SubtitleContent::has_subtitles () const
+{
+       return has_text_subtitles() || has_image_subtitles();
+}