Installer now handles i18n of the Desktop folder. Running the installer or uninstalle...

[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 928242a78e1f8ab6bf66e9c188f79588526ff1ba..dd827b4c3cb980790d49e05fdd514288cf946b7d 100644 (file)
--- a/gtk2_ardour/marker_time_axis.cc
+++ b/gtk2_ardour/marker_time_axis.cc
@@ -42,7 +42,6 @@
 
 using namespace ARDOUR;
 using namespace PBD;
-using namespace sigc;
 using namespace Gtk;
 
 //---------------------------------------------------------------------------------------//
@@ -57,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)
 {
@@ -91,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
@@ -118,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 */
 }
 
 /**