diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2009-12-21 18:23:07 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2009-12-21 18:23:07 +0000 |
| commit | f450df300c9c057141a4caf79ff6dbfbf58492d9 (patch) | |
| tree | 409f9c56056a337cade83d45ccff47ccdb06dd0c /libs/ardour/diskstream.cc | |
| parent | 738387f9a417537e768d56d3fc4afcb9dc82d66b (diff) | |
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
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 8af85a553c..a37323de84 100644 --- a/libs/ardour/diskstream.cc +++ b/libs/ardour/diskstream.cc @@ -142,13 +142,13 @@ Diskstream::set_route (Route& r) _io = _route->input(); ic_connection.disconnect(); - _io->changed.connect (ic_connection, boost::bind (&Diskstream::handle_input_change, this, _1, _2)); + _io->changed.connect_same_thread (ic_connection, boost::bind (&Diskstream::handle_input_change, this, _1, _2)); input_change_pending = ConfigurationChanged; non_realtime_input_change (); set_align_style_from_io (); - _route->GoingAway.connect (*this, boost::bind (&Diskstream::route_going_away, this)); + _route->GoingAway.connect_same_thread (*this, boost::bind (&Diskstream::route_going_away, this)); } void @@ -339,9 +339,9 @@ Diskstream::use_playlist (boost::shared_ptr<Playlist> playlist) reset_write_sources (false); } - _playlist->Modified.connect (playlist_connections, boost::bind (&Diskstream::playlist_modified, this)); - _playlist->GoingAway.connect (playlist_connections, boost::bind (&Diskstream::playlist_deleted, this, boost::weak_ptr<Playlist>(_playlist))); - _playlist->RangesMoved.connect (playlist_connections, boost::bind (&Diskstream::playlist_ranges_moved, this, _1)); + _playlist->Modified.connect_same_thread (playlist_connections, boost::bind (&Diskstream::playlist_modified, this)); + _playlist->GoingAway.connect_same_thread (playlist_connections, boost::bind (&Diskstream::playlist_deleted, this, boost::weak_ptr<Playlist>(_playlist))); + _playlist->RangesMoved.connect_same_thread (playlist_connections, boost::bind (&Diskstream::playlist_ranges_moved, this, _1)); } /* don't do this if we've already asked for it *or* if we are setting up |