From f6fdd8dcbf41f864e9f0cc32dabe81fe3533ddfe Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Thu, 17 Dec 2009 18:24:23 +0000 Subject: switch to using boost::signals2 instead of sigc++, at least for libardour. not finished yet, but compiles, loads sessions, records and can close a session without a crash git-svn-id: svn://localhost/ardour2/branches/3.0@6372 d708f5d6-7413-0410-9779-e7cbd77b26cf --- libs/ardour/audio_track.cc | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'libs/ardour/audio_track.cc') diff --git a/libs/ardour/audio_track.cc b/libs/ardour/audio_track.cc index 68081661ad..736fe41738 100644 --- a/libs/ardour/audio_track.cc +++ b/libs/ardour/audio_track.cc @@ -17,9 +17,6 @@ */ -#include -#include -#include #include "pbd/error.h" #include "pbd/enumwriter.h" @@ -185,7 +182,7 @@ AudioTrack::set_diskstream (boost::shared_ptr ds, void * /*src* if (audio_diskstream()->deprecated_io_node) { if (!IO::connecting_legal) { - IO::ConnectingLegal.connect (sigc::mem_fun (*this, &AudioTrack::deprecated_use_diskstream_connections)); + scoped_connect (IO::ConnectingLegal, boost::bind (&AudioTrack::deprecated_use_diskstream_connections, this)); } else { deprecated_use_diskstream_connections (); } @@ -307,7 +304,7 @@ AudioTrack::_set_state (const XMLNode& node, int version, bool call_base) pending_state = const_cast (&node); if (_session.state_of_the_state() & Session::Loading) { - _session.StateReady.connect (sigc::mem_fun (*this, &AudioTrack::set_state_part_two)); + scoped_connect (_session.StateReady, boost::bind (&AudioTrack::set_state_part_two, this)); } else { set_state_part_two (); } -- cgit v1.2.3