X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fautomation_time_axis.cc;h=806359e2ab36f2e7b05935accc919f8d2f054060;hb=e57c4d4c43c0d302c0b06128e0ba10c4683ee8fe;hp=07a47f274ea30f1de6763c4c16832b636bbe161d;hpb=d357eca668044badcb4bab318e2e74cfffa9a0b0;p=ardour.git diff --git a/gtk2_ardour/automation_time_axis.cc b/gtk2_ardour/automation_time_axis.cc index 07a47f274e..806359e2ab 100644 --- a/gtk2_ardour/automation_time_axis.cc +++ b/gtk2_ardour/automation_time_axis.cc @@ -18,10 +18,11 @@ */ #include -#include -#include -#include #include +#include "pbd/memento_command.h" +#include "ardour/automation_control.h" +#include "ardour/event_type_map.h" +#include "ardour/route.h" #include "ardour_ui.h" #include "automation_time_axis.h" @@ -39,6 +40,7 @@ #include "i18n.h" +using namespace std; using namespace ARDOUR; using namespace PBD; using namespace Gtk; @@ -49,22 +51,25 @@ Pango::FontDescription* AutomationTimeAxisView::name_font = 0; 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 r, boost::shared_ptr a, boost::shared_ptr 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), - height_button (_("h")), - clear_button (_("clear")), auto_button (X_("")) /* force addition of a label */ { if (!have_name_font) { @@ -83,10 +88,10 @@ AutomationTimeAxisView::AutomationTimeAxisView (Session& s, boost::shared_ptrproperty_x1() = 0.0; _base_rect->property_y1() = 0.0; - _base_rect->property_x2() = editor.frame_to_pixel (max_frames); + _base_rect->property_x2() = LONG_MAX - 2; _base_rect->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_AutomationTrackOutline.get(); /* outline ends and bottom */ @@ -95,23 +100,23 @@ AutomationTimeAxisView::AutomationTimeAxisView (Session& s, boost::shared_ptrset_data ("trackview", this); - _base_rect->signal_event().connect (bind (mem_fun (editor, &PublicEditor::canvas_automation_track_event), - _base_rect, this)); + _base_rect->signal_event().connect (bind ( + mem_fun (_editor, &PublicEditor::canvas_automation_track_event), + _base_rect, this)); - _base_rect->lower_to_bottom(); + // _base_rect->lower_to_bottom(); hide_button.add (*(manage (new Gtk::Image (::get_icon("hide"))))); - height_button.set_name ("TrackSizeButton"); auto_button.set_name ("TrackVisualButton"); - clear_button.set_name ("TrackVisualButton"); hide_button.set_name ("TrackRemoveButton"); + auto_button.unset_flags (Gtk::CAN_FOCUS); + hide_button.unset_flags (Gtk::CAN_FOCUS); + controls_table.set_no_show_all(); - ARDOUR_UI::instance()->tooltips().set_tip(height_button, _("track height")); ARDOUR_UI::instance()->tooltips().set_tip(auto_button, _("automation state")); - ARDOUR_UI::instance()->tooltips().set_tip(clear_button, _("clear track")); ARDOUR_UI::instance()->tooltips().set_tip(hide_button, _("hide track")); /* rearrange the name display */ @@ -170,18 +175,14 @@ AutomationTimeAxisView::AutomationTimeAxisView (Session& s, boost::shared_ptrget_automation_child_xml_node ( _control->parameter()); @@ -206,11 +205,10 @@ AutomationTimeAxisView::AutomationTimeAxisView (Session& s, boost::shared_ptr line(new AutomationLine ( - _control->parameter().symbol(), + ARDOUR::EventTypeMap::instance().to_symbol(_control->parameter()), *this, - *canvas_display, + *_canvas_display, _control->alist())); line->set_line_color (ARDOUR_UI::config()->canvasvar_ProcessorAutomationLine.get()); @@ -238,14 +236,14 @@ AutomationTimeAxisView::auto_clicked () 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()); @@ -255,14 +253,19 @@ void AutomationTimeAxisView::set_automation_state (AutoState state) { if (!ignore_state_request) { - if (_route == _automatable) { // FIXME: ew - _route->set_parameter_automation_state ( - _control->parameter(), - state); + _automatable->set_parameter_automation_state (_control->parameter(), state); +#if 0 + if (_route == _automatable) { // This is a time axis for route (not region) automation + _route->set_parameter_automation_state (_control->parameter(), state); } - _control->alist()->set_automation_state(state); + if (_control->list()) + _control->alist()->set_automation_state(state); +#endif + } + if (_view) { + _view->set_automation_state (state); } } @@ -278,7 +281,7 @@ AutomationTimeAxisView::automation_state_changed () } else { state = _control->alist()->automation_state (); } - + switch (state & (Off|Play|Touch|Write)) { case Off: auto_button.set_label (_("Manual")); @@ -345,30 +348,27 @@ AutomationTimeAxisView::interpolation_changed () } } - if (_line) + if (_line) { _line->set_interpolation(style); + } } void AutomationTimeAxisView::set_interpolation (AutomationList::InterpolationStyle style) { _control->list()->set_interpolation(style); - if (_line) - _line->set_interpolation(style); -} - -void -AutomationTimeAxisView::height_clicked () -{ - popup_size_menu (0); + if (_line) { + _line->set_interpolation(style); + } } void AutomationTimeAxisView::clear_clicked () { _session.begin_reversible_command (_("clear automation")); - if (_line) + if (_line) { _line->clear (); + } _session.commit_reversible_command (); } @@ -376,10 +376,11 @@ void AutomationTimeAxisView::set_height (uint32_t h) { bool changed = (height != (uint32_t) h) || first_call_to_set_height; - bool changed_between_small_and_normal = ( (h == hSmall || h == hSmaller) ^ (height == hSmall || height == hSmaller) ); + bool changed_between_small_and_normal = ( + (height < hNormal && h >= hNormal) + || (height >= hNormal || h < hNormal) ); TimeAxisView* state_parent = get_parent_with_state (); - assert(state_parent); XMLNode* xml_node = state_parent->get_automation_child_xml_node (_control->parameter()); @@ -387,16 +388,18 @@ AutomationTimeAxisView::set_height (uint32_t 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(); } char buf[32]; snprintf (buf, sizeof (buf), "%u", height); - xml_node->add_property ("height", buf); + if (xml_node) { + xml_node->add_property ("height", buf); + } if (changed_between_small_and_normal || first_call_to_set_height) { @@ -421,8 +424,6 @@ AutomationTimeAxisView::set_height (uint32_t h) name_hbox.show_all (); auto_button.show(); - height_button.show(); - clear_button.show(); hide_button.show_all(); } else if (h >= hSmall) { @@ -440,15 +441,10 @@ AutomationTimeAxisView::set_height (uint32_t h) name_hbox.show_all (); auto_button.hide(); - height_button.hide(); - clear_button.hide(); hide_button.hide(); } - } else if (h >= hNormal){ - auto_button.show(); - height_button.show(); - clear_button.show(); - hide_button.show_all(); + } else if (h >= hNormal){ + cerr << "track grown, but neither changed_between_small_and_normal nor first_call_to_set_height set!" << endl; } if (changed) { @@ -511,44 +507,52 @@ AutomationTimeAxisView::build_display_menu () auto_state_menu->set_name ("ArdourContextMenu"); MenuList& as_items = auto_state_menu->items(); - as_items.push_back (CheckMenuElem (_("Manual"), - bind (mem_fun(*this, &AutomationTimeAxisView::set_automation_state), (AutoState) Off))); + as_items.push_back (CheckMenuElem (_("Manual"), bind ( + mem_fun(*this, &AutomationTimeAxisView::set_automation_state), + (AutoState) Off))); auto_off_item = dynamic_cast(&as_items.back()); - as_items.push_back (CheckMenuElem (_("Play"), - bind (mem_fun(*this, &AutomationTimeAxisView::set_automation_state), (AutoState) Play))); + as_items.push_back (CheckMenuElem (_("Play"), bind ( + mem_fun(*this, &AutomationTimeAxisView::set_automation_state), + (AutoState) Play))); auto_play_item = dynamic_cast(&as_items.back()); - as_items.push_back (CheckMenuElem (_("Write"), - bind (mem_fun(*this, &AutomationTimeAxisView::set_automation_state), (AutoState) Write))); + as_items.push_back (CheckMenuElem (_("Write"), bind ( + mem_fun(*this, &AutomationTimeAxisView::set_automation_state), + (AutoState) Write))); auto_write_item = dynamic_cast(&as_items.back()); - as_items.push_back (CheckMenuElem (_("Touch"), - bind (mem_fun(*this, &AutomationTimeAxisView::set_automation_state), (AutoState) Touch))); + as_items.push_back (CheckMenuElem (_("Touch"), bind ( + mem_fun(*this, &AutomationTimeAxisView::set_automation_state), + (AutoState) Touch))); auto_touch_item = dynamic_cast(&as_items.back()); items.push_back (MenuElem (_("State"), *auto_state_menu)); /* mode menu */ - - if (_control->parameter().type() == MidiCCAutomation) { + + if ( EventTypeMap::instance().is_midi_parameter(_control->parameter()) ) { + Menu* auto_mode_menu = manage (new Menu); auto_mode_menu->set_name ("ArdourContextMenu"); MenuList& am_items = auto_mode_menu->items(); RadioMenuItem::Group group; - + am_items.push_back (RadioMenuElem (group, _("Discrete"), bind ( mem_fun(*this, &AutomationTimeAxisView::set_interpolation), AutomationList::Discrete))); mode_discrete_item = dynamic_cast(&am_items.back()); - //mode_discrete_item->set_active(_control->list()->interpolation() == AutomationList::Discrete); - - am_items.push_back (RadioMenuElem (group, _("Line"), bind ( - mem_fun(*this, &AutomationTimeAxisView::set_interpolation), - AutomationList::Linear))); - mode_line_item = dynamic_cast(&am_items.back()); - //mode_line_item->set_active(_control->list()->interpolation() == AutomationList::Linear); + mode_discrete_item->set_active(_control->list()->interpolation() == AutomationList::Discrete); + + // For discrete types we dont allow the linear option since it makes no sense for those Controls + if (EventTypeMap::instance().interpolation_of(_control->parameter()) == Evoral::ControlList::Linear) { + am_items.push_back (RadioMenuElem (group, _("Line"), bind ( + mem_fun(*this, &AutomationTimeAxisView::set_interpolation), + AutomationList::Linear))); + mode_line_item = dynamic_cast(&am_items.back()); + mode_line_item->set_active(_control->list()->interpolation() == AutomationList::Linear); + } items.push_back (MenuElem (_("Mode"), *auto_mode_menu)); } @@ -560,14 +564,14 @@ AutomationTimeAxisView::build_display_menu () } void -AutomationTimeAxisView::add_automation_event (ArdourCanvas::Item* item, GdkEvent* event, nframes_t when, double y) +AutomationTimeAxisView::add_automation_event (ArdourCanvas::Item* /*item*/, GdkEvent* /*event*/, nframes_t when, double y) { if (!_line) return; double x = 0; - canvas_display->w2i (x, y); + _canvas_display->w2i (x, y); /* compute vertical fractional position */ @@ -575,7 +579,7 @@ AutomationTimeAxisView::add_automation_event (ArdourCanvas::Item* item, GdkEvent /* map using line */ - _line->view_to_model_y (y); + _line->view_to_model_coord (x, y); _session.begin_reversible_command (_("add automation event")); XMLNode& before = _control->alist()->get_state(); @@ -607,14 +611,14 @@ AutomationTimeAxisView::cut_copy_clear_one (AutomationLine& line, Selection& sel switch (op) { case Cut: if ((what_we_got = alist->cut (selection.time.front().start, selection.time.front().end)) != 0) { - editor.get_cut_buffer().add (what_we_got); + _editor.get_cut_buffer().add (what_we_got); _session.add_command(new MementoCommand(*alist.get(), &before, &alist->get_state())); ret = true; } break; case Copy: if ((what_we_got = alist->copy (selection.time.front().start, selection.time.front().end)) != 0) { - editor.get_cut_buffer().add (what_we_got); + _editor.get_cut_buffer().add (what_we_got); } break; @@ -628,9 +632,11 @@ AutomationTimeAxisView::cut_copy_clear_one (AutomationLine& line, Selection& sel if (what_we_got) { for (AutomationList::iterator x = what_we_got->begin(); x != what_we_got->end(); ++x) { - double foo = (*x)->value; - line.model_to_view_y (foo); - (*x)->value = foo; + double when = (*x)->when; + double val = (*x)->value; + line.model_to_view_coord (when, val); + (*x)->when = when; + (*x)->value = val; } } @@ -684,14 +690,14 @@ AutomationTimeAxisView::cut_copy_clear_objects_one (AutomationLine& line, PointS switch (op) { case Cut: if ((what_we_got = alist->cut ((*i).start, (*i).end)) != 0) { - editor.get_cut_buffer().add (what_we_got); + _editor.get_cut_buffer().add (what_we_got); _session.add_command (new MementoCommand(*alist.get(), new XMLNode (before), &alist->get_state())); ret = true; } break; case Copy: if ((what_we_got = alist->copy ((*i).start, (*i).end)) != 0) { - editor.get_cut_buffer().add (what_we_got); + _editor.get_cut_buffer().add (what_we_got); } break; @@ -708,9 +714,11 @@ AutomationTimeAxisView::cut_copy_clear_objects_one (AutomationLine& line, PointS if (what_we_got) { for (AutomationList::iterator x = what_we_got->begin(); x != what_we_got->end(); ++x) { - double foo = (*x)->value; - line.model_to_view_y (foo); - (*x)->value = foo; + double when = (*x)->when; + double val = (*x)->value; + line.model_to_view_coord (when, val); + (*x)->when = when; + (*x)->value = val; } } @@ -729,7 +737,7 @@ AutomationTimeAxisView::paste_one (AutomationLine& line, nframes_t pos, float ti AutomationSelection::iterator p; boost::shared_ptr alist(line.the_list()); - for (p = selection.lines.begin(); p != selection.lines.end() && nth; ++p, --nth); + for (p = selection.lines.begin(); p != selection.lines.end() && nth; ++p, --nth) {} if (p == selection.lines.end()) { return false; @@ -743,9 +751,11 @@ AutomationTimeAxisView::paste_one (AutomationLine& line, nframes_t pos, float ti AutomationList copy (**p); for (AutomationList::iterator x = copy.begin(); x != copy.end(); ++x) { - double foo = (*x)->value; - line.view_to_model_y (foo); - (*x)->value = foo; + double when = (*x)->when; + double val = (*x)->value; + line.view_to_model_coord (when, val); + (*x)->when = when; + (*x)->value = val; } XMLNode &before = alist->get_state(); @@ -763,14 +773,14 @@ AutomationTimeAxisView::get_selectables (nframes_t start, nframes_t end, double double botfrac; /* remember: this is X Window - coordinate space starts in upper left and moves down. - y_position is the "origin" or "top" of the track. + _y_position is the "origin" or "top" of the track. */ - double mybot = y_position + height; + double mybot = _y_position + height; - if (y_position >= top && mybot <= bot) { + if (_y_position >= top && mybot <= bot) { - /* y_position is below top, mybot is above bot, so we're fully + /* _y_position is below top, mybot is above bot, so we're fully covered vertically. */ @@ -779,10 +789,10 @@ AutomationTimeAxisView::get_selectables (nframes_t start, nframes_t end, double } else { - /* top and bot are within y_position .. mybot */ + /* top and bot are within _y_position .. mybot */ - topfrac = 1.0 - ((top - y_position) / height); - botfrac = 1.0 - ((bot - y_position) / height); + topfrac = 1.0 - ((top - _y_position) / height); + botfrac = 1.0 - ((bot - _y_position) / height); } if (_line) @@ -824,7 +834,7 @@ AutomationTimeAxisView::add_line (boost::shared_ptr line) _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 (); @@ -846,17 +856,6 @@ AutomationTimeAxisView::exited () _line->track_exited(); } -/*void -AutomationTimeAxisView::set_colors () -{ - for (list::iterator i=ghosts.begin(); i != ghosts.end(); i++ ) { - (*i)->set_colors(); - } - - if (_line) - _line->set_colors(); - }*/ - void AutomationTimeAxisView::color_handler () { @@ -868,32 +867,22 @@ AutomationTimeAxisView::color_handler () int AutomationTimeAxisView::set_state (const XMLNode& node) { - return TimeAxisView::set_state (node); - - XMLNodeList kids; - XMLNodeConstIterator iter; - - kids = node.children (); - - for (iter = kids.begin(); iter != kids.end(); ++iter) { - - if ((*iter)->name() == state_node_name) { - XMLProperty* type = (*iter)->property("automation-id"); - - if (type && type->value() == _control->parameter().symbol()) { - XMLProperty *shown = (*iter)->property("shown_editor"); + TimeAxisView::set_state (node); - if (shown && shown->value() == "yes") { - set_marked_for_display(true); - canvas_display->show(); /* FIXME: necessary? show_at? */ - } - break; - } + XMLProperty const * type = node.property ("automation-id"); + if (type && type->value () == ARDOUR::EventTypeMap::instance().to_symbol (_control->parameter())) { + XMLProperty const * shown = node.property ("shown"); + if (shown && shown->value () == "yes") { + set_marked_for_display (true); + _canvas_display->show (); /* FIXME: necessary? show_at? */ } } - - if (!_marked_for_display) + + if (!_marked_for_display) { hide(); + } + + return 0; } XMLNode*