Move selection/punch clocks to editor Sidebar

[ardour.git] / gtk2_ardour / marker.cc

diff --git a/gtk2_ardour/marker.cc b/gtk2_ardour/marker.cc
index c018ba54e7198b81abe8b4b877003d675b2d261d..60f280930594d44eefb76860c57f52bdbc27b8dd 100644 (file)
--- a/gtk2_ardour/marker.cc
+++ b/gtk2_ardour/marker.cc
@@ -47,7 +47,7 @@
 
 #include <gtkmm2ext/utils.h>
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;
@@ -198,7 +198,7 @@ ArdourMarker::ArdourMarker (PublicEditor& ed, ArdourCanvas::Container& parent, g
 
        case SessionEnd:
        case RangeEnd:
-               points = new ArdourCanvas::Points ();
+               points = new ArdourCanvas::Points (); // leaks
                points->push_back (ArdourCanvas::Duple ( M6, 0.0));
                points->push_back (ArdourCanvas::Duple ( M6, MH));
                points->push_back (ArdourCanvas::Duple (0.0, MH * .5));
@@ -316,6 +316,7 @@ ArdourMarker::~ArdourMarker ()
        /* destroying the parent group destroys its contents, namely any polygons etc. that we added */
        delete group;
        delete _track_canvas_line;
+       delete points;
 }
 
 void ArdourMarker::reparent(ArdourCanvas::Container & parent)
@@ -524,10 +525,9 @@ ArdourMarker::set_right_label_limit (double p)
 
 TempoMarker::TempoMarker (PublicEditor& editor, ArdourCanvas::Container& parent, guint32 rgba, const string& text,
                          ARDOUR::TempoSection& temp)
-       : ArdourMarker (editor, parent, rgba, text, Tempo, 0, false),
+       : ArdourMarker (editor, parent, rgba, text, Tempo, temp.frame(), false),
          _tempo (temp)
 {
-       set_position (_tempo.frame());
        group->Event.connect (sigc::bind (sigc::mem_fun (editor, &PublicEditor::canvas_tempo_marker_event), group, this));
 }
 
@@ -543,6 +543,7 @@ TempoMarker::update_height_mark (const double& ratio)
        const double M3 = std::max(1.f, rintf(3.f * UIConfiguration::instance().get_ui_scale()));
        const double M6 = std::max(2.f, rintf(6.f * UIConfiguration::instance().get_ui_scale()));
 
+       delete points;
        points = new ArdourCanvas::Points ();
        points->push_back (ArdourCanvas::Duple ( M3, top));
        points->push_back (ArdourCanvas::Duple ( M6, min (top + (MH * .6), MH)));
@@ -558,14 +559,12 @@ TempoMarker::update_height_mark (const double& ratio)
 
 MeterMarker::MeterMarker (PublicEditor& editor, ArdourCanvas::Container& parent, guint32 rgba, const string& text,
                          ARDOUR::MeterSection& m)
-       : ArdourMarker (editor, parent, rgba, text, Meter, 0, false),
+       : ArdourMarker (editor, parent, rgba, text, Meter, m.frame(), false),
          _meter (m)
 {
-       set_position (_meter.frame());
        group->Event.connect (sigc::bind (sigc::mem_fun (editor, &PublicEditor::canvas_meter_marker_event), group, this));
 }
 
 MeterMarker::~MeterMarker ()
 {
 }
-