projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Unify gain and draw tools.
[ardour.git]
/
gtk2_ardour
/
control_point.cc
diff --git
a/gtk2_ardour/control_point.cc
b/gtk2_ardour/control_point.cc
index 9b588d1babadc97b530dcee308dbf5c7783a44a4..ea50f8bab86c9510a21e777d88f4f7a8fe45c3d0 100644
(file)
--- a/
gtk2_ardour/control_point.cc
+++ b/
gtk2_ardour/control_point.cc
@@
-45,8
+45,8
@@
ControlPoint::ControlPoint (AutomationLine& al)
_item = new ArdourCanvas::Rectangle (&_line.canvas_group());
_item->set_fill (true);
_item = new ArdourCanvas::Rectangle (&_line.canvas_group());
_item->set_fill (true);
- _item->set_fill_color (ARDOUR_UI::config()->get_
canvasvar_
ControlPointFill());
- _item->set_outline_color (ARDOUR_UI::config()->get_
canvasvar_
ControlPointOutline());
+ _item->set_fill_color (ARDOUR_UI::config()->get_ControlPointFill());
+ _item->set_outline_color (ARDOUR_UI::config()->get_ControlPointOutline());
_item->set_data ("control_point", this);
_item->Event.connect (sigc::mem_fun (this, &ControlPoint::event_handler));
_item->set_data ("control_point", this);
_item->Event.connect (sigc::mem_fun (this, &ControlPoint::event_handler));
@@
-70,7
+70,7
@@
ControlPoint::ControlPoint (const ControlPoint& other, bool /*dummy_arg_to_force
_item = new ArdourCanvas::Rectangle (&_line.canvas_group());
_item->set_fill (true);
_item = new ArdourCanvas::Rectangle (&_line.canvas_group());
_item->set_fill (true);
- _item->set_outline_color (ARDOUR_UI::config()->get_
canvasvar_
ControlPointOutline());
+ _item->set_outline_color (ARDOUR_UI::config()->get_ControlPointOutline());
/* NOTE: no event handling in copied ControlPoints */
/* NOTE: no event handling in copied ControlPoints */
@@
-122,13
+122,13
@@
ControlPoint::set_color ()
uint32_t color = 0;
if (_selected) {
uint32_t color = 0;
if (_selected) {
- color = ARDOUR_UI::config()->get_
canvasvar_
ControlPointSelected();
+ color = ARDOUR_UI::config()->get_ControlPointSelected();
} else {
} else {
- color = ARDOUR_UI::config()->get_
canvasvar_
ControlPointOutline();
+ color = ARDOUR_UI::config()->get_ControlPointOutline();
}
_item->set_outline_color (color);
}
_item->set_outline_color (color);
- _item->set_fill_color (ARDOUR_UI::config()->get_
canvasvar_
ControlPointFill());
+ _item->set_fill_color (ARDOUR_UI::config()->get_ControlPointFill());
}
void
}
void
@@
-167,8
+167,8
@@
ControlPoint::move_to (double x, double y, ShapeType shape)
_shape = shape;
}
_shape = shape;
}
-void
-ControlPoint::i
2w (double& x, double& y) const
+ArdourCanvas::Item&
+ControlPoint::i
tem() const
{
{
-
_item->item_to_canvas (x, y)
;
+
return *_item
;
}
}