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 30be8fd7868988bdcd0501144538468ca8f6b41a..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));
@@ -261,12 +261,12 @@ ArdourMarker::ArdourMarker (PublicEditor& ed, ArdourCanvas::Container& parent, g
        group = new ArdourCanvas::Container (&parent, ArdourCanvas::Duple (unit_position, 0));
 #ifdef CANVAS_DEBUG
        group->name = string_compose ("Marker::group for %1", annotation);
-#endif 
+#endif
 
        _name_background = new ArdourCanvas::Rectangle (group);
 #ifdef CANVAS_DEBUG
        _name_background->name = string_compose ("Marker::_name_background for %1", annotation);
-#endif 
+#endif
 
        /* adjust to properly locate the tip */
 
@@ -286,7 +286,7 @@ ArdourMarker::ArdourMarker (PublicEditor& ed, ArdourCanvas::Container& parent, g
 
        layout->set_font_description (name_font);
        Gtkmm2ext::get_ink_pixel_size (layout, width, name_height);
-       
+
        _name_item = new ArdourCanvas::Text (group);
        CANVAS_DEBUG_NAME (_name_item, string_compose ("ArdourMarker::_name_item for %1", annotation));
        _name_item->set_font_description (name_font);
@@ -303,7 +303,7 @@ ArdourMarker::ArdourMarker (PublicEditor& ed, ArdourCanvas::Container& parent, g
 
        group->set_data ("marker", this);
        mark->set_data ("marker", this);
-       
+
        if (handle_events) {
                group->Event.connect (sigc::bind (sigc::mem_fun (editor, &PublicEditor::canvas_marker_event), group, this));
        }
@@ -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)
@@ -420,10 +421,10 @@ ArdourMarker::setup_name_display ()
                if (label_on_left ()) {
                        _name_item->set_x_position (-name_width);
                }
-                       
+
                _name_item->clamp_width (name_width);
                _name_item->set (_name);
-               
+
                if (label_on_left ()) {
                        /* adjust right edge of background to fit text */
                        _name_background->set_x0 (_name_item->position().x - padding);
@@ -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));
 }
 
@@ -535,18 +535,36 @@ 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,
                          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 ()
 {
 }
-