Use boost::signals2; fix bugs with x-thread signalling.

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

diff --git a/src/lib/decoder_factory.cc b/src/lib/decoder_factory.cc
index 56fb562961df38e4bcdeb090c60fc6770c2c1a43..06377e26c4cb6b476a273ccc0034d4df44dbaac5 100644 (file)
--- a/src/lib/decoder_factory.cc
+++ b/src/lib/decoder_factory.cc
@@ -27,15 +27,15 @@
 #include "imagemagick_decoder.h"
 #include "film.h"
 
-using namespace std;
-using namespace boost;
+using std::string;
+using boost::shared_ptr;
 
 shared_ptr<Decoder>
 decoder_factory (
        shared_ptr<Film> f, shared_ptr<const Options> o, Job* j, bool minimal = false, bool ignore_length = false
        )
 {
-       if (filesystem::is_directory (f->content_path ())) {
+       if (boost::filesystem::is_directory (f->content_path ())) {
                /* Assume a directory contains TIFFs */
                return shared_ptr<Decoder> (new TIFFDecoder (f, o, j, minimal, ignore_length));
        }