diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2009-12-11 23:29:48 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2009-12-11 23:29:48 +0000 |
| commit | 64dc5427e4f5339a16a018692dd94f476c53cae9 (patch) | |
| tree | 83b76bb578698dbfcde040aa9013a7351190a9b5 /gtk2_ardour/marker_time_axis_view.cc | |
| parent | d7de23db0f325aaa1dd573739bc9e33925ebdfce (diff) | |
make all use of bind/mem_fun be explicitly sigc::
git-svn-id: svn://localhost/ardour2/branches/3.0@6354 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/marker_time_axis_view.cc')
| -rw-r--r-- | gtk2_ardour/marker_time_axis_view.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gtk2_ardour/marker_time_axis_view.cc b/gtk2_ardour/marker_time_axis_view.cc index 417ac5c8dc..4189788b4c 100644 --- a/gtk2_ardour/marker_time_axis_view.cc +++ b/gtk2_ardour/marker_time_axis_view.cc @@ -62,11 +62,11 @@ MarkerTimeAxisView::MarkerTimeAxisView(MarkerTimeAxis& tv) canvas_rect->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_MarkerTrack.get(); canvas_rect->property_fill_color_rgba() = stream_base_color; - canvas_rect->signal_event().connect (bind (mem_fun (_trackview.editor, &PublicEditor::canvas_marker_time_axis_view_event), canvas_rect, &_trackview)); + canvas_rect->signal_event().connect (sigc::bind (sigc::mem_fun (_trackview.editor, &PublicEditor::canvas_marker_time_axis_view_event), canvas_rect, &_trackview)); _samples_per_unit = _trackview.editor.get_current_zoom() ; - _trackview.editor.ZoomChanged.connect (mem_fun(*this, &MarkerTimeAxisView::reset_samples_per_unit)); + _trackview.editor.ZoomChanged.connect (sigc::mem_fun(*this, &MarkerTimeAxisView::reset_samples_per_unit)); } /** @@ -211,7 +211,7 @@ MarkerTimeAxisView::add_marker_view(ImageFrameView* ifv, std::string mark_type, ifv->add_marker_view_item(mv, src) ; marker_view_list.push_front(mv) ; - mv->GoingAway.connect(bind (mem_fun(*this,&MarkerTimeAxisView::remove_marker_view), (void*)this)) ; + mv->GoingAway.connect(sigc::bind (sigc::mem_fun(*this,&MarkerTimeAxisView::remove_marker_view), (void*)this)) ; MarkerViewAdded(mv,src) ; /* EMIT_SIGNAL */ @@ -313,7 +313,7 @@ MarkerTimeAxisView::remove_named_marker_view(std::string item_id, void* src) void MarkerTimeAxisView::remove_marker_view(MarkerView* mv, void* src) { - ENSURE_GUI_THREAD(bind (mem_fun(*this, &MarkerTimeAxisView::remove_marker_view), mv, src)); + ENSURE_GUI_THREAD (*this, &MarkerTimeAxisView::remove_marker_view, mv, src) MarkerViewList::iterator i; |