Merge branch '2.0' of git.carlh.net:git/dcpomatic into 2.0

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

diff --git a/src/lib/content.cc b/src/lib/content.cc
index 550a8cd0577333d88844ea014d2f41b60299c7f7..b9e8367e1c3025ba0b0ea992c6a5c8830de60efb 100644 (file)
--- a/src/lib/content.cc
+++ b/src/lib/content.cc
@@ -24,13 +24,12 @@
 #include "content.h"
 #include "util.h"
 #include "content_factory.h"
-#include "ui_signaller.h"
 #include "exceptions.h"
 #include "film.h"
 #include "safe_stringstream.h"
 #include "job.h"
+#include "raw_convert.h"
 #include <libcxml/cxml.h>
-#include <dcp/raw_convert.h>
 #include <libxml++/libxml++.h>
 #include <boost/thread/mutex.hpp>
 
@@ -42,7 +41,6 @@ using std::cout;
 using std::vector;
 using std::max;
 using boost::shared_ptr;
-using dcp::raw_convert;
 
 int const ContentProperty::PATH = 400;
 int const ContentProperty::POSITION = 401;
@@ -145,7 +143,7 @@ Content::examine (shared_ptr<Job> job)
           digest here: a MD5 of the first and last 1e6 bytes with the
           size of the first file tacked on the end as a string.
        */
-       string const d = md5_digest_head_tail (p, 1000000) + dcp::raw_convert<string> (boost::filesystem::file_size (p.front ()));
+       string const d = md5_digest_head_tail (p, 1000000) + raw_convert<string> (boost::filesystem::file_size (p.front ()));
 
        lm.lock ();
        _digest = d;
@@ -154,9 +152,7 @@ Content::examine (shared_ptr<Job> job)
 void
 Content::signal_changed (int p)
 {
-       if (ui_signaller) {
-               ui_signaller->emit (boost::bind (boost::ref (Changed), shared_from_this (), p, _change_signals_frequent));
-       }
+       emit (boost::bind (boost::ref (Changed), shared_from_this (), p, _change_signals_frequent));
 }
 
 void