changes to waveform clipping display

[ardour.git] / gtk2_ardour / marker.cc

diff --git a/gtk2_ardour/marker.cc b/gtk2_ardour/marker.cc
index 1e4809f6c2115121c64969b84eecf807055cc2f6..652a43657e1ebe273fe3765329d9d19c04f92541 100644 (file)
--- a/gtk2_ardour/marker.cc
+++ b/gtk2_ardour/marker.cc
@@ -26,6 +26,7 @@
 #include "canvas/polygon.h"
 #include "canvas/text.h"
 #include "canvas/canvas.h"
+#include "canvas/debug.h"
 
 #include "ardour_ui.h"
 /*
@@ -248,17 +249,14 @@ Marker::Marker (PublicEditor& ed, ArdourCanvas::Group& parent, guint32 rgba, con
 #ifdef CANVAS_DEBUG
        _name_background->name = string_compose ("Marker::_name_background for %1", annotation);
 #endif 
-       _name_background->set_outline_width (1);
 
        /* adjust to properly locate the tip */
 
        mark = new ArdourCanvas::Polygon (group);
-#ifdef CANVAS_DEBUG
-       mark->name = string_compose ("Marker::mark for %1", annotation);
-#endif 
+       CANVAS_DEBUG_NAME (mark, string_compose ("Marker::mark for %1", annotation));
+
        mark->set (*points);
        set_color_rgba (rgba);
-       mark->set_outline_width (1);
 
        /* setup name pixbuf sizes */
        name_font = get_font_for_style (N_("MarkerText"));
@@ -272,13 +270,10 @@ Marker::Marker (PublicEditor& ed, ArdourCanvas::Group& parent, guint32 rgba, con
        Gtkmm2ext::get_ink_pixel_size (layout, width, name_height);
        
        _name_item = new ArdourCanvas::Text (group);
+       CANVAS_DEBUG_NAME (_name_item, string_compose ("Marker::_name_item for %1", annotation));
        _name_item->set_font_description (name_font);
        _name_item->set_color (RGBA_TO_UINT (0,0,0,255));
-
-#ifdef CANVAS_DEBUG
-       _name_item->name = string_compose ("Marker::_name_item for %1", annotation);
-#endif 
-       _name_item->set_position (ArdourCanvas::Duple (_label_offset, (13.0 / 2.0) - (name_height / 2.0)));
+       _name_item->set_position (ArdourCanvas::Duple (_label_offset, (13.0 / 2.0) - (name_height / 2.0) - 2.0));
 
        set_name (annotation.c_str());
 
@@ -294,7 +289,6 @@ Marker::Marker (PublicEditor& ed, ArdourCanvas::Group& parent, guint32 rgba, con
        if (handle_events) {
                group->Event.connect (sigc::bind (sigc::mem_fun (editor, &PublicEditor::canvas_marker_event), group, this));
        }
-
 }
 
 Marker::~Marker ()
@@ -335,11 +329,11 @@ Marker::setup_line ()
                if (_time_bars_line == 0) {
 
                        _time_bars_line = new ArdourCanvas::Line (editor.get_time_bars_group());
-                       _time_bars_line->set_outline_color (ARDOUR_UI::config()->canvasvar_EditPoint.get());
+                       _time_bars_line->set_outline_color (ARDOUR_UI::config()->get_canvasvar_EditPoint());
                        _time_bars_line->Event.connect (sigc::bind (sigc::mem_fun (editor, &PublicEditor::canvas_marker_event), group, this));
                        
                        _track_canvas_line = new ArdourCanvas::Line (editor.get_track_canvas_group());
-                       _track_canvas_line->set_outline_color (ARDOUR_UI::config()->canvasvar_EditPoint.get());
+                       _track_canvas_line->set_outline_color (ARDOUR_UI::config()->get_canvasvar_EditPoint());
                        _track_canvas_line->Event.connect (sigc::bind (sigc::mem_fun (editor, &PublicEditor::canvas_marker_event), group, this));
                }
 
@@ -350,7 +344,7 @@ Marker::setup_line ()
                 _time_bars_line->set_x1 (d.x);
                _time_bars_line->set_y0 (d.y);
                _time_bars_line->set_y1 (ArdourCanvas::COORD_MAX);
-               _time_bars_line->set_outline_color (_selected ? ARDOUR_UI::config()->canvasvar_EditPoint.get() : _color);
+               _time_bars_line->set_outline_color (_selected ? ARDOUR_UI::config()->get_canvasvar_EditPoint() : _color);
                _time_bars_line->raise_to_top ();
                _time_bars_line->show ();
 
@@ -359,7 +353,7 @@ Marker::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()->canvasvar_EditPoint.get() : _color);
+               _track_canvas_line->set_outline_color (_selected ? ARDOUR_UI::config()->get_canvasvar_EditPoint() : _color);
                _track_canvas_line->raise_to_top ();
                _track_canvas_line->show ();