X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fautomation_time_axis.cc;h=60552ce14eaafb4d3dbb5742ff4faf7d1a81b84d;hb=01d99870ffdefa1a76093c95250f355db11609d1;hp=3915b8c626e5dee32489523a76b58b0cb1ec83e0;hpb=ae1200716f749050d115558a984f3d4cdeb709b0;p=ardour.git diff --git a/gtk2_ardour/automation_time_axis.cc b/gtk2_ardour/automation_time_axis.cc index 3915b8c626..60552ce14e 100644 --- a/gtk2_ardour/automation_time_axis.cc +++ b/gtk2_ardour/automation_time_axis.cc @@ -23,11 +23,13 @@ #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" @@ -41,12 +43,14 @@ #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 "rgb_macros.h" #include "point_selection.h" #include "control_point.h" #include "utils.h" +#include "item_counts.h" #include "i18n.h" @@ -103,9 +107,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,9 +127,8 @@ 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_canvasvar_AutomationTrackOutline()); - _base_rect->set_outline_what (ArdourCanvas::Rectangle::BOTTOM); // bottom separator - _base_rect->set_fill_color (ARDOUR_UI::config()->get_canvasvar_AutomationTrackFill()); + _base_rect->set_outline (false); + _base_rect->set_fill_color (ARDOUR_UI::config()->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) { @@ -129,9 +136,10 @@ AutomationTimeAxisView::AutomationTimeAxisView ( } hide_button.set_elements ((ArdourButton::Element)(ArdourButton::Edge|ArdourButton::Body|ArdourButton::CloseCross)); + hide_button.set_tweaks(ArdourButton::TrackHeader); - auto_button.set_name ("mixer strip button"); - hide_button.set_name ("mixer strip button"); + auto_button.set_name ("route button"); + hide_button.set_name ("route button"); auto_button.unset_flags (Gtk::CAN_FOCUS); hide_button.unset_flags (Gtk::CAN_FOCUS); @@ -170,61 +178,54 @@ AutomationTimeAxisView::AutomationTimeAxisView ( ARDOUR_UI::instance()->set_tip(controls_ebox, tipname); /* add the buttons */ + controls_table.set_border_width (1); controls_table.remove (name_hbox); - if (ARDOUR::Profile->get_mixbus()) { - controls_table.attach (hide_button, 1, 2, 0, 1, Gtk::SHRINK, Gtk::SHRINK, 0, 0); - } else { - controls_table.attach (hide_button, 1, 2, 0, 1, Gtk::SHRINK, Gtk::SHRINK, 1, 0); - } + 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, 1, 0); + controls_table.attach (auto_button, 3, 4, 2, 3, Gtk::SHRINK, Gtk::SHRINK, 0, 0); Gtk::DrawingArea *blank0 = manage (new Gtk::DrawingArea()); - Gtk::DrawingArea *blankB = manage (new Gtk::DrawingArea()); + Gtk::DrawingArea *blank1 = manage (new Gtk::DrawingArea()); RouteTimeAxisView* rtv = dynamic_cast(&parent); + // TODO use rtv->controls_base_unselected_name + // subscribe to route_active_changed, ... if (rtv && rtv->is_audio_track()) { blank0->set_name ("AudioTrackControlsBaseUnselected"); - blankB->set_name ("AudioTrackControlsBaseUnselected"); } else if (rtv && rtv->is_midi_track()) { blank0->set_name ("MidiTrackControlsBaseUnselected"); - blankB->set_name ("MidiTrackControlsBaseUnselected"); } else { blank0->set_name ("AudioBusControlsBaseUnselected"); - blankB->set_name ("AudioBusControlsBaseUnselected"); } blank0->set_size_request (-1, -1); - blankB->set_size_request (4, -1); - + blank1->set_size_request (1, 0); VSeparator* separator = manage (new VSeparator()); separator->set_name("TrackSeparator"); separator->set_size_request (1, -1); - controls_button_size_group->add_widget(*blank0); controls_button_size_group->add_widget(hide_button); + controls_button_size_group->add_widget(*blank0); time_axis_hbox.pack_start (*blank0, false, false); - time_axis_hbox.pack_start (*blankB, false, false); time_axis_hbox.pack_start (*separator, false, false); time_axis_hbox.reorder_child (*blank0, 0); - time_axis_hbox.reorder_child (*blankB, 1); - time_axis_hbox.reorder_child (*separator, 2); - time_axis_hbox.reorder_child (time_axis_vbox, 3); + time_axis_hbox.reorder_child (*separator, 1); + time_axis_hbox.reorder_child (time_axis_vbox, 2); + + if (!ARDOUR::Profile->get_mixbus() ) { + time_axis_hbox.pack_start (*blank1, false, false); + } - blank0->show(); blank0->show(); separator->show(); name_label.show (); hide_button.show (); if (_controller) { - /* add bar controller */ - _controller.get()->set_tweaks (PixFader::Tweaks(_controller.get()->tweaks() | PixFader::NoVerticalScroll)); - controls_table.attach (*_controller.get(), 2, 4, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 1, 0); - /* note that this handler connects *before* the default handler */ - _controller->event_widget().signal_scroll_event().connect (mem_fun (*this, &AutomationTimeAxisView::controls_ebox_scroll), false); + _controller->disable_vertical_scroll (); + controls_table.attach (*_controller.get(), 2, 4, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 0, 0); } controls_table.show_all (); @@ -255,11 +256,12 @@ 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_canvasvar_ProcessorAutomationLine()); + line->set_line_color (ARDOUR_UI::config()->color ("processor automation line")); line->queue_reset (); add_line (line); } @@ -432,7 +434,7 @@ AutomationTimeAxisView::clear_clicked () { assert (_line || _view); - _session->begin_reversible_command (_("clear automation")); + _editor.begin_reversible_command (_("clear automation")); if (_line) { _line->clear (); @@ -440,7 +442,7 @@ AutomationTimeAxisView::clear_clicked () _view->clear (); } - _session->commit_reversible_command (); + _editor.commit_reversible_command (); _session->set_dirty (); } @@ -565,7 +567,7 @@ AutomationTimeAxisView::build_display_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"); @@ -625,58 +627,63 @@ AutomationTimeAxisView::add_automation_event (GdkEvent* event, framepos_t when, _editor.snap_to_with_modifier (when, event); - _session->begin_reversible_command (_("add automation event")); + _editor.begin_reversible_command (_("add automation event")); XMLNode& before = list->get_state(); list->add (when, y, with_guard_points); XMLNode& after = list->get_state(); - _session->commit_reversible_command (new MementoCommand (*list, &before, &after)); + _session->add_command (new MementoCommand (*list, &before, &after)); + _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) { - 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); @@ -686,7 +693,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; @@ -844,7 +851,7 @@ AutomationTimeAxisView::what_has_visible_automation (const boost::shared_ptr ac = boost::dynamic_pointer_cast (i->second); - if (ac) { + if (ac && ac->alist()) { const XMLNode* gui_node = ac->extra_xml ("GUI"); @@ -885,15 +892,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); + } 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 ""; } }