projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix update of the editor mixer when its route is removed; this stops routes (and...
[ardour.git]
/
gtk2_ardour
/
automation_region_view.cc
diff --git
a/gtk2_ardour/automation_region_view.cc
b/gtk2_ardour/automation_region_view.cc
index 80dbd669ca1ccd5d768668f59d36d28f12ef77b9..0e88050edcb604765719a1357d4e350c4df7291f 100644
(file)
--- a/
gtk2_ardour/automation_region_view.cc
+++ b/
gtk2_ardour/automation_region_view.cc
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2007 Paul Davis
+ Copyright (C) 2007 Paul Davis
Author: Dave Robillard
This program is free software; you can redistribute it and/or modify
Author: Dave Robillard
This program is free software; you can redistribute it and/or modify
@@
-36,20
+36,21
@@
AutomationRegionView::AutomationRegionView(ArdourCanvas::Group*
Gdk::Color const & basic_color)
: RegionView(parent, time_axis, region, spu, basic_color)
, _parameter(param)
Gdk::Color const & basic_color)
: RegionView(parent, time_axis, region, spu, basic_color)
, _parameter(param)
-{
+{
if (list) {
assert(list->parameter() == param);
create_line(list);
}
if (list) {
assert(list->parameter() == param);
create_line(list);
}
-
+
group->signal_event().connect (mem_fun (this, &AutomationRegionView::canvas_event), false);
group->signal_event().connect (mem_fun (this, &AutomationRegionView::canvas_event), false);
+ group->raise_to_top();
}
void
}
void
-AutomationRegionView::init (Gdk::Color const & basic_color, bool
wfd
)
+AutomationRegionView::init (Gdk::Color const & basic_color, bool
/*wfd*/
)
{
_enable_display = false;
{
_enable_display = false;
-
+
RegionView::init(basic_color, false);
compute_colors (basic_color);
RegionView::init(basic_color, false);
compute_colors (basic_color);
@@
-73,16
+74,15
@@
AutomationRegionView::create_line (boost::shared_ptr<ARDOUR::AutomationList> lis
trackview, *get_canvas_group(), list, &_time_converter));
_line->set_colors();
_line->set_interpolation(list->interpolation());
trackview, *get_canvas_group(), list, &_time_converter));
_line->set_colors();
_line->set_interpolation(list->interpolation());
+ _line->set_height ((uint32_t)rint(trackview.current_height() - NAME_HIGHLIGHT_SIZE));
_line->show();
_line->show_all_control_points();
_line->show();
_line->show_all_control_points();
- _line->set_height ((uint32_t)rint(trackview.current_height() - NAME_HIGHLIGHT_SIZE));
}
bool
AutomationRegionView::canvas_event(GdkEvent* ev)
{
if (ev->type == GDK_BUTTON_RELEASE) {
}
bool
AutomationRegionView::canvas_event(GdkEvent* ev)
{
if (ev->type == GDK_BUTTON_RELEASE) {
-
const nframes_t when = trackview.editor().pixel_to_frame((nframes_t)ev->button.x)
- _region->position();
add_automation_event(ev, when, ev->button.y);
const nframes_t when = trackview.editor().pixel_to_frame((nframes_t)ev->button.x)
- _region->position();
add_automation_event(ev, when, ev->button.y);
@@
-92,7
+92,7
@@
AutomationRegionView::canvas_event(GdkEvent* ev)
}
void
}
void
-AutomationRegionView::add_automation_event (GdkEvent*
event
, nframes_t when, double y)
+AutomationRegionView::add_automation_event (GdkEvent*
/*event*/
, nframes_t when, double y)
{
if (!_line) {
boost::shared_ptr<Evoral::Control> c = _region->control(_parameter, true);
{
if (!_line) {
boost::shared_ptr<Evoral::Control> c = _region->control(_parameter, true);
@@
-103,7
+103,7
@@
AutomationRegionView::add_automation_event (GdkEvent* event, nframes_t when, dou
}
assert(_line);
}
assert(_line);
- double x =
0
;
+ double x =
when
;
AutomationTimeAxisView* const view = automation_view();
view->canvas_display()->w2i (x, y);
AutomationTimeAxisView* const view = automation_view();
view->canvas_display()->w2i (x, y);
@@
-120,7
+120,7
@@
AutomationRegionView::add_automation_event (GdkEvent* event, nframes_t when, dou
view->session().begin_reversible_command (_("add automation event"));
XMLNode& before = _line->the_list()->get_state();
view->session().begin_reversible_command (_("add automation event"));
XMLNode& before = _line->the_list()->get_state();
- _line->the_list()->add (
when
, y);
+ _line->the_list()->add (
x
, y);
XMLNode& after = _line->the_list()->get_state();
view->session().commit_reversible_command (new MementoCommand<ARDOUR::AutomationList>(
XMLNode& after = _line->the_list()->get_state();
view->session().commit_reversible_command (new MementoCommand<ARDOUR::AutomationList>(
@@
-139,7
+139,7
@@
AutomationRegionView::set_height (double h)
}
bool
}
bool
-AutomationRegionView::set_position (nframes_t pos, void* src, double* ignored)
+AutomationRegionView::set_position (nframes
64
_t pos, void* src, double* ignored)
{
return RegionView::set_position(pos, src, ignored);
}
{
return RegionView::set_position(pos, src, ignored);
}
@@
-149,7
+149,7
@@
void
AutomationRegionView::reset_width_dependent_items (double pixel_width)
{
RegionView::reset_width_dependent_items(pixel_width);
AutomationRegionView::reset_width_dependent_items (double pixel_width)
{
RegionView::reset_width_dependent_items(pixel_width);
-
+
if (_line)
_line->reset();
}
if (_line)
_line->reset();
}