From f450df300c9c057141a4caf79ff6dbfbf58492d9 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Mon, 21 Dec 2009 18:23:07 +0000 Subject: 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 --- gtk2_ardour/audio_streamview.cc | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'gtk2_ardour/audio_streamview.cc') diff --git a/gtk2_ardour/audio_streamview.cc b/gtk2_ardour/audio_streamview.cc index 6fb481db2d..b95377a58c 100644 --- a/gtk2_ardour/audio_streamview.cc +++ b/gtk2_ardour/audio_streamview.cc @@ -66,7 +66,7 @@ AudioStreamView::AudioStreamView (AudioTimeAxisView& tv) use_rec_regions = tv.editor().show_waveforms_recording (); - Config->ParameterChanged.connect (*this, sigc::mem_fun (*this, &AudioStreamView::parameter_changed)); + Config->ParameterChanged.connect (*this, ui_bind (&AudioStreamView::parameter_changed, this, _1), gui_context()); } AudioStreamView::~AudioStreamView () @@ -190,7 +190,7 @@ AudioStreamView::add_region_view_internal (boost::shared_ptr r, bool wai /* catch region going away */ - r->GoingAway.connect (*this, boost::bind (&AudioStreamView::remove_region_view, this, boost::weak_ptr (r))); + r->GoingAway.connect (*this, boost::bind (&AudioStreamView::remove_region_view, this, boost::weak_ptr (r)), gui_context()); RegionViewAdded (region_view); @@ -288,7 +288,7 @@ AudioStreamView::playlist_changed (boost::shared_ptr ds) boost::shared_ptr apl = boost::dynamic_pointer_cast(ds->playlist()); if (apl) { - apl->NewCrossfade.connect (playlist_connections, boost::bind (&AudioStreamView::add_crossfade, this, _1)); + apl->NewCrossfade.connect (playlist_connections, ui_bind (&AudioStreamView::add_crossfade, this, _1), gui_context()); } } @@ -347,7 +347,7 @@ AudioStreamView::add_crossfade (boost::shared_ptr crossfade) region_color, *lview, *rview); cv->set_valid (true); - crossfade->Invalidated.connect (*this, sigc::mem_fun (*this, &AudioStreamView::remove_crossfade)); + crossfade->Invalidated.connect (*this, ui_bind (&AudioStreamView::remove_crossfade, this, _1), gui_context()); crossfade_views[cv->crossfade] = cv; if (!_trackview.session()->config.get_xfades_visible() || !crossfades_visible) { cv->hide (); @@ -482,10 +482,9 @@ AudioStreamView::setup_rec_box () boost::shared_ptr src = ads->write_source (n); if (src) { sources.push_back (src); - - (src->PeakRangeReady.connect (rec_data_ready_connections, - boost::bind (&AudioStreamView::rec_peak_range_ready, - this, _1, _2, boost::weak_ptr(src)))); + src->PeakRangeReady.connect (rec_data_ready_connections, + ui_bind (&AudioStreamView::rec_peak_range_ready, this, _1, _2, boost::weak_ptr(src)), + gui_context()); } } -- cgit v1.2.3