X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fautomation_region_view.cc;h=6e54b78b729ab19338c82481fe5a494691631ba3;hb=refs%2Fheads%2Fcarl-master;hp=ca984ed12880f878a3cceb6f31d11022892d9379;hpb=60313085209a6213a7388e0b1070c10e83fe2a10;p=ardour.git diff --git a/gtk2_ardour/automation_region_view.cc b/gtk2_ardour/automation_region_view.cc index ca984ed128..6e54b78b72 100644 --- a/gtk2_ardour/automation_region_view.cc +++ b/gtk2_ardour/automation_region_view.cc @@ -1,21 +1,24 @@ /* - Copyright (C) 2007 Paul Davis - Author: David Robillard - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -*/ + * Copyright (C) 2007-2015 David Robillard + * Copyright (C) 2008-2017 Paul Davis + * Copyright (C) 2009-2011 Carl Hetherington + * Copyright (C) 2014-2017 Nick Mainsbridge + * Copyright (C) 2017-2019 Robin Gareus + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ #include @@ -29,7 +32,6 @@ #include "gtkmm2ext/keyboard.h" -#include "ardour_ui.h" #include "automation_region_view.h" #include "editing.h" #include "editor.h" @@ -37,8 +39,9 @@ #include "gui_thread.h" #include "midi_automation_line.h" #include "public_editor.h" +#include "ui_config.h" -#include "i18n.h" +#include "pbd/i18n.h" AutomationRegionView::AutomationRegionView (ArdourCanvas::Container* parent, AutomationTimeAxisView& time_axis, @@ -52,6 +55,8 @@ AutomationRegionView::AutomationRegionView (ArdourCanvas::Container* , _source_relative_time_converter(region->session().tempo_map(), region->position() - region->start()) , _parameter(param) { + TimeAxisViewItem::set_position (_region->position(), this); + if (list) { assert(list->parameter() == param); create_line(list); @@ -66,6 +71,7 @@ AutomationRegionView::AutomationRegionView (ArdourCanvas::Container* AutomationRegionView::~AutomationRegionView () { + in_destructor = true; RegionViewGoingAway (this); /* EMIT_SIGNAL */ } @@ -80,7 +86,7 @@ AutomationRegionView::init (bool /*wfd*/) set_height (trackview.current_height()); - _fill_color_name = "midi frame base"; + fill_color_name = "midi frame base"; set_colors (); _enable_display = true; @@ -96,7 +102,7 @@ AutomationRegionView::create_line (boost::shared_ptr lis _parameter, &_source_relative_time_converter)); _line->set_colors(); - _line->set_height ((uint32_t)rint(trackview.current_height() - NAME_HIGHLIGHT_SIZE)); + _line->set_height ((uint32_t)rint(trackview.current_height() - 2.5 - NAME_HIGHLIGHT_SIZE)); _line->set_visibility (AutomationLine::VisibleAspects (AutomationLine::Line|AutomationLine::ControlPoints)); _line->set_maximum_time (_region->length()); _line->set_offset (_region->start ()); @@ -109,17 +115,17 @@ AutomationRegionView::get_fill_color() const trackview.editor().internal_editing() ? "editable region" : "midi frame base"); if (_selected) { - return ARDOUR_UI::config()->color_mod ("selected region base", mod_name); - } else if (high_enough_for_name || !ARDOUR_UI::config()->get_color_regions_using_track_color()) { - return ARDOUR_UI::config()->color_mod ("midi frame base", mod_name); + return UIConfiguration::instance().color_mod ("selected region base", mod_name); + } else if (high_enough_for_name || !UIConfiguration::instance().get_color_regions_using_track_color()) { + return UIConfiguration::instance().color_mod ("midi frame base", mod_name); } - return ARDOUR_UI::config()->color_mod (fill_color, mod_name); + return UIConfiguration::instance().color_mod (fill_color, mod_name); } void AutomationRegionView::mouse_mode_changed () { - // Adjust frame colour (become more transparent for internal tools) + /* Adjust frame colour (become more transparent for internal tools) */ set_frame_color(); } @@ -132,30 +138,11 @@ AutomationRegionView::canvas_group_event (GdkEvent* ev) PublicEditor& e = trackview.editor (); - if (!trackview.editor().internal_editing()) { - // not in internal edit mode, so just act like a normal region - return RegionView::canvas_group_event (ev); - } - - if (ev->type == GDK_BUTTON_PRESS && e.current_mouse_mode() == Editing::MouseContent) { - - /* XXX: icky dcast to Editor */ - e.drags()->set (new EditorRubberbandSelectDrag (dynamic_cast (&e), group), ev); - e.drags()->start_grab (ev); - return true; - - } else if (ev->type == GDK_MOTION_NOTIFY && e.drags()->active()) { - /* we probably shouldn't have to handle this here, but... */ - e.drags()->motion_handler(ev, false); - return true; - - } else if (ev->type == GDK_BUTTON_RELEASE && e.current_mouse_mode() == Editing::MouseDraw) { - if (e.drags()->end_grab (ev)) { - return true; - } else if (e.current_mouse_mode() != Editing::MouseDraw && - e.current_mouse_mode() != Editing::MouseContent) { - return RegionView::canvas_group_event (ev); - } + if (trackview.editor().internal_editing() && + ev->type == GDK_BUTTON_RELEASE && + ev->button.button == 1 && + e.current_mouse_mode() == Editing::MouseDraw && + !e.drags()->active()) { double x = ev->button.x; double y = ev->button.y; @@ -176,11 +163,11 @@ AutomationRegionView::canvas_group_event (GdkEvent* ev) return RegionView::canvas_group_event (ev); } -/** @param when Position in frames, where 0 is the start of the region. +/** @param when Position in samples, where 0 is the start of the region. * @param y y position, relative to our TimeAxisView. */ void -AutomationRegionView::add_automation_event (GdkEvent *, framepos_t when, double y, bool with_guard_points) +AutomationRegionView::add_automation_event (GdkEvent *, samplepos_t when, double y, bool with_guard_points) { if (!_line) { boost::shared_ptr c = _region->control(_parameter, true); @@ -198,34 +185,37 @@ AutomationRegionView::add_automation_event (GdkEvent *, framepos_t when, double const double h = trackview.current_height() - TimeAxisViewItem::NAME_HIGHLIGHT_SIZE - 2; y = 1.0 - (y / h); - /* snap frame */ + /* snap sample */ - when = snap_frame_to_frame (when - _region->start ()) + _region->start (); + when = snap_sample_to_sample (when - _region->start ()).sample + _region->start (); /* map using line */ double when_d = when; _line->view_to_model_coord (when_d, y); - view->editor().begin_reversible_command (_("add automation event")); XMLNode& before = _line->the_list()->get_state(); - _line->the_list()->add (when_d, y, with_guard_points, false); + if (_line->the_list()->editor_add (when_d, y, with_guard_points)) { + view->editor().begin_reversible_command (_("add automation event")); - XMLNode& after = _line->the_list()->get_state(); + XMLNode& after = _line->the_list()->get_state(); - view->session()->add_command (new MementoCommand (_line->memento_command_binder(), &before, &after)); - view->editor().commit_reversible_command (); + view->session()->add_command (new MementoCommand (_line->memento_command_binder(), &before, &after)); + view->editor().commit_reversible_command (); - view->session()->set_dirty (); + view->session()->set_dirty (); + } } bool -AutomationRegionView::paste (framepos_t pos, +AutomationRegionView::paste (samplepos_t pos, unsigned paste_count, float times, boost::shared_ptr slist) { + using namespace ARDOUR; + AutomationTimeAxisView* const view = automation_view(); boost::shared_ptr my_list = _line->the_list(); @@ -234,15 +224,24 @@ AutomationRegionView::paste (framepos_t pos return false; } + AutomationType src_type = (AutomationType)slist->parameter().type (); + double len = slist->length(); + /* add multi-paste offset if applicable */ - pos += view->editor().get_paste_offset( - pos, paste_count, _source_relative_time_converter.to(slist->length())); + if (parameter_is_midi (src_type)) { + // convert length to samples (incl tempo-ramps) + len = DoubleBeatsSamplesConverter (view->session()->tempo_map(), pos).to (len * paste_count); + pos += view->editor ().get_paste_offset (pos, paste_count > 0 ? 1 : 0, len); + } else { + pos += view->editor ().get_paste_offset (pos, paste_count, len); + } - const double model_pos = _source_relative_time_converter.from( + /* convert sample-position to model's unit and position */ + const double model_pos = _source_relative_time_converter.from ( pos - _source_relative_time_converter.origin_b()); XMLNode& before = my_list->get_state(); - my_list->paste(*slist, model_pos, times); + my_list->paste(*slist, model_pos, DoubleBeatsSamplesConverter (view->session()->tempo_map(), pos)); view->session()->add_command( new MementoCommand(_line->memento_command_binder(), &before, &my_list->get_state())); @@ -255,12 +254,12 @@ AutomationRegionView::set_height (double h) RegionView::set_height(h); if (_line) { - _line->set_height ((uint32_t)rint(h - NAME_HIGHLIGHT_SIZE)); + _line->set_height ((uint32_t)rint(h - 2.5 - NAME_HIGHLIGHT_SIZE)); } } bool -AutomationRegionView::set_position (framepos_t pos, void* src, double* ignored) +AutomationRegionView::set_position (samplepos_t pos, void* src, double* ignored) { if (_line) { _line->set_maximum_time (_region->length ());