Fix failure on 1-frame-back seek (#604).

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

diff --git a/src/lib/subtitle_content.cc b/src/lib/subtitle_content.cc
index 2bed5413c61d2b8797cae544a3a995440a5ef4c1..f03968d91db3cfbc134bf7c54fb5277a605ff0d0 100644 (file)
--- a/src/lib/subtitle_content.cc
+++ b/src/lib/subtitle_content.cc
@@ -17,13 +17,14 @@
 
 */
 
-#include <libcxml/cxml.h>
-#include <dcp/raw_convert.h>
 #include "subtitle_content.h"
 #include "util.h"
 #include "exceptions.h"
 #include "safe_stringstream.h"
 #include "font.h"
+#include "raw_convert.h"
+#include <libcxml/cxml.h>
+#include <boost/foreach.hpp>
 
 #include "i18n.h"
 
@@ -33,7 +34,6 @@ using std::cout;
 using std::list;
 using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
-using dcp::raw_convert;
 
 int const SubtitleContentProperty::SUBTITLE_X_OFFSET = 500;
 int const SubtitleContentProperty::SUBTITLE_Y_OFFSET = 501;
@@ -99,6 +99,8 @@ SubtitleContent::SubtitleContent (shared_ptr<const Film> f, cxml::ConstNodePtr n
        for (list<cxml::NodePtr>::const_iterator i = fonts.begin(); i != fonts.end(); ++i) {
                _fonts.push_back (shared_ptr<Font> (new Font (*i)));
        }
+
+       connect_to_fonts ();
 }
 
 SubtitleContent::SubtitleContent (shared_ptr<const Film> f, vector<shared_ptr<Content> > c)
@@ -155,6 +157,8 @@ SubtitleContent::SubtitleContent (shared_ptr<const Film> f, vector<shared_ptr<Co
        _subtitle_y_scale = ref->subtitle_y_scale ();
        _subtitle_language = ref->subtitle_language ();
        _fonts = ref_fonts;
+
+       connect_to_fonts ();
 }
 
 /** _mutex must not be held on entry */
@@ -251,3 +255,31 @@ SubtitleContent::identifier () const
 
        return s.str ();
 }
+
+void
+SubtitleContent::add_font (shared_ptr<Font> font)
+{
+       _fonts.push_back (font);
+       connect_to_fonts ();
+}
+
+void
+SubtitleContent::connect_to_fonts ()
+{
+       BOOST_FOREACH (boost::signals2::connection& i, _font_connections) {
+               i.disconnect ();
+       }
+
+       _font_connections.clear ();
+
+       BOOST_FOREACH (shared_ptr<Font> i, _fonts) {
+               _font_connections.push_back (i->Changed.connect (boost::bind (&SubtitleContent::font_changed, this)));
+       }
+}
+
+void
+SubtitleContent::font_changed ()
+{
+       signal_changed (SubtitleContentProperty::FONTS);
+}
+