smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-06 23:05:04 +01:00
Code Issues Projects Releases Wiki Activity

global marker objects do not need a canvas height, so remove member and API to manage it

Browse source 
They extend (down) from an origin to COORD_MAX. The height is irrelevant
This commit is contained in:
Paul Davis 2021-05-14 16:57:07 -06:00
parent 8859f76f48
commit 1685843082
5 changed files with 0 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

1
gtk2_ardour/editor.h
View file

@ -715,7 +715,6 @@ private:
void set_show_lines (bool); void set_show_lines (bool);
void set_selected (bool); void set_selected (bool);
void canvas_height_set (double);
void setup_lines (); void setup_lines ();
void set_name (const std::string&); void set_name (const std::string&);

4
gtk2_ardour/editor_canvas.cc
View file

@ -296,10 +296,6 @@ Editor::track_canvas_viewport_size_allocated ()
if (height_changed) { 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); vertical_adjustment.set_page_size (_visible_canvas_height);
if ((vertical_adjustment.get_value() + _visible_canvas_height) >= vertical_adjustment.get_upper()) { if ((vertical_adjustment.get_value() + _visible_canvas_height) >= vertical_adjustment.get_upper()) {
/* /*

10
gtk2_ardour/editor_markers.cc
View file

@ -188,7 +188,6 @@ Editor::add_new_location_internal (Location* location)
select_new_marker = false; select_new_marker = false;
} }
lam->canvas_height_set (_visible_canvas_height);
lam->set_show_lines (_show_marker_lines); lam->set_show_lines (_show_marker_lines);
/* Add these markers to the appropriate sorted marker lists, which will render /* 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 void
Editor::LocationMarkers::set_name (const string& str) Editor::LocationMarkers::set_name (const string& str)
{ {

7
gtk2_ardour/marker.cc
View file

@ -386,13 +386,6 @@ ArdourMarker::setup_line ()
} }
} }
void
ArdourMarker::canvas_height_set (double h)
{
_canvas_height = h;
setup_line ();
}
ArdourCanvas::Item& ArdourCanvas::Item&
ArdourMarker::the_item() const ArdourMarker::the_item() const
{ {

2
gtk2_ardour/marker.h
View file

@ -78,7 +78,6 @@ public:
void set_selected (bool); void set_selected (bool);
void set_show_line (bool); void set_show_line (bool);
void canvas_height_set (double);
void set_position (samplepos_t); void set_position (samplepos_t);
void set_name (const std::string&); void set_name (const std::string&);
@ -127,7 +126,6 @@ protected:
bool _selected; bool _selected;
bool _shown; bool _shown;
bool _line_shown; bool _line_shown;
double _canvas_height;
uint32_t _color; uint32_t _color;
uint32_t _points_color; uint32_t _points_color;
double _left_label_limit; ///< the number of pixels available to the left of this marker for a label double _left_label_limit; ///< the number of pixels available to the left of this marker for a label