diff options
| author | Carl Hetherington <cth@carlh.net> | 2012-10-24 22:13:53 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2012-10-24 22:13:53 +0100 |
| commit | 63ea6b6c5ee64f8ee067c2b488d004b6dfe363e0 (patch) | |
| tree | d248762556466fd076cfd20f2e6aa1d5d9544184 /src/tools | |
| parent | 977b36672892b14de4ecb68e98415c64946e8a93 (diff) | |
Use boost::signals2; fix bugs with x-thread signalling.
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/dvdomatic.cc | 2 | ||||
| -rw-r--r-- | src/tools/makedcp.cc | 9 |
2 files changed, 8 insertions, 3 deletions
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) |