mirror of
https://github.com/Ardour/ardour.git
synced 2025-12-15 19:16:40 +01:00
plugin selector from doug; lots and lots of fixes from karsten
git-svn-id: svn://localhost/trunk/ardour2@105 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
parent
46cbbae4ee
commit
bac3c6bc0f
20 changed files with 766 additions and 509 deletions
|
|
@ -31,30 +31,32 @@ using namespace ARDOUR;
|
|||
using namespace Gtk;
|
||||
|
||||
Editor::Cursor::Cursor (Editor& ed, const string& color, bool (Editor::*callbck)(GdkEvent*,ArdourCanvas::Item*))
|
||||
: editor (ed), length(1.0)
|
||||
: editor (ed),
|
||||
points (2),
|
||||
canvas_item (*editor.cursor_group),
|
||||
length(1.0)
|
||||
{
|
||||
|
||||
/* "randomly" initialize coords */
|
||||
|
||||
points->push_back(Gnome::Art::Point(-9383839.0, 0.0));
|
||||
points->push_back(Gnome::Art::Point(1.0, 0.0));
|
||||
Gnome::Canvas::Group *group = editor.cursor_group;
|
||||
points.push_back(Gnome::Art::Point(-9383839.0, 0.0));
|
||||
points.push_back(Gnome::Art::Point(1.0, 0.0));
|
||||
|
||||
// cerr << "set cursor points, nc = " << points->num_points << endl;
|
||||
|
||||
canvas_item = new Gnome::Canvas::Line (*group, *points);
|
||||
canvas_item->set_property ("fill_color", color.c_str());
|
||||
canvas_item->set_property ("width_pixels", 1);
|
||||
canvas_item->set_property ("first_arrowhead", (gboolean) TRUE);
|
||||
canvas_item->set_property ("last_arrowhead", (gboolean) TRUE);
|
||||
canvas_item->set_property ("arrow_shape_a", 11.0);
|
||||
canvas_item->set_property ("arrow_shape_b", 0.0);
|
||||
canvas_item->set_property ("arrow_shape_c", 9.0);
|
||||
canvas_item.property_points().set_value(points);
|
||||
canvas_item.property_fill_color().set_value(color.c_str());
|
||||
canvas_item.property_width_pixels().set_value(1);
|
||||
canvas_item.property_first_arrowhead().set_value(TRUE);
|
||||
canvas_item.property_last_arrowhead().set_value(TRUE);
|
||||
canvas_item.property_arrow_shape_a().set_value(11.0);
|
||||
canvas_item.property_arrow_shape_b().set_value(0.0);
|
||||
canvas_item.property_arrow_shape_c().set_value(9.0);
|
||||
|
||||
// cerr << "cursor line @ " << canvas_item << endl;
|
||||
|
||||
canvas_item->set_data ("cursor", this);
|
||||
canvas_item->signal_event().connect (bind (mem_fun (ed, callbck), canvas_item));
|
||||
canvas_item.set_data ("cursor", this);
|
||||
canvas_item.signal_event().connect (bind (mem_fun (ed, callbck), &canvas_item));
|
||||
|
||||
current_frame = 1; /* force redraw at 0 */
|
||||
}
|
||||
|
|
@ -62,8 +64,6 @@ Editor::Cursor::Cursor (Editor& ed, const string& color, bool (Editor::*callbck)
|
|||
Editor::Cursor::~Cursor ()
|
||||
|
||||
{
|
||||
gtk_object_destroy (GTK_OBJECT(canvas_item));
|
||||
gnome_canvas_points_unref (points->gobj());
|
||||
}
|
||||
|
||||
void
|
||||
|
|
@ -72,43 +72,43 @@ Editor::Cursor::set_position (jack_nframes_t frame)
|
|||
double new_pos = editor.frame_to_unit (frame);
|
||||
|
||||
if (editor.session == 0) {
|
||||
canvas_item->hide();
|
||||
canvas_item.hide();
|
||||
} else {
|
||||
canvas_item->show();
|
||||
canvas_item.show();
|
||||
}
|
||||
|
||||
current_frame = frame;
|
||||
|
||||
if (new_pos == points->front().get_x()) {
|
||||
if (new_pos == points.front().get_x()) {
|
||||
|
||||
/* change in position is not visible, so just raise it */
|
||||
|
||||
canvas_item->raise_to_top();
|
||||
canvas_item.raise_to_top();
|
||||
return;
|
||||
}
|
||||
|
||||
points->front().set_x(new_pos);
|
||||
points->back().set_x(new_pos);
|
||||
points.front().set_x(new_pos);
|
||||
points.back().set_x(new_pos);
|
||||
|
||||
// cerr << "set cursor2 al points, nc = " << points->num_points << endl;
|
||||
canvas_item->set_property ("points", points);
|
||||
canvas_item->raise_to_top();
|
||||
canvas_item.property_points().set_value(points);
|
||||
canvas_item.raise_to_top();
|
||||
}
|
||||
|
||||
void
|
||||
Editor::Cursor::set_length (double units)
|
||||
{
|
||||
length = units;
|
||||
points->back().set_x (points->front().get_y() + length);
|
||||
points.back().set_x (points.front().get_y() + length);
|
||||
// cerr << "set cursor3 al points, nc = " << points->num_points << endl;
|
||||
canvas_item->set_property("points", points);
|
||||
canvas_item.property_points().set_value(points);
|
||||
}
|
||||
|
||||
void
|
||||
Editor::Cursor::set_y_axis (double position)
|
||||
{
|
||||
points->front().set_y (position);
|
||||
points->back().set_x (position + length);
|
||||
points.front().set_y (position);
|
||||
points.back().set_x (position + length);
|
||||
// cerr << "set cursor4 al points, nc = " << points->num_points << endl;
|
||||
canvas_item->set_property("points", points);
|
||||
canvas_item.property_points().set_value(points);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue