Fix deadlock.

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

diff --git a/src/lib/dcp_subtitle_content.cc b/src/lib/dcp_subtitle_content.cc
index 1935a874f7870dadfd8a6517d9acb13f9b6d09cf..3f9772d597de3b6464fe6b888a3f0be821d503d6 100644 (file)
--- a/src/lib/dcp_subtitle_content.cc
+++ b/src/lib/dcp_subtitle_content.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2015 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
@@ -17,16 +17,19 @@
 
 */
 
-#include <dcp/subtitle_content.h>
-#include <dcp/raw_convert.h>
+#include "font.h"
 #include "dcp_subtitle_content.h"
+#include "raw_convert.h"
+#include <dcp/interop_subtitle_content.h>
+#include <dcp/smpte_subtitle_content.h>
+#include <dcp/interop_load_font_node.h>
+#include <boost/foreach.hpp>
 
 #include "i18n.h"
 
 using std::string;
 using std::list;
 using boost::shared_ptr;
-using dcp::raw_convert;
 
 DCPSubtitleContent::DCPSubtitleContent (shared_ptr<const Film> film, boost::filesystem::path path)
        : Content (film, path)
@@ -44,11 +47,20 @@ DCPSubtitleContent::DCPSubtitleContent (shared_ptr<const Film> film, cxml::Const
 }
 
 void
-DCPSubtitleContent::examine (shared_ptr<Job> job, bool calculate_digest)
+DCPSubtitleContent::examine (shared_ptr<Job> job)
 {
-       Content::examine (job, calculate_digest);
-       dcp::SubtitleContent sc (path (0), false);
-       _length = DCPTime::from_seconds (sc.latest_subtitle_out().to_seconds ());
+       Content::examine (job);
+
+       shared_ptr<dcp::SubtitleContent> sc = load (path (0));
+       
+       boost::mutex::scoped_lock lm (_mutex);
+       
+       _subtitle_language = sc->language ();
+       _length = DCPTime::from_seconds (sc->latest_subtitle_out().to_seconds ());
+
+       BOOST_FOREACH (shared_ptr<dcp::LoadFontNode> i, sc->load_font_nodes ()) {
+               _fonts.push_back (shared_ptr<Font> (new Font (i->id)));
+       }
 }
 
 DCPTime
@@ -72,12 +84,6 @@ DCPSubtitleContent::technical_summary () const
        return Content::technical_summary() + " - " + _("DCP XML subtitles");
 }
       
-string
-DCPSubtitleContent::information () const
-{
-
-}
-
 void
 DCPSubtitleContent::as_xml (xmlpp::Node* node) const
 {