assert() to help find some possible causes of #2991. Fix some confusion with GTK...

[ardour.git] / libs / ardour / internal_return.cc

diff --git a/libs/ardour/internal_return.cc b/libs/ardour/internal_return.cc
index 8a3baf5bda1fd274ac7e1384030f11fddd257046..279472e02d18cda39eef14d6236aed6f56303eeb 100644 (file)
--- a/libs/ardour/internal_return.cc
+++ b/libs/ardour/internal_return.cc
@@ -27,24 +27,24 @@
 using namespace std;
 using namespace ARDOUR;
 
-sigc::signal<void,nframes_t> InternalReturn::CycleStart;
+PBD::Signal1<void,nframes_t> InternalReturn::CycleStart;
 
 InternalReturn::InternalReturn (Session& s)
        : Return (s, true)
        , user_count (0)
 {
-       CycleStart.connect (mem_fun (*this, &InternalReturn::cycle_start));
+       CycleStart.connect_same_thread (*this, boost::bind (&InternalReturn::cycle_start, this, _1));
 }
 
 InternalReturn::InternalReturn (Session& s, const XMLNode& node)
        : Return (s, node, true)
        , user_count (0)
 {
-       CycleStart.connect (mem_fun (*this, &InternalReturn::cycle_start));
+       CycleStart.connect_same_thread (*this, boost::bind (&InternalReturn::cycle_start, this, _1));
 }
 
 void
-InternalReturn::run (BufferSet& bufs, sframes_t /*start_frame*/, sframes_t /*end_frame*/, nframes_t nframes)
+InternalReturn::run (BufferSet& bufs, sframes_t /*start_frame*/, sframes_t /*end_frame*/, nframes_t nframes, bool)
 {
        if (!_active && !_pending_active) {
                return;