Merge master.

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

diff --git a/src/lib/subtitle_content.cc b/src/lib/subtitle_content.cc
index 9fefbbfcda7258c5ff66ec01d80658bf46761bfd..4c6e601926d2ebf096450a443ee7560bda152fba 100644 (file)
--- a/src/lib/subtitle_content.cc
+++ b/src/lib/subtitle_content.cc
@@ -19,46 +19,104 @@
 
 #include <libcxml/cxml.h>
 #include "subtitle_content.h"
+#include "util.h"
+#include "exceptions.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;
 
-int const SubtitleContentProperty::SUBTITLE_OFFSET = 500;
-int const SubtitleContentProperty::SUBTITLE_SCALE = 501;
+int const SubtitleContentProperty::SUBTITLE_X_OFFSET = 500;
+int const SubtitleContentProperty::SUBTITLE_Y_OFFSET = 501;
+int const SubtitleContentProperty::SUBTITLE_SCALE = 502;
 
 SubtitleContent::SubtitleContent (shared_ptr<const Film> f, boost::filesystem::path p)
        : Content (f, p)
-       , _subtitle_offset (0)
+       , _subtitle_x_offset (0)
+       , _subtitle_y_offset (0)
        , _subtitle_scale (1)
 {
 
 }
 
-SubtitleContent::SubtitleContent (shared_ptr<const Film> f, shared_ptr<const cxml::Node> node)
+SubtitleContent::SubtitleContent (shared_ptr<const Film> f, shared_ptr<const cxml::Node> node, int version)
        : Content (f, node)
-       , _subtitle_offset (0)
+       , _subtitle_x_offset (0)
+       , _subtitle_y_offset (0)
        , _subtitle_scale (1)
 {
-       _subtitle_offset = node->number_child<float> ("SubtitleOffset");
+       LocaleGuard lg;
+
+       if (version >= 7) {
+               _subtitle_x_offset = node->number_child<float> ("SubtitleXOffset");
+               _subtitle_y_offset = node->number_child<float> ("SubtitleYOffset");
+       } else {
+               _subtitle_y_offset = node->number_child<float> ("SubtitleOffset");
+       }
+       
        _subtitle_scale = node->number_child<float> ("SubtitleScale");
 }
 
+SubtitleContent::SubtitleContent (shared_ptr<const Film> f, vector<shared_ptr<Content> > c)
+       : Content (f, c)
+{
+       shared_ptr<SubtitleContent> ref = dynamic_pointer_cast<SubtitleContent> (c[0]);
+       assert (ref);
+       
+       for (size_t i = 0; i < c.size(); ++i) {
+               shared_ptr<SubtitleContent> sc = dynamic_pointer_cast<SubtitleContent> (c[i]);
+
+               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."));
+               }
+       }
+
+       _subtitle_x_offset = ref->subtitle_x_offset ();
+       _subtitle_y_offset = ref->subtitle_y_offset ();
+       _subtitle_scale = ref->subtitle_scale ();
+}
+
 void
 SubtitleContent::as_xml (xmlpp::Node* root) const
 {
-       root->add_child("SubtitleOffset")->add_child_text (lexical_cast<string> (_subtitle_offset));
+       LocaleGuard lg;
+       
+       root->add_child("SubtitleXOffset")->add_child_text (lexical_cast<string> (_subtitle_x_offset));
+       root->add_child("SubtitleYOffset")->add_child_text (lexical_cast<string> (_subtitle_y_offset));
        root->add_child("SubtitleScale")->add_child_text (lexical_cast<string> (_subtitle_scale));
 }
 
 void
-SubtitleContent::set_subtitle_offset (double o)
+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_y_offset (double o)
 {
        {
                boost::mutex::scoped_lock lm (_mutex);
-               _subtitle_offset = o;
+               _subtitle_y_offset = o;
        }
-       signal_changed (SubtitleContentProperty::SUBTITLE_OFFSET);
+       signal_changed (SubtitleContentProperty::SUBTITLE_Y_OFFSET);
 }
 
 void