Do not try to restore Route solo state after clearing all solo state

[ardour.git] / gtk2_ardour / marker.cc

diff --git a/gtk2_ardour/marker.cc b/gtk2_ardour/marker.cc
index 49b4f2c1b07526f8658cd77f024680087d9fd68b..1120043eb9653cdce702fcf02a21f478e85ea1a2 100644 (file)
--- a/gtk2_ardour/marker.cc
+++ b/gtk2_ardour/marker.cc
@@ -29,11 +29,15 @@
 #include "canvas/scroll_group.h"
 #include "canvas/debug.h"
 
-#include "ardour_ui.h"
+#include "ui_config.h"
 /*
  * ardour_ui.h include was moved to the top of the list
  * due to a conflicting definition of 'Rect' between
  * Apple's MacTypes.h and GTK.
+ *
+ * Now that we are including ui_config.h and not ardour_ui.h
+ * the above comment may no longer apply and this comment
+ * can be removed and ui_config.h inclusion moved.
  */
 
 #include "marker.h"
@@ -43,7 +47,7 @@
 
 #include <gtkmm2ext/utils.h>
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;
@@ -77,8 +81,8 @@ ArdourMarker::ArdourMarker (PublicEditor& ed, ArdourCanvas::Container& parent, g
 {
 
        const double MH = marker_height - 1;
-       const double M3 = std::max(1.f, rintf(3.f * ARDOUR_UI::config()->get_ui_scale()));
-       const double M6 = std::max(2.f, rintf(6.f * ARDOUR_UI::config()->get_ui_scale()));
+       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()));
 
        /* Shapes we use:
         *
@@ -194,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));
@@ -257,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 */
 
@@ -282,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);
@@ -299,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));
        }
@@ -312,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)
@@ -342,7 +347,7 @@ ArdourMarker::setup_line ()
                if (_track_canvas_line == 0) {
 
                        _track_canvas_line = new ArdourCanvas::Line (editor.get_hscroll_group());
-                       _track_canvas_line->set_outline_color (ARDOUR_UI::config()->color ("edit point"));
+                       _track_canvas_line->set_outline_color (UIConfiguration::instance().color ("edit point"));
                        _track_canvas_line->Event.connect (sigc::bind (sigc::mem_fun (editor, &PublicEditor::canvas_marker_event), group, this));
                }
 
@@ -353,7 +358,7 @@ ArdourMarker::setup_line ()
                _track_canvas_line->set_x1 (d.x);
                _track_canvas_line->set_y0 (d.y);
                _track_canvas_line->set_y1 (ArdourCanvas::COORD_MAX);
-               _track_canvas_line->set_outline_color (_selected ? ARDOUR_UI::config()->color ("edit point") : _color);
+               _track_canvas_line->set_outline_color (_selected ? UIConfiguration::instance().color ("edit point") : _color);
                _track_canvas_line->raise_to_top ();
                _track_canvas_line->show ();
 
@@ -403,7 +408,7 @@ ArdourMarker::setup_name_display ()
                limit = _right_label_limit;
        }
 
-       const float padding =  std::max(2.f, rintf(2.f * ARDOUR_UI::config()->get_ui_scale()));
+       const float padding =  std::max(2.f, rintf(2.f * UIConfiguration::instance().get_ui_scale()));
 
        /* Work out how wide the name can be */
        int name_width = min ((double) pixel_width (_name, name_font) + padding, limit);
@@ -416,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);
@@ -531,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,
@@ -545,4 +570,3 @@ MeterMarker::MeterMarker (PublicEditor& editor, ArdourCanvas::Container& parent,
 MeterMarker::~MeterMarker ()
 {
 }
-