smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-10 23:46:20 +01:00
Code Issues Projects Releases Wiki Activity

fix up 2 canvas items with APIs that conflict with Item::clear (temporarily named Item::clear_children()

Browse source
This commit is contained in:
Paul Davis 2017-08-24 22:31:42 -04:00
parent eb5d459564
commit 3f48b1e719
4 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
libs/canvas/canvas/line_set.h
View file

@ -46,8 +46,8 @@ public:
void set_extent (Distance);
Distance extent() const { return _extent; }
void add (Coord, Distance, Gtkmm2ext::Color);
void clear ();
void add_line (Coord, Distance, Gtkmm2ext::Color);
void clear_lines ();
struct Line {
Line (Coord p, Distance width_, Gtkmm2ext::Color color_) : pos (p), width (width_), color (color_) {}

2
libs/canvas/canvas/meter.h
View file

@ -75,7 +75,7 @@ class Meter : public Item {
static void flush_pattern_cache();
void set (float level, float peak = -1);
void clear ();
void clear_display ();
float get_level() { return current_level; }
float get_user_level() { return current_user_level; }

4
libs/canvas/line_set.cc
View file

@ -130,7 +130,7 @@ LineSet::render (Rect const & area, Cairo::RefPtr<Cairo::Context> context) const
}
void
LineSet::add (Coord y, Distance width, Gtkmm2ext::Color color)
LineSet::add_line (Coord y, Distance width, Gtkmm2ext::Color color)
{
begin_change ();
@ -142,7 +142,7 @@ LineSet::add (Coord y, Distance width, Gtkmm2ext::Color color)
}
void
LineSet::clear ()
LineSet::clear_lines ()
{
begin_change ();
_lines.clear ();

2
libs/canvas/meter.cc
View file

@ -930,7 +930,7 @@ Meter::set_highlight (bool onoff)
}
void
Meter::clear ()
Meter::clear_display ()
{
current_level = 0;
current_peak = 0;