From 63ea6b6c5ee64f8ee067c2b488d004b6dfe363e0 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Wed, 24 Oct 2012 22:13:53 +0100
Subject: Use boost::signals2; fix bugs with x-thread signalling.

---
 src/tools/dvdomatic.cc | 2 +-
 src/tools/makedcp.cc   | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

(limited to 'src/tools')

diff --git a/src/tools/dvdomatic.cc b/src/tools/dvdomatic.cc
index 4e3006c57..add0f6144 100644
--- a/src/tools/dvdomatic.cc
+++ b/src/tools/dvdomatic.cc
@@ -229,7 +229,7 @@ public:
 		film_editor->setup_visibility ();
 		film_viewer->setup_visibility ();
 		
-		film_editor->FileChanged.connect (sigc::mem_fun (*this, &Frame::file_changed));
+		film_editor->FileChanged.connect (bind (&Frame::file_changed, this, _1));
 		if (film) {
 			file_changed (film->directory ());
 		} else {
diff --git a/src/tools/makedcp.cc b/src/tools/makedcp.cc
index 03e85e995..2d4df030c 100644
--- a/src/tools/makedcp.cc
+++ b/src/tools/makedcp.cc
@@ -36,8 +36,13 @@
 #include "config.h"
 #include "log.h"
 
-using namespace std;
-using namespace boost;
+using std::string;
+using std::cerr;
+using std::cout;
+using std::vector;
+using std::pair;
+using std::list;
+using boost::shared_ptr;
 
 static void
 help (string n)
-- 
cgit v1.2.3