rename Timecode::BBT_Time::ticks_per_beat to Timecode::BBT_Time::ticks_per_bar_divisi...

[ardour.git] / gtk2_ardour / marker_time_axis.cc

diff --git a/gtk2_ardour/marker_time_axis.cc b/gtk2_ardour/marker_time_axis.cc
index 9dea703dfd2574e695707cbec8c7f361f0e595cd..dd827b4c3cb980790d49e05fdd514288cf946b7d 100644 (file)
--- a/gtk2_ardour/marker_time_axis.cc
+++ b/gtk2_ardour/marker_time_axis.cc
@@ -56,7 +56,7 @@ using namespace Gtk;
  * @param name the name/id of this time axis
  * @param tav the associated track view that this MarkerTimeAxis is marking up
  */
-MarkerTimeAxis::MarkerTimeAxis (PublicEditor& ed, ARDOUR::Session& sess, Canvas& canvas, const string & name, TimeAxisView* tav)
+MarkerTimeAxis::MarkerTimeAxis (PublicEditor& ed, ARDOUR::Session* sess, Canvas& canvas, const string & name, TimeAxisView* tav)
        : AxisView(sess),
          VisualTimeAxis(name, ed, sess, canvas)
 {
@@ -90,7 +90,7 @@ MarkerTimeAxis::MarkerTimeAxis (PublicEditor& ed, ARDOUR::Session& sess, Canvas&
  */
 MarkerTimeAxis::~MarkerTimeAxis()
 {
-       GoingAway() ; /* EMIT_SIGNAL */
+       CatchDeletion (this); /* EMIT_SIGNAL */
 
        // destroy the view helper
        // this handles removing and destroying individual marker items
@@ -117,7 +117,7 @@ MarkerTimeAxis::set_height (uint32_t h)
        }
 
        // tell those interested that we have had our height changed
-        gui_changed("track_height",(void*)0) ; /* EMIT_SIGNAL */
+       gui_changed("track_height",(void*)0) ; /* EMIT_SIGNAL */
 }
 
 /**