fully implement and deploy explicit x-thread signal connection syntax (testing comes next)

git-svn-id: svn://localhost/ardour2/branches/3.0@6379 d708f5d6-7413-0410-9779-e7cbd77b26cf

3 files changed, 8 insertions, 4 deletions

diff --git a/libs/ardour/ardour/audiosource.h b/libs/ardour/ardour/audiosource.h
index 4f46451907..45f62fc7b9 100644
--- a/libs/ardour/ardour/audiosource.h
+++ b/libs/ardour/ardour/audiosource.h
@@ -72,7 +72,7 @@ class AudioSource : virtual public Source,
 			sframes_t start, nframes_t cnt, double samples_per_visual_peak) const;
 
 	int  build_peaks ();
-	bool peaks_ready (boost::function<void()> callWhenReady, PBD::Connection& connection_created_if_not_ready) const;
+	bool peaks_ready (boost::function<void()> callWhenReady, PBD::Connection& connection_created_if_not_ready, PBD::EventLoop* event_loop) const;
 
 	mutable PBD::Signal0<void>  PeaksReady;
 	mutable PBD::Signal2<void,nframes_t,nframes_t>  PeakRangeReady;
diff --git a/libs/ardour/ardour/midi_ui.h b/libs/ardour/ardour/midi_ui.h
index c21182f4e2..819b70df43 100644
--- a/libs/ardour/ardour/midi_ui.h
+++ b/libs/ardour/ardour/midi_ui.h
@@ -30,6 +30,8 @@ class MidiControlUI : public AbstractUI<MidiUIRequest>
   public:
 	MidiControlUI (Session& s);
 	~MidiControlUI ();
+
+	static MidiControlUI* instance() { return _instance; }
 	
 	static BaseUI::RequestType PortChange;
 	
@@ -48,6 +50,8 @@ class MidiControlUI : public AbstractUI<MidiUIRequest>
 	bool midi_input_handler (Glib::IOCondition, MIDI::Port*);
 	void reset_ports ();
 	void clear_ports ();
+
+	static MidiControlUI* _instance;
 };
 
 }
diff --git a/libs/ardour/ardour/session_event.h b/libs/ardour/ardour/session_event.h
index 66c8720186..2ce2d5225a 100644
--- a/libs/ardour/ardour/session_event.h
+++ b/libs/ardour/ardour/session_event.h
@@ -7,7 +7,7 @@
 
 #include "pbd/pool.h"
 #include "pbd/ringbuffer.h"
-#include "pbd/ui_callback.h"
+#include "pbd/event_loop.h"
 
 #include "ardour/types.h"
 
@@ -73,7 +73,7 @@ struct SessionEvent {
     boost::shared_ptr<RouteList> routes;    /* apply to */
     boost::function<void (void)> rt_slot;   /* what to call in RT context */
     RTeventCallback              rt_return; /* called after rt_slot, with this event as an argument */
-    PBD::UICallback*  ui;
+    PBD::EventLoop*              event_loop;
 
     std::list<AudioRange> audio_range;
     std::list<MusicRange> music_range;
@@ -88,7 +88,7 @@ struct SessionEvent {
 	    , speed (spd)
 	    , yes_or_no (yn)
 	    , second_yes_or_no (yn2)
-	    , ui (0) {}
+	    , event_loop (0) {}
 
     void set_ptr (void* p) {
 	    ptr = p;