diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2009-12-12 15:02:15 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2009-12-12 15:02:15 +0000 |
| commit | 8687895abba4209a6de8d8a8fc1bda5996f0d875 (patch) | |
| tree | a2123e967e7c9906d787a5cec94ec53894d32734 /libs/ardour/diskstream.cc | |
| parent | 0c80b01f4724922a95d22fc441d6854da001c442 (diff) | |
remove using namespace sigc everywhere to ensure clarity over which bind/mem_fun is being used; make Config::map_parameters take a boost::function rather than a sigc::slot ; continue debugging crash caused by regionviews not tracking their Region's lifetime
git-svn-id: svn://localhost/ardour2/branches/3.0@6357 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/diskstream.cc')
| -rw-r--r-- | libs/ardour/diskstream.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libs/ardour/diskstream.cc b/libs/ardour/diskstream.cc index b1d5a92355..ee279c601d 100644 --- a/libs/ardour/diskstream.cc +++ b/libs/ardour/diskstream.cc @@ -143,13 +143,13 @@ Diskstream::set_route (Route& r) _io = _route->input(); ic_connection.disconnect(); - ic_connection = _io->changed.connect (mem_fun (*this, &Diskstream::handle_input_change)); + ic_connection = _io->changed.connect (sigc::mem_fun (*this, &Diskstream::handle_input_change)); input_change_pending = ConfigurationChanged; non_realtime_input_change (); set_align_style_from_io (); - _route->GoingAway.connect (mem_fun (*this, &Diskstream::route_going_away)); + _route->GoingAway.connect (sigc::mem_fun (*this, &Diskstream::route_going_away)); } void @@ -342,9 +342,9 @@ Diskstream::use_playlist (boost::shared_ptr<Playlist> playlist) reset_write_sources (false); } - plmod_connection = _playlist->Modified.connect (mem_fun (*this, &Diskstream::playlist_modified)); - plgone_connection = _playlist->GoingAway.connect (bind (mem_fun (*this, &Diskstream::playlist_deleted), boost::weak_ptr<Playlist>(_playlist))); - plregion_connection = _playlist->RangesMoved.connect (mem_fun (*this, &Diskstream::playlist_ranges_moved)); + plmod_connection = _playlist->Modified.connect (sigc::mem_fun (*this, &Diskstream::playlist_modified)); + plgone_connection = _playlist->GoingAway.connect (sigc::bind (sigc::mem_fun (*this, &Diskstream::playlist_deleted), boost::weak_ptr<Playlist>(_playlist))); + plregion_connection = _playlist->RangesMoved.connect (sigc::mem_fun (*this, &Diskstream::playlist_ranges_moved)); } /* don't do this if we've already asked for it *or* if we are setting up |