Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+#include <utility>
+
#include "pbd/memento_command.h"
+
#include "ardour/automation_control.h"
#include "ardour/event_type_map.h"
-#include "ardour/session.h"
-#include "ardour/source.h"
#include "ardour/midi_automation_list_binder.h"
#include "ardour/midi_region.h"
+#include "ardour/session.h"
+
+#include "gtkmm2ext/keyboard.h"
#include "automation_region_view.h"
+#include "editing.h"
+#include "editor.h"
+#include "editor_drag.h"
#include "gui_thread.h"
-#include "public_editor.h"
#include "midi_automation_line.h"
-#include "editor_drag.h"
-#include "editor.h"
-#include "editing.h"
+#include "public_editor.h"
#include "i18n.h"
-AutomationRegionView::AutomationRegionView (ArdourCanvas::Group* parent,
+AutomationRegionView::AutomationRegionView (ArdourCanvas::Container* parent,
AutomationTimeAxisView& time_axis,
boost::shared_ptr<ARDOUR::Region> region,
const Evoral::Parameter& param,
boost::shared_ptr<ARDOUR::AutomationList> list,
double spu,
- Gdk::Color const & basic_color)
+ uint32_t basic_color)
: RegionView(parent, time_axis, region, spu, basic_color, true)
, _parameter(param)
{
create_line(list);
}
- group->signal_event().connect (sigc::mem_fun (this, &AutomationRegionView::canvas_event), false);
+ group->Event.connect (sigc::mem_fun (this, &AutomationRegionView::canvas_event));
group->raise_to_top();
}
}
void
-AutomationRegionView::init (Gdk::Color const & basic_color, bool /*wfd*/)
+AutomationRegionView::init (bool /*wfd*/)
{
_enable_display = false;
- RegionView::init(basic_color, false);
-
- compute_colors (basic_color);
+ RegionView::init (false);
- reset_width_dependent_items ((double) _region->length() / samples_per_unit);
+ reset_width_dependent_items ((double) _region->length() / samples_per_pixel);
set_height (trackview.current_height());
trackview, *get_canvas_group(), list,
boost::dynamic_pointer_cast<ARDOUR::MidiRegion> (_region),
_parameter,
- &_time_converter));
+ &_source_relative_time_converter));
_line->set_colors();
_line->set_height ((uint32_t)rint(trackview.current_height() - NAME_HIGHLIGHT_SIZE));
- _line->show();
- _line->show_all_control_points();
+ _line->set_visibility (AutomationLine::VisibleAspects (AutomationLine::Line|AutomationLine::ControlPoints));
_line->set_maximum_time (_region->length());
_line->set_offset (_region->start ());
}
if (ev->type == GDK_BUTTON_PRESS && e.current_mouse_mode() == Editing::MouseObject) {
/* XXX: icky dcast to Editor */
- e.drags()->set (new RubberbandSelectDrag (dynamic_cast<Editor*> (&e), group), ev);
+ e.drags()->set (new EditorRubberbandSelectDrag (dynamic_cast<Editor*> (&e), group), ev);
} else if (ev->type == GDK_BUTTON_RELEASE) {
double y = ev->button.y;
/* convert to item coordinates in the time axis view */
- automation_view()->canvas_display()->w2i (x, y);
+ automation_view()->canvas_display()->canvas_to_item (x, y);
/* clamp y */
- y = max (y, 0.0);
- y = min (y, _height - NAME_HIGHLIGHT_SIZE);
+ y = std::max (y, 0.0);
+ y = std::min (y, _height - NAME_HIGHLIGHT_SIZE);
- add_automation_event (ev, trackview.editor().pixel_to_frame (x) - _region->position(), y);
+ /* guard points only if primary modifier is used */
+ bool with_guard_points = Gtkmm2ext::Keyboard::modifier_state_equals (ev->button.state, Gtkmm2ext::Keyboard::PrimaryModifier);
+ add_automation_event (ev, trackview.editor().pixel_to_sample (x) - _region->position() + _region->start(), y, with_guard_points);
}
return false;
* @param y y position, relative to our TimeAxisView.
*/
void
-AutomationRegionView::add_automation_event (GdkEvent *, framepos_t when, double y)
+AutomationRegionView::add_automation_event (GdkEvent *, framepos_t when, double y, bool with_guard_points)
{
if (!_line) {
boost::shared_ptr<Evoral::Control> c = _region->control(_parameter, true);
const double h = trackview.current_height() - TimeAxisViewItem::NAME_HIGHLIGHT_SIZE - 2;
y = 1.0 - (y / h);
+ /* snap frame */
+
+ when = snap_frame_to_frame (when - _region->start ()) + _region->start ();
+
/* map using line */
double when_d = when;
view->session()->begin_reversible_command (_("add automation event"));
XMLNode& before = _line->the_list()->get_state();
- _line->the_list()->add (when_d, y);
+ _line->the_list()->add (when_d, y, with_guard_points);
XMLNode& after = _line->the_list()->get_state();