/*
- 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
#include "ardour/event_type_map.h"
#include "ardour/session.h"
#include "ardour/source.h"
+
#include "automation_region_view.h"
+#include "gui_thread.h"
#include "public_editor.h"
#include "i18n.h"
const Evoral::Parameter& param,
boost::shared_ptr<ARDOUR::AutomationList> list,
double spu,
- Gdk::Color& basic_color)
+ Gdk::Color const & basic_color)
: RegionView(parent, time_axis, region, spu, basic_color)
, _parameter(param)
-{
+{
if (list) {
assert(list->parameter() == param);
create_line(list);
}
-
- group->signal_event().connect (mem_fun (this, &AutomationRegionView::canvas_event), false);
+
+ group->signal_event().connect (sigc::mem_fun (this, &AutomationRegionView::canvas_event), false);
+ group->raise_to_top();
}
void
-AutomationRegionView::init (Gdk::Color& basic_color, bool wfd)
+AutomationRegionView::init (Gdk::Color const & basic_color, bool /*wfd*/)
{
_enable_display = false;
-
+
RegionView::init(basic_color, false);
compute_colors (basic_color);
set_height (trackview.current_height());
- _region->StateChanged.connect (mem_fun(*this, &AutomationRegionView::region_changed));
+ _region->StateChanged.connect (*this, ui_bind (&RegionView::region_changed, this, _1), gui_context());
set_colors ();
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->set_height ((uint32_t)rint(trackview.current_height() - NAME_HIGHLIGHT_SIZE));
}
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);
}
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);
}
assert(_line);
- double x = 0;
+ double x = when;
AutomationTimeAxisView* const view = automation_view();
view->canvas_display()->w2i (x, y);
_line->view_to_model_coord (x, y);
- view->session().begin_reversible_command (_("add automation event"));
+ 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>(
+ view->session()->commit_reversible_command (new MementoCommand<ARDOUR::AutomationList>(
*_line->the_list(), &before, &after));
- view->session().set_dirty ();
+ view->session()->set_dirty ();
}
void
}
bool
-AutomationRegionView::set_position (nframes_t pos, void* src, double* ignored)
+AutomationRegionView::set_position (nframes64_t pos, void* src, double* ignored)
{
return RegionView::set_position(pos, src, ignored);
}
AutomationRegionView::reset_width_dependent_items (double pixel_width)
{
RegionView::reset_width_dependent_items(pixel_width);
-
+
if (_line)
_line->reset();
}
void
-AutomationRegionView::region_resized (ARDOUR::Change what_changed)
+AutomationRegionView::region_resized (PBD::Change what_changed)
{
RegionView::region_resized(what_changed);