Revert "Revert "patch for waflib internals to allow tarball to be created even when...

[ardour.git] / gtk2_ardour / marker.cc

diff --git a/gtk2_ardour/marker.cc b/gtk2_ardour/marker.cc
index 2d9da96b0fc3afd9a97d703bae64b37d87245c49..1120043eb9653cdce702fcf02a21f478e85ea1a2 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)
@@ -535,6 +536,26 @@ TempoMarker::~TempoMarker ()
 {
 }
 
+void
+TempoMarker::update_height_mark (const double& ratio)
+{
+       const double MH = marker_height;
+       const double top = MH * (1 - 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)));
+       points->push_back (ArdourCanvas::Duple ( M6, MH));
+       points->push_back (ArdourCanvas::Duple (0.0, MH));
+       points->push_back (ArdourCanvas::Duple (0.0, min (top + (MH * .6), MH)));
+       points->push_back (ArdourCanvas::Duple ( M3, top));
+
+       mark->set (*points);
+}
+
 /***********************************************************************/
 
 MeterMarker::MeterMarker (PublicEditor& editor, ArdourCanvas::Container& parent, guint32 rgba, const string& text,
@@ -549,4 +570,3 @@ MeterMarker::MeterMarker (PublicEditor& editor, ArdourCanvas::Container& parent,
 MeterMarker::~MeterMarker ()
 {
 }
-