X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fautomation_time_axis.cc;h=e2b74dae97898c93cb92184a76e5e2dbb2657b9a;hb=625240fe303fcd447bf7205396cdde57918b4d0c;hp=87f2a2e26a3c5fc56a57741206594f7e14ab3fae;hpb=ba4d1cd1c1d5e4b47e288cd83c81011e7399207b;p=ardour.git diff --git a/gtk2_ardour/automation_time_axis.cc b/gtk2_ardour/automation_time_axis.cc index 87f2a2e26a..e2b74dae97 100644 --- a/gtk2_ardour/automation_time_axis.cc +++ b/gtk2_ardour/automation_time_axis.cc @@ -23,32 +23,36 @@ #include #include +#include "pbd/error.h" #include "pbd/memento_command.h" #include "pbd/stacktrace.h" #include "ardour/automation_control.h" #include "ardour/event_type_map.h" +#include "ardour/parameter_types.h" #include "ardour/profile.h" #include "ardour/route.h" #include "ardour/session.h" #include "canvas/debug.h" -#include "ardour_ui.h" #include "automation_time_axis.h" #include "automation_streamview.h" -#include "global_signals.h" #include "gui_thread.h" #include "route_time_axis.h" #include "automation_line.h" +#include "paste_context.h" #include "public_editor.h" #include "selection.h" +#include "tooltips.h" #include "rgb_macros.h" #include "point_selection.h" #include "control_point.h" #include "utils.h" +#include "item_counts.h" +#include "ui_config.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace std; using namespace ARDOUR; @@ -80,18 +84,32 @@ AutomationTimeAxisView::AutomationTimeAxisView ( const string & nom, const string & nomparent ) - : AxisView (s) + : SessionHandlePtr (s) , TimeAxisView (s, e, &parent, canvas) , _route (r) , _control (c) , _automatable (a) , _parameter (p) , _base_rect (new ArdourCanvas::Rectangle (_canvas_display)) - , _name (nom) , _view (show_regions ? new AutomationStreamView (*this) : 0) , auto_button (X_("")) /* force addition of a label */ , _show_regions (show_regions) { + //concatenate plugin name and param name into the tooltip + string tipname = nomparent; + if (!tipname.empty()) { + tipname += ": "; + } + tipname += nom; + set_tooltip(controls_ebox, tipname); + + //plugin name and param name appear on 2 separate lines in the track header + tipname = nomparent; + if (!tipname.empty()) { + tipname += "\n"; + } + tipname += nom; + _name = tipname; CANVAS_DEBUG_NAME (_canvas_display, string_compose ("main for auto %2/%1", _name, r->name())); CANVAS_DEBUG_NAME (selection_group, string_compose ("selections for auto %2/%1", _name, r->name())); @@ -103,9 +121,13 @@ AutomationTimeAxisView::AutomationTimeAxisView ( } if (_automatable && _control) { - _controller = AutomationController::create (_automatable, _control->parameter(), _control); + _controller = AutomationController::create (_automatable, _control->parameter(), _control->desc(), _control); } + const std::string fill_color_name = (dynamic_cast(&parent) + ? "midi automation track fill" + : "audio automation track fill"); + automation_menu = 0; auto_off_item = 0; auto_touch_item = 0; @@ -119,16 +141,15 @@ AutomationTimeAxisView::AutomationTimeAxisView ( CANVAS_DEBUG_NAME (_base_rect, string_compose ("base rect for %1", _name)); _base_rect->set_x1 (ArdourCanvas::COORD_MAX); - _base_rect->set_outline_color (ARDOUR_UI::config()->get_AutomationTrackOutline()); - _base_rect->set_outline_what (ArdourCanvas::Rectangle::BOTTOM); // bottom separator - _base_rect->set_fill_color (ARDOUR_UI::config()->get_AutomationTrackFill()); + _base_rect->set_outline (false); + _base_rect->set_fill_color (UIConfiguration::instance().color_mod (fill_color_name, "automation track fill")); _base_rect->set_data ("trackview", this); _base_rect->Event.connect (sigc::bind (sigc::mem_fun (_editor, &PublicEditor::canvas_automation_track_event), _base_rect, this)); if (!a) { _base_rect->lower_to_bottom(); } - hide_button.set_elements ((ArdourButton::Element)(ArdourButton::Edge|ArdourButton::Body|ArdourButton::CloseCross)); + hide_button.set_icon (ArdourIcon::CloseCross); hide_button.set_tweaks(ArdourButton::TrackHeader); auto_button.set_name ("route button"); @@ -139,8 +160,8 @@ AutomationTimeAxisView::AutomationTimeAxisView ( controls_table.set_no_show_all(); - ARDOUR_UI::instance()->set_tip(auto_button, _("automation state")); - ARDOUR_UI::instance()->set_tip(hide_button, _("hide track")); + set_tooltip(auto_button, _("automation state")); + set_tooltip(hide_button, _("hide track")); const string str = gui_property ("height"); if (!str.empty()) { @@ -150,29 +171,23 @@ AutomationTimeAxisView::AutomationTimeAxisView ( } //name label isn't editable on an automation track; remove the tooltip - ARDOUR_UI::instance()->set_tip (name_label, X_("")); + set_tooltip (name_label, X_("")); - /* repack the name label */ + /* repack the name label, which TimeAxisView has already attached to + * the controls_table + */ if (name_label.get_parent()) { name_label.get_parent()->remove (name_label); } - + name_label.set_text (_name); name_label.set_alignment (Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER); name_label.set_name (X_("TrackParameterName")); name_label.set_ellipsize (Pango::ELLIPSIZE_END); - string tipname = nomparent; - if (!tipname.empty()) { - tipname += ": "; - } - tipname += _name; - ARDOUR_UI::instance()->set_tip(controls_ebox, tipname); - /* add the buttons */ controls_table.set_border_width (1); - controls_table.remove (name_hbox); controls_table.attach (hide_button, 1, 2, 0, 1, Gtk::SHRINK, Gtk::SHRINK, 0, 0); controls_table.attach (name_label, 2, 3, 1, 3, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 2, 0); controls_table.attach (auto_button, 3, 4, 2, 3, Gtk::SHRINK, Gtk::SHRINK, 0, 0); @@ -185,12 +200,12 @@ AutomationTimeAxisView::AutomationTimeAxisView ( // subscribe to route_active_changed, ... if (rtv && rtv->is_audio_track()) { blank0->set_name ("AudioTrackControlsBaseUnselected"); - } - else if (rtv && rtv->is_midi_track()) { + } else if (rtv && rtv->is_midi_track()) { blank0->set_name ("MidiTrackControlsBaseUnselected"); - } - else { + } else if (rtv) { blank0->set_name ("AudioBusControlsBaseUnselected"); + } else { + blank0->set_name ("UnknownControlsBaseUnselected"); } blank0->set_size_request (-1, -1); blank1->set_size_request (1, 0); @@ -217,7 +232,7 @@ AutomationTimeAxisView::AutomationTimeAxisView ( hide_button.show (); if (_controller) { - _controller.get()->set_tweaks (PixFader::Tweaks(_controller.get()->tweaks() | PixFader::NoVerticalScroll)); + _controller->disable_vertical_scroll (); controls_table.attach (*_controller.get(), 2, 4, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 0, 0); } @@ -249,11 +264,13 @@ AutomationTimeAxisView::AutomationTimeAxisView ( ARDOUR::EventTypeMap::instance().to_symbol(_parameter), *this, *_canvas_display, - _control->alist() + _control->alist(), + _control->desc() ) ); - line->set_line_color (ARDOUR_UI::config()->get_ProcessorAutomationLine()); + line->set_line_color (UIConfiguration::instance().color ("processor automation line")); + line->set_fill (true); line->queue_reset (); add_line (line); } @@ -261,7 +278,7 @@ AutomationTimeAxisView::AutomationTimeAxisView ( /* make sure labels etc. are correct */ automation_state_changed (); - ColorsChanged.connect (sigc::mem_fun (*this, &AutomationTimeAxisView::color_handler)); + UIConfiguration::instance().ColorsChanged.connect (sigc::mem_fun (*this, &AutomationTimeAxisView::color_handler)); _route->DropReferences.connect ( _route_connections, invalidator (*this), boost::bind (&AutomationTimeAxisView::route_going_away, this), gui_context () @@ -270,6 +287,7 @@ AutomationTimeAxisView::AutomationTimeAxisView ( AutomationTimeAxisView::~AutomationTimeAxisView () { + cleanup_gui_properties (); delete _view; } @@ -426,31 +444,31 @@ AutomationTimeAxisView::clear_clicked () { assert (_line || _view); - _session->begin_reversible_command (_("clear automation")); + _editor.begin_reversible_command (_("clear automation")); if (_line) { _line->clear (); } else if (_view) { _view->clear (); } - - _session->commit_reversible_command (); + set_automation_state ((AutoState) ARDOUR::Off); + _editor.commit_reversible_command (); _session->set_dirty (); } void -AutomationTimeAxisView::set_height (uint32_t h) +AutomationTimeAxisView::set_height (uint32_t h, TrackHeightMode m) { bool const changed = (height != (uint32_t) h) || first_call_to_set_height; uint32_t const normal = preset_height (HeightNormal); bool const changed_between_small_and_normal = ( (height < normal && h >= normal) || (height >= normal || h < normal) ); - TimeAxisView::set_height (h); + TimeAxisView::set_height (h, m); _base_rect->set_y1 (h); if (_line) { - _line->set_height(h); + _line->set_height(h - 2.5); } if (_view) { @@ -463,7 +481,10 @@ AutomationTimeAxisView::set_height (uint32_t h) first_call_to_set_height = false; if (h >= preset_height (HeightNormal)) { - auto_button.show(); + if (!(_parameter.type() >= MidiCCAutomation && + _parameter.type() <= MidiChannelPressureAutomation)) { + auto_button.show(); + } name_label.show(); hide_button.show(); @@ -552,14 +573,17 @@ AutomationTimeAxisView::build_display_menu () (AutoState) Touch))); auto_touch_item = dynamic_cast(&as_items.back()); - items.push_back (MenuElem (_("State"), *auto_state_menu)); + if (!(_parameter.type() >= MidiCCAutomation && + _parameter.type() <= MidiChannelPressureAutomation)) { + items.push_back (MenuElem (_("State"), *auto_state_menu)); + } /* mode menu */ /* current interpolation state */ AutomationList::InterpolationStyle const s = _view ? _view->interpolation() : _control->list()->interpolation (); - if (EventTypeMap::instance().is_midi_parameter(_parameter)) { + if (ARDOUR::parameter_is_midi((AutomationType)_parameter.type())) { Menu* auto_mode_menu = manage (new Menu); auto_mode_menu->set_name ("ArdourContextMenu"); @@ -596,7 +620,7 @@ AutomationTimeAxisView::add_automation_event (GdkEvent* event, framepos_t when, } boost::shared_ptr list = _line->the_list (); - + if (list->in_write_pass()) { /* do not allow the GUI to add automation events during an automation write pass. @@ -606,71 +630,79 @@ AutomationTimeAxisView::add_automation_event (GdkEvent* event, framepos_t when, double x = 0; - _canvas_display->canvas_to_item (x, y); + _line->grab_item().canvas_to_item (x, y); /* compute vertical fractional position */ - y = 1.0 - (y / height); + y = 1.0 - (y / _line->height()); /* map using line */ _line->view_to_model_coord (x, y); - _editor.snap_to_with_modifier (when, event); - _session->begin_reversible_command (_("add automation event")); XMLNode& before = list->get_state(); + std::list results; + if (list->editor_add (when, y, with_guard_points)) { + XMLNode& after = list->get_state(); + _editor.begin_reversible_command (_("add automation event")); + _session->add_command (new MementoCommand (*list.get (), &before, &after)); - list->add (when, y, with_guard_points); + _line->get_selectables (when, when, 0.0, 1.0, results); + _editor.get_selection ().set (results); - XMLNode& after = list->get_state(); - _session->commit_reversible_command (new MementoCommand (*list, &before, &after)); - _session->set_dirty (); + _editor.commit_reversible_command (); + _session->set_dirty (); + } } -/** Paste a selection. - * @param pos Position to paste to (session frames). - * @param times Number of times to paste. - * @param selection Selection to paste. - * @param nth Index of the AutomationList within the selection to paste from. - */ bool -AutomationTimeAxisView::paste (framepos_t pos, float times, Selection& selection, size_t nth) +AutomationTimeAxisView::paste (framepos_t pos, const Selection& selection, PasteContext& ctx, const int32_t sub_num) { - boost::shared_ptr line; - if (_line) { - line = _line; + return paste_one (pos, ctx.count, ctx.times, selection, ctx.counts, ctx.greedy); } else if (_view) { - line = _view->paste_line (pos); - } - - if (!line) { - return false; + AutomationSelection::const_iterator l = selection.lines.get_nth(_parameter, ctx.counts.n_lines(_parameter)); + if (l == selection.lines.end()) { + if (ctx.greedy && selection.lines.size() == 1) { + l = selection.lines.begin(); + } + } + if (l != selection.lines.end() && _view->paste (pos, ctx.count, ctx.times, *l)) { + ctx.counts.increase_n_lines(_parameter); + return true; + } } - return paste_one (*line, pos, times, selection, nth); + return false; } bool -AutomationTimeAxisView::paste_one (AutomationLine& line, framepos_t pos, float times, Selection& selection, size_t nth) +AutomationTimeAxisView::paste_one (framepos_t pos, unsigned paste_count, float times, const Selection& selection, ItemCounts& counts, bool greedy) { - AutomationSelection::iterator p; - boost::shared_ptr alist(line.the_list()); + boost::shared_ptr alist(_line->the_list()); if (_session->transport_rolling() && alist->automation_write()) { /* do not paste if this control is in write mode and we're rolling */ return false; } - for (p = selection.lines.begin(); p != selection.lines.end() && nth; ++p, --nth) {} - + /* Get appropriate list from selection. */ + AutomationSelection::const_iterator p = selection.lines.get_nth(_parameter, counts.n_lines(_parameter)); if (p == selection.lines.end()) { - return false; + if (greedy && selection.lines.size() == 1) { + p = selection.lines.begin(); + } else { + return false; + } } + counts.increase_n_lines(_parameter); - double const model_pos = line.time_converter().from (pos - line.time_converter().origin_b ()); + /* add multi-paste offset if applicable */ + pos += _editor.get_paste_offset(pos, paste_count, (*p)->length()); + + double const model_pos = _line->time_converter().from (pos - _line->time_converter().origin_b ()); XMLNode &before = alist->get_state(); alist->paste (**p, model_pos, times); @@ -680,7 +712,7 @@ AutomationTimeAxisView::paste_one (AutomationLine& line, framepos_t pos, float t } void -AutomationTimeAxisView::get_selectables (framepos_t start, framepos_t end, double top, double bot, list& results) +AutomationTimeAxisView::get_selectables (framepos_t start, framepos_t end, double top, double bot, list& results, bool /*within*/) { if (!_line && !_view) { return; @@ -754,11 +786,11 @@ AutomationTimeAxisView::add_line (boost::shared_ptr line) { if (_control && line) { assert(line->the_list() == _control->list()); - + _control->alist()->automation_state_changed.connect ( _list_connections, invalidator (*this), boost::bind (&AutomationTimeAxisView::automation_state_changed, this), gui_context() ); - + _control->alist()->InterpolationChanged.connect ( _list_connections, invalidator (*this), boost::bind (&AutomationTimeAxisView::interpolation_changed, this, _1), gui_context() ); @@ -833,17 +865,17 @@ AutomationTimeAxisView::what_has_visible_automation (const boost::shared_ptrcontrols()); - + for (Automatable::Controls::iterator i = controls.begin(); i != controls.end(); ++i) { - + boost::shared_ptr ac = boost::dynamic_pointer_cast (i->second); - if (ac) { - + if (ac && ac->alist()) { + const XMLNode* gui_node = ac->extra_xml ("GUI"); - + if (gui_node) { - const XMLProperty* prop = gui_node->property ("shown"); + XMLProperty const * prop = gui_node->property ("shown"); if (prop) { if (string_is_affirmative (prop->value())) { visible.insert (i->first); @@ -879,15 +911,17 @@ AutomationTimeAxisView::lines () const string AutomationTimeAxisView::state_id() const { - if (_control) { + if (_automatable != _route && _control) { return string_compose ("automation %1", _control->id().to_s()); - } else { - assert (_parameter); - return string_compose ("automation %1 %2/%3/%4", - _route->id(), + } else if (_parameter) { + return string_compose ("automation %1 %2/%3/%4", + _route->id(), _parameter.type(), _parameter.id(), (int) _parameter.channel()); + } else { + error << "Automation time axis has no state ID" << endmsg; + return ""; } } @@ -1005,3 +1039,21 @@ AutomationTimeAxisView::cut_copy_clear_one (AutomationLine& line, Selection& sel } } } + +PresentationInfo const & +AutomationTimeAxisView::presentation_info () const +{ + return _route->presentation_info(); +} + +boost::shared_ptr +AutomationTimeAxisView::stripable () const +{ + return _route; +} + +Gdk::Color +AutomationTimeAxisView::color () const +{ + return gdk_color_from_rgb (_route->presentation_info().color()); +}