Use new signalling code for Hints::Hint.

4 files changed, 8 insertions, 3 deletions

diff --git a/src/lib/hints.cc b/src/lib/hints.cc
index cf385216e..c414d2231 100644
--- a/src/lib/hints.cc
+++ b/src/lib/hints.cc
@@ -551,7 +551,7 @@ catch (...)
 void
 Hints::hint(string h)
 {
-	emit(boost::bind(boost::ref(Hint), h));
+	Hint.emit(h);
 }
 
 
diff --git a/src/lib/hints.h b/src/lib/hints.h
index 49fd32ea9..024224806 100644
--- a/src/lib/hints.h
+++ b/src/lib/hints.h
@@ -23,6 +23,7 @@
 #include "dcp_text_track.h"
 #include "dcpomatic_time.h"
 #include "player_text.h"
+#include "signal.h"
 #include "signaller.h"
 #include "text_type.h"
 #include "weak_film.h"
@@ -44,7 +45,7 @@ public:
 
 	void start();
 
-	boost::signals2::signal<void (std::string)> Hint;
+	Signal<void (std::string)> Hint;
 	boost::signals2::signal<void (std::string)> Progress;
 	boost::signals2::signal<void (void)> Pulse;
 	boost::signals2::signal<void (void)> Finished;
diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc
index e0c69f5a4..7172bcda4 100644
--- a/src/tools/dcpomatic.cc
+++ b/src/tools/dcpomatic.cc
@@ -55,6 +55,7 @@
 #include "wx/templates_dialog.h"
 #include "wx/update_dialog.h"
 #include "wx/video_waveform_dialog.h"
+#include "wx/wx_signal.h"
 #include "wx/wx_signal_manager.h"
 #include "wx/wx_util.h"
 #include "wx/wx_variant.h"
@@ -1725,6 +1726,7 @@ private:
 			_frame->Show ();
 
 			signal_manager = new wxSignalManager (this);
+			thread_waker = new wxThreadWaker(this);
 			Bind (wxEVT_IDLE, boost::bind (&App::idle, this, _1));
 
 			if (!_film_to_load.empty() && dcp::filesystem::is_directory(_film_to_load)) {
@@ -1867,6 +1869,7 @@ private:
 	void idle (wxIdleEvent& ev)
 	{
 		signal_manager->ui_idle ();
+		pending::process();
 		ev.Skip ();
 	}
 
diff --git a/src/wx/hints_dialog.h b/src/wx/hints_dialog.h
index 44420405a..4919fe393 100644
--- a/src/wx/hints_dialog.h
+++ b/src/wx/hints_dialog.h
@@ -20,6 +20,7 @@
 
 
 #include "lib/change_signaller.h"
+#include "lib/signal.h"
 #include <dcp/warnings.h>
 LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
@@ -56,7 +57,7 @@ private:
 
 	boost::signals2::scoped_connection _film_change_connection;
 	boost::signals2::scoped_connection _film_content_change_connection;
-	boost::signals2::scoped_connection _hints_hint_connection;
+	ScopedConnection _hints_hint_connection;
 	boost::signals2::scoped_connection _hints_progress_connection;
 	boost::signals2::scoped_connection _hints_pulse_connection;
 	boost::signals2::scoped_connection _hints_finished_connection;