diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2009-12-17 18:24:23 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2009-12-17 18:24:23 +0000 |
| commit | f6fdd8dcbf41f864e9f0cc32dabe81fe3533ddfe (patch) | |
| tree | 5214c580b9e6c17a499fa587660dbf949e892bf2 /libs/ardour/session_midi.cc | |
| parent | da762129f19c28aff64f833b6ec09fba946faef6 (diff) | |
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
Diffstat (limited to 'libs/ardour/session_midi.cc')
| -rw-r--r-- | libs/ardour/session_midi.cc | 45 |
1 files changed, 16 insertions, 29 deletions
diff --git a/libs/ardour/session_midi.cc b/libs/ardour/session_midi.cc index d006097f09..b2cece991c 100644 --- a/libs/ardour/session_midi.cc +++ b/libs/ardour/session_midi.cc @@ -208,39 +208,26 @@ Session::set_mmc_port (string port_tag) mmc->set_send_device_id (old_send_device_id); } - mmc->Play.connect - (sigc::mem_fun (*this, &Session::mmc_deferred_play)); - mmc->DeferredPlay.connect - (sigc::mem_fun (*this, &Session::mmc_deferred_play)); - mmc->Stop.connect - (sigc::mem_fun (*this, &Session::mmc_stop)); - mmc->FastForward.connect - (sigc::mem_fun (*this, &Session::mmc_fast_forward)); - mmc->Rewind.connect - (sigc::mem_fun (*this, &Session::mmc_rewind)); - mmc->Pause.connect - (sigc::mem_fun (*this, &Session::mmc_pause)); - mmc->RecordPause.connect - (sigc::mem_fun (*this, &Session::mmc_record_pause)); - mmc->RecordStrobe.connect - (sigc::mem_fun (*this, &Session::mmc_record_strobe)); - mmc->RecordExit.connect - (sigc::mem_fun (*this, &Session::mmc_record_exit)); - mmc->Locate.connect - (sigc::mem_fun (*this, &Session::mmc_locate)); - mmc->Step.connect - (sigc::mem_fun (*this, &Session::mmc_step)); - mmc->Shuttle.connect - (sigc::mem_fun (*this, &Session::mmc_shuttle)); - mmc->TrackRecordStatusChange.connect - (sigc::mem_fun (*this, &Session::mmc_record_enable)); + scoped_connect (mmc->Play, boost::bind (&Session::mmc_deferred_play, this, _1)); + scoped_connect (mmc->DeferredPlay, boost::bind (&Session::mmc_deferred_play, this, _1)); + scoped_connect (mmc->Stop, boost::bind (&Session::mmc_stop, this, _1)); + scoped_connect (mmc->FastForward, boost::bind (&Session::mmc_fast_forward, this, _1)); + scoped_connect (mmc->Rewind, boost::bind (&Session::mmc_rewind, this, _1)); + scoped_connect (mmc->Pause, boost::bind (&Session::mmc_pause, this, _1)); + scoped_connect (mmc->RecordPause, boost::bind (&Session::mmc_record_pause, this, _1)); + scoped_connect (mmc->RecordStrobe, boost::bind (&Session::mmc_record_strobe, this, _1)); + scoped_connect (mmc->RecordExit, boost::bind (&Session::mmc_record_exit, this, _1)); + scoped_connect (mmc->Locate, boost::bind (&Session::mmc_locate, this, _1, _2)); + scoped_connect (mmc->Step, boost::bind (&Session::mmc_step, this, _1, _2)); + scoped_connect (mmc->Shuttle, boost::bind (&Session::mmc_shuttle, this, _1, _2, _3)); + scoped_connect (mmc->TrackRecordStatusChange, boost::bind (&Session::mmc_record_enable, this, _1, _2, _3)); /* also handle MIDI SPP because its so common */ - _mmc_port->input()->start.connect (sigc::mem_fun (*this, &Session::spp_start)); - _mmc_port->input()->contineu.connect (sigc::mem_fun (*this, &Session::spp_continue)); - _mmc_port->input()->stop.connect (sigc::mem_fun (*this, &Session::spp_stop)); + scoped_connect (_mmc_port->input()->start, boost::bind (&Session::spp_start, this, _1, _2)); + scoped_connect (_mmc_port->input()->contineu, boost::bind (&Session::spp_continue, this, _1, _2)); + scoped_connect (_mmc_port->input()->stop, boost::bind (&Session::spp_stop, this, _1, _2)); Config->set_mmc_port_name (port_tag); |