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=ce1cd1498d281b2d57ae1f2eac24c85aaa7e1787;hpb=0b5db91ee91afbd61a3ab11cb99796132f1b74b9;p=ardour.git diff --git a/gtk2_ardour/automation_region_view.cc b/gtk2_ardour/automation_region_view.cc index ce1cd1498d..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 @@ -122,7 +125,7 @@ AutomationRegionView::get_fill_color() const 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(); } @@ -137,6 +140,7 @@ AutomationRegionView::canvas_group_event (GdkEvent* ev) if (trackview.editor().internal_editing() && ev->type == GDK_BUTTON_RELEASE && + ev->button.button == 1 && e.current_mouse_mode() == Editing::MouseDraw && !e.drags()->active()) { @@ -159,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); @@ -181,9 +185,9 @@ 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 ()).frame + _region->start (); + when = snap_sample_to_sample (when - _region->start ()).sample + _region->start (); /* map using line */ @@ -205,7 +209,7 @@ AutomationRegionView::add_automation_event (GdkEvent *, framepos_t when, double } bool -AutomationRegionView::paste (framepos_t pos, +AutomationRegionView::paste (samplepos_t pos, unsigned paste_count, float times, boost::shared_ptr slist) @@ -226,7 +230,7 @@ AutomationRegionView::paste (framepos_t pos /* add multi-paste offset if applicable */ if (parameter_is_midi (src_type)) { // convert length to samples (incl tempo-ramps) - len = DoubleBeatsFramesConverter (view->session()->tempo_map(), pos).to (len * paste_count); + 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); @@ -237,7 +241,7 @@ AutomationRegionView::paste (framepos_t pos pos - _source_relative_time_converter.origin_b()); XMLNode& before = my_list->get_state(); - my_list->paste(*slist, model_pos, DoubleBeatsFramesConverter (view->session()->tempo_map(), pos)); + 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,7 +259,7 @@ AutomationRegionView::set_height (double h) } 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 ());