diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h index 6702193754..37e4ab3958 100644 --- a/gtk2_ardour/editor.h +++ b/gtk2_ardour/editor.h @@ -715,7 +715,6 @@ private: void set_show_lines (bool); void set_selected (bool); - void canvas_height_set (double); void setup_lines (); void set_name (const std::string&); diff --git a/gtk2_ardour/editor_canvas.cc b/gtk2_ardour/editor_canvas.cc index aa13b21955..699eca653e 100644 --- a/gtk2_ardour/editor_canvas.cc +++ b/gtk2_ardour/editor_canvas.cc @@ -296,10 +296,6 @@ Editor::track_canvas_viewport_size_allocated () if (height_changed) { - for (LocationMarkerMap::iterator i = location_markers.begin(); i != location_markers.end(); ++i) { - i->second->canvas_height_set (_visible_canvas_height); - } - vertical_adjustment.set_page_size (_visible_canvas_height); if ((vertical_adjustment.get_value() + _visible_canvas_height) >= vertical_adjustment.get_upper()) { /* diff --git a/gtk2_ardour/editor_markers.cc b/gtk2_ardour/editor_markers.cc index 29864da13d..643bb77876 100644 --- a/gtk2_ardour/editor_markers.cc +++ b/gtk2_ardour/editor_markers.cc @@ -188,7 +188,6 @@ Editor::add_new_location_internal (Location* location) select_new_marker = false; } - lam->canvas_height_set (_visible_canvas_height); lam->set_show_lines (_show_marker_lines); /* Add these markers to the appropriate sorted marker lists, which will render @@ -581,15 +580,6 @@ Editor::LocationMarkers::show() } } -void -Editor::LocationMarkers::canvas_height_set (double h) -{ - start->canvas_height_set (h); - if (end) { - end->canvas_height_set (h); - } -} - void Editor::LocationMarkers::set_name (const string& str) { diff --git a/gtk2_ardour/marker.cc b/gtk2_ardour/marker.cc index 69a84024e4..41840b7145 100644 --- a/gtk2_ardour/marker.cc +++ b/gtk2_ardour/marker.cc @@ -386,13 +386,6 @@ ArdourMarker::setup_line () } } -void -ArdourMarker::canvas_height_set (double h) -{ - _canvas_height = h; - setup_line (); -} - ArdourCanvas::Item& ArdourMarker::the_item() const { diff --git a/gtk2_ardour/marker.h b/gtk2_ardour/marker.h index f714f47827..54c1534521 100644 --- a/gtk2_ardour/marker.h +++ b/gtk2_ardour/marker.h @@ -78,7 +78,6 @@ public: void set_selected (bool); void set_show_line (bool); - void canvas_height_set (double); void set_position (samplepos_t); void set_name (const std::string&); @@ -127,7 +126,6 @@ protected: bool _selected; bool _shown; bool _line_shown; - double _canvas_height; uint32_t _color; uint32_t _points_color; double _left_label_limit; ///< the number of pixels available to the left of this marker for a label