X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fautomation_time_axis.cc;h=60552ce14eaafb4d3dbb5742ff4faf7d1a81b84d;hb=e3dd226ffa562d28758555d67961d95723e2a2f0;hp=3d2773b87965edf77a057fcad8e7480f25c498d6;hpb=47c4929bc285da6d752e68aa5a32cf73f20b9f22;p=ardour.git diff --git a/gtk2_ardour/automation_time_axis.cc b/gtk2_ardour/automation_time_axis.cc index 3d2773b879..60552ce14e 100644 --- a/gtk2_ardour/automation_time_axis.cc +++ b/gtk2_ardour/automation_time_axis.cc @@ -23,6 +23,7 @@ #include #include +#include "pbd/error.h" #include "pbd/memento_command.h" #include "pbd/stacktrace.h" @@ -42,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" @@ -107,6 +110,10 @@ AutomationTimeAxisView::AutomationTimeAxisView ( _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; @@ -120,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_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 (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) { @@ -218,7 +224,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); } @@ -255,7 +261,7 @@ AutomationTimeAxisView::AutomationTimeAxisView ( ) ); - line->set_line_color (ARDOUR_UI::config()->get_ProcessorAutomationLine()); + line->set_line_color (ARDOUR_UI::config()->color ("processor automation line")); line->queue_reset (); add_line (line); } @@ -428,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 (); @@ -436,7 +442,7 @@ AutomationTimeAxisView::clear_clicked () _view->clear (); } - _session->commit_reversible_command (); + _editor.commit_reversible_command (); _session->set_dirty (); } @@ -621,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); + + /* 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 ()); + 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); @@ -682,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; @@ -881,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 ""; } }