Save and load subtitle font details.

diff --git a/src/lib/font.cc b/src/lib/font.cc
new file mode 100644 (file)
index 0000000..bf7a79a
--- /dev/null
+++ b/src/lib/font.cc
@@ -0,0 +1,45 @@
+/*
+    Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+
+    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
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#include "font.h"
+#include <libxml++/libxml++.h>
+
+Font::Font (cxml::NodePtr node)
+{
+       id = node->optional_string_child ("Id");
+       file = node->optional_string_child ("File");
+}
+
+void
+Font::as_xml (xmlpp::Node* node)
+{
+       if (id) {
+               node->add_child("Id")->add_child_text (id.get ());
+       }
+
+       if (file) {
+               node->add_child("File")->add_child_text (file.get().string ());
+       }
+}
+
+bool
+operator!= (Font const & a, Font const & b)
+{
+       return (a.id != b.id || a.file != b.file);
+}

diff --git a/src/lib/font.h b/src/lib/font.h
index 59d9832778cc69f0ced6312e6a4d3ee3211ad7b6..7a26eefc9227f0f11554a9c9d9b5cfa4aa182fe7 100644 (file)
--- a/src/lib/font.h
+++ b/src/lib/font.h
@@ -17,6 +17,7 @@
 
 */
 
+#include <libcxml/cxml.h>
 #include <boost/optional.hpp>
 #include <boost/filesystem.hpp>
 #include <string>
@@ -25,10 +26,18 @@ class Font
 {
 public:
        Font () {}
+
        Font (std::string id_)
                : id (id_) {}
+
+       Font (cxml::NodePtr node);
+
+       void as_xml (xmlpp::Node* node);
        
        /** Font ID, or empty for the default font */
        boost::optional<std::string> id;
        boost::optional<boost::filesystem::path> file;
 };
+
+bool
+operator!= (Font const & a, Font const & b);

diff --git a/src/lib/subtitle_content.cc b/src/lib/subtitle_content.cc
index f6bceb753459032b8434973e7fe79247b73415ef..6f9bdf3a4ebb7312bf9aa101f81eaafbfebca1c2 100644 (file)
--- a/src/lib/subtitle_content.cc
+++ b/src/lib/subtitle_content.cc
@@ -23,12 +23,14 @@
 #include "util.h"
 #include "exceptions.h"
 #include "safe_stringstream.h"
+#include "font.h"
 
 #include "i18n.h"
 
 using std::string;
 using std::vector;
 using std::cout;
+using std::list;
 using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
 using dcp::raw_convert;
@@ -92,6 +94,11 @@ SubtitleContent::SubtitleContent (shared_ptr<const Film> f, cxml::ConstNodePtr n
        }
 
        _subtitle_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 (shared_ptr<Font> (new Font (*i)));
+       }
 }
 
 SubtitleContent::SubtitleContent (shared_ptr<const Film> f, vector<shared_ptr<Content> > c)
@@ -99,6 +106,7 @@ SubtitleContent::SubtitleContent (shared_ptr<const Film> f, vector<shared_ptr<Co
 {
        shared_ptr<SubtitleContent> ref = dynamic_pointer_cast<SubtitleContent> (c[0]);
        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]);
@@ -122,6 +130,22 @@ SubtitleContent::SubtitleContent (shared_ptr<const Film> f, vector<shared_ptr<Co
                if (sc->subtitle_y_scale() != ref->subtitle_y_scale()) {
                        throw JoinError (_("Content to be joined must have the same subtitle Y scale."));
                }
+
+               list<shared_ptr<Font> > fonts = sc->fonts ();
+               if (fonts.size() != ref_fonts.size()) {
+                       throw JoinError (_("Content to be joined must use the same fonts."));
+               }
+
+               list<shared_ptr<Font> >::const_iterator j = ref_fonts.begin ();
+               list<shared_ptr<Font> >::const_iterator k = fonts.begin ();
+
+               while (j != ref_fonts.end ()) {
+                       if (**j != **k) {
+                               throw JoinError (_("Content to be joined must use the same fonts."));
+                       }
+                       ++j;
+                       ++k;
+               }
        }
 
        _use_subtitles = ref->use_subtitles ();
@@ -130,17 +154,25 @@ SubtitleContent::SubtitleContent (shared_ptr<const Film> f, vector<shared_ptr<Co
        _subtitle_x_scale = ref->subtitle_x_scale ();
        _subtitle_y_scale = ref->subtitle_y_scale ();
        _subtitle_language = ref->subtitle_language ();
+       _fonts = ref_fonts;
 }
 
+/** _mutex must not be held on entry */
 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("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));
        root->add_child("SubtitleYScale")->add_child_text (raw_convert<string> (_subtitle_y_scale));
        root->add_child("SubtitleLanguage")->add_child_text (_subtitle_language);
+
+       for (list<shared_ptr<Font> >::const_iterator i = _fonts.begin(); i != _fonts.end(); ++i) {
+               (*i)->as_xml (root->add_child("Font"));
+       }
 }
 
 void

diff --git a/src/lib/wscript b/src/lib/wscript
index 7edd5dcdf0d3747c6a2e4efad7fe5499753638fa..ca6a493759dcd23d8babb81073dee5f8da3ec7ab 100644 (file)
--- a/src/lib/wscript
+++ b/src/lib/wscript
@@ -42,6 +42,7 @@ sources = """
           ffmpeg_subtitle_stream.cc
           film.cc
           filter.cc
+          font.cc
           frame_rate_change.cc
           internet.cc
           image.cc