bool AutomationTimeAxisView::have_name_font = false;
const string AutomationTimeAxisView::state_node_name = "AutomationChild";
+/** \a a the automatable object this time axis is to display data for.
+ * For route/track automation (e.g. gain) pass the route for both \r and \a.
+ * For route child (e.g. plugin) automation, pass the child for \a.
+ * For region automation (e.g. MIDI CC), pass null for \a.
+ */
AutomationTimeAxisView::AutomationTimeAxisView (Session& s, boost::shared_ptr<Route> r,
boost::shared_ptr<Automatable> a, boost::shared_ptr<AutomationControl> c,
PublicEditor& e, TimeAxisView& parent, bool show_regions,
ArdourCanvas::Canvas& canvas, const string & nom, const string & nomparent)
-
: AxisView (s),
TimeAxisView (s, e, &parent, canvas),
_route (r),
_control (c),
_automatable (a),
- _controller(AutomationController::create(a, c->list(), c)),
+ _controller(AutomationController::create(a, c->parameter(), c)),
_base_rect (0),
_view (show_regions ? new AutomationStreamView(*this) : NULL),
_name (nom),
} else {
boost::shared_ptr<AutomationLine> line(new AutomationLine (
- _control->parameter().to_string(),
+ ARDOUR::EventTypeMap::instance().to_symbol(_control->parameter()),
*this,
*canvas_display,
- _control->list()));
+ _control->alist()));
line->set_line_color (ARDOUR_UI::config()->canvasvar_ProcessorAutomationLine.get());
line->queue_reset ();
automation_menu->set_name ("ArdourContextMenu");
MenuList& items (automation_menu->items());
- items.push_back (MenuElem (_("Manual"),
- bind (mem_fun(*this, &AutomationTimeAxisView::set_automation_state), (AutoState) Off)));
- items.push_back (MenuElem (_("Play"),
- bind (mem_fun(*this, &AutomationTimeAxisView::set_automation_state), (AutoState) Play)));
- items.push_back (MenuElem (_("Write"),
- bind (mem_fun(*this, &AutomationTimeAxisView::set_automation_state), (AutoState) Write)));
- items.push_back (MenuElem (_("Touch"),
- bind (mem_fun(*this, &AutomationTimeAxisView::set_automation_state), (AutoState) Touch)));
+ items.push_back (MenuElem (_("Manual"), bind (mem_fun(*this,
+ &AutomationTimeAxisView::set_automation_state), (AutoState) Off)));
+ items.push_back (MenuElem (_("Play"), bind (mem_fun(*this,
+ &AutomationTimeAxisView::set_automation_state), (AutoState) Play)));
+ items.push_back (MenuElem (_("Write"), bind (mem_fun(*this,
+ &AutomationTimeAxisView::set_automation_state), (AutoState) Write)));
+ items.push_back (MenuElem (_("Touch"), bind (mem_fun(*this,
+ &AutomationTimeAxisView::set_automation_state), (AutoState) Touch)));
}
automation_menu->popup (1, gtk_get_current_event_time());
AutomationTimeAxisView::set_automation_state (AutoState state)
{
if (!ignore_state_request) {
- if (_route == _automatable) { // FIXME: ew
- _route->set_parameter_automation_state (
- _control->parameter(),
- state);
+ if (_route == _automatable) { // This is a time axis for route (not region) automation
+ _route->set_parameter_automation_state (_control->parameter(), state);
}
- _control->list()->set_automation_state(state);
-
+ if (_control->list())
+ _control->alist()->set_automation_state(state);
}
+ if (_view)
+ _view->set_automation_state (state);
}
void
if (!_line) {
state = Off;
} else {
- state = _control->list()->automation_state ();
+ state = _control->alist()->automation_state ();
}
-
+
switch (state & (Off|Play|Touch|Write)) {
case Off:
auto_button.set_label (_("Manual"));
AutomationTimeAxisView::set_interpolation (AutomationList::InterpolationStyle style)
{
_control->list()->set_interpolation(style);
- if (_line)
- _line->set_interpolation(style);
+ if (_line)
+ _line->set_interpolation(style);
}
void
}
void
-AutomationTimeAxisView::set_height (TrackHeight ht)
+AutomationTimeAxisView::set_height (uint32_t h)
{
- uint32_t h = height_to_pixels (ht);
bool changed = (height != (uint32_t) h) || first_call_to_set_height;
-
- if (first_call_to_set_height)
- first_call_to_set_height = false;
+ bool changed_between_small_and_normal = ( (h == hSmall || h == hSmaller) ^ (height == hSmall || height == hSmaller) );
- TimeAxisView::set_height (ht);
+ TimeAxisView* state_parent = get_parent_with_state ();
+
+ assert(state_parent);
+ XMLNode* xml_node = state_parent->get_automation_child_xml_node (_control->parameter());
+
+ TimeAxisView::set_height (h);
_base_rect->property_y2() = h;
if (_line)
- _line->set_y_position_and_height (0, h);
+ _line->set_height(h);
if (_view) {
_view->set_height(h);
- _view->update_contents_y_position_and_height();
+ _view->update_contents_height();
}
- TimeAxisView* state_parent = get_parent_with_state ();
- assert(state_parent);
-
- XMLNode* xml_node = state_parent->get_automation_child_xml_node(_control->parameter());
- assert(xml_node);
-
- switch (ht) {
- case Largest:
- xml_node->add_property ("track_height", "largest");
- break;
-
- case Large:
- xml_node->add_property ("track_height", "large");
- break;
-
- case Larger:
- xml_node->add_property ("track_height", "larger");
- break;
-
- case Normal:
- xml_node->add_property ("track_height", "normal");
- break;
-
- case Smaller:
- xml_node->add_property ("track_height", "smaller");
- break;
-
- case Small:
- xml_node->add_property ("track_height", "small");
- break;
- }
+ char buf[32];
+ snprintf (buf, sizeof (buf), "%u", height);
+ xml_node->add_property ("height", buf);
- switch (ht) {
- case Large:
- case Larger:
- case Largest:
- _controller->show ();
+ if (changed_between_small_and_normal || first_call_to_set_height) {
- case Normal:
- if (ht == Normal)
- _controller->hide();
+ first_call_to_set_height = false;
+ if (h >= hNormal) {
controls_table.remove (name_hbox);
-
+
if (plugname) {
if (plugname_packed) {
controls_table.remove (*plugname);
hide_name_entry ();
show_name_label ();
name_hbox.show_all ();
-
+
auto_button.show();
height_button.show();
clear_button.show();
hide_button.show_all();
- break;
-
- case Smaller:
- _controller->hide();
-
- case Small:
+ } else if (h >= hSmall) {
controls_table.remove (name_hbox);
if (plugname) {
if (plugname_packed) {
hide_name_entry ();
show_name_label ();
name_hbox.show_all ();
-
+
auto_button.hide();
height_button.hide();
clear_button.hide();
hide_button.hide();
- break;
+ }
+ } else if (h >= hNormal){
+ auto_button.show();
+ height_button.show();
+ clear_button.show();
+ hide_button.show_all();
}
if (changed) {
/* only emit the signal if the height really changed */
- _route->gui_changed ("track_height", (void *) 0); /* EMIT_SIGNAL */
+ _route->gui_changed ("visible_tracks", (void *) 0); /* EMIT_SIGNAL */
}
}
_line->view_to_model_y (y);
_session.begin_reversible_command (_("add automation event"));
- XMLNode& before = _control->list()->get_state();
+ XMLNode& before = _control->alist()->get_state();
- _control->list()->add (when, y);
+ _control->alist()->add (when, y);
- XMLNode& after = _control->list()->get_state();
- _session.commit_reversible_command (new MementoCommand<ARDOUR::AutomationList>(*_control->list().get(), &before, &after));
+ XMLNode& after = _control->alist()->get_state();
+ _session.commit_reversible_command (new MementoCommand<ARDOUR::AutomationList>(*_control->alist(), &before, &after));
_session.set_dirty ();
}
bool
AutomationTimeAxisView::cut_copy_clear_one (AutomationLine& line, Selection& selection, CutCopyOp op)
{
- AutomationList* what_we_got = 0;
+ boost::shared_ptr<Evoral::ControlList> what_we_got;
boost::shared_ptr<AutomationList> alist (line.the_list());
bool ret = false;
case Clear:
if ((what_we_got = alist->cut (selection.time.front().start, selection.time.front().end)) != 0) {
_session.add_command(new MementoCommand<AutomationList>(*alist.get(), &before, &alist->get_state()));
- delete what_we_got;
- what_we_got = 0;
ret = true;
}
break;
bool
AutomationTimeAxisView::cut_copy_clear_objects_one (AutomationLine& line, PointSelection& selection, CutCopyOp op)
{
- AutomationList* what_we_got = 0;
+ boost::shared_ptr<Evoral::ControlList> what_we_got;
boost::shared_ptr<AutomationList> alist(line.the_list());
bool ret = false;
case Clear:
if ((what_we_got = alist->cut ((*i).start, (*i).end)) != 0) {
_session.add_command (new MementoCommand<AutomationList>(*alist.get(), new XMLNode (before), &alist->get_state()));
- delete what_we_got;
- what_we_got = 0;
ret = true;
}
break;
assert(!_line);
assert(line->the_list() == _control->list());
- automation_connection = _control->list()->automation_state_changed.connect
+ automation_connection = _control->alist()->automation_state_changed.connect
(mem_fun(*this, &AutomationTimeAxisView::automation_state_changed));
_line = line;
//_controller = AutomationController::create(_session, line->the_list(), _control);
- line->set_y_position_and_height (0, height);
+ line->set_height (height);
/* pick up the current state */
automation_state_changed ();
}
}
-void
+int
AutomationTimeAxisView::set_state (const XMLNode& node)
{
TimeAxisView::set_state (node);
if ((*iter)->name() == state_node_name) {
XMLProperty* type = (*iter)->property("automation-id");
- if (type && type->value() == _control->parameter().to_string()) {
- XMLProperty *shown = (*iter)->property("shown_editor");
+ if (type && type->value() == ARDOUR::EventTypeMap::instance().to_symbol(_control->parameter())) {
+ XMLProperty *shown = (*iter)->property("shown-editor");
if (shown && shown->value() == "yes") {
set_marked_for_display(true);
if (!_marked_for_display)
hide();
+
+ return 0;
}
XMLNode*
AutomationTimeAxisView::update_extra_xml_shown (bool editor_shown)
{
XMLNode* xml_node = get_state_node();
- xml_node->add_property ("shown", editor_shown ? "yes" : "no");
+ if (xml_node) {
+ xml_node->add_property ("shown", editor_shown ? "yes" : "no");
+ }
}
guint32
projects / ardour.git / blobdiff