Don't report an error when the user cancels a time stretch operation.

[ardour.git] / gtk2_ardour / marker_time_axis_view.cc

diff --git a/gtk2_ardour/marker_time_axis_view.cc b/gtk2_ardour/marker_time_axis_view.cc
index 2d9a30b0a32050c1f0a73cae1573aa8d4601ed9c..c4fa4bc4c818478aa5e8512b07f4fd6f9aba52f2 100644 (file)
--- a/gtk2_ardour/marker_time_axis_view.cc
+++ b/gtk2_ardour/marker_time_axis_view.cc
@@ -67,6 +67,7 @@ MarkerTimeAxisView::MarkerTimeAxisView(MarkerTimeAxis& tv)
        _samples_per_unit = _trackview.editor.get_current_zoom() ;
 
        _trackview.editor.ZoomChanged.connect (sigc::mem_fun(*this, &MarkerTimeAxisView::reset_samples_per_unit));
+       MarkerView::CatchDeletion.connect (*this, ui_bind (&MarkerTimeAxisView::remove_marker_view, this, _1), gui_context());
 }
 
 /**
@@ -211,9 +212,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 (*this, boost::bind (&MarkerTimeAxisView::remove_marker_view, this, (void*)this));
-
-        MarkerViewAdded(mv,src) ; /* EMIT_SIGNAL */
+       MarkerViewAdded(mv,src) ; /* EMIT_SIGNAL */
 
        return(mv) ;
 }
@@ -311,7 +310,7 @@ MarkerTimeAxisView::remove_named_marker_view(std::string item_id, void* src)
  * @param src the identity of the object that initiated the change
  */
 void
-MarkerTimeAxisView::remove_marker_view(MarkerView* mv, void* src)
+MarkerTimeAxisView::remove_marker_view (MarkerView* mv)
 {
        ENSURE_GUI_THREAD (*this, &MarkerTimeAxisView::remove_marker_view, mv, src)
 
@@ -326,7 +325,6 @@ MarkerTimeAxisView::remove_marker_view(MarkerView* mv, void* src)
        }
 }
 
-
 /**
  * Sets the duration of the selected MarkerView to the specified number of seconds
  *