X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_keys.cc;h=c4d9a173ea12da25b4237926116f214e36272cbf;hb=8112d6472ecaf688a24572c397f2bfa4e1dd38a6;hp=b3081e8c8add34b17ca5d1720c45965c1db540b0;hpb=62c4e8188457c8e0da9eb98202a5bc2a07c9250b;p=ardour.git diff --git a/gtk2_ardour/editor_keys.cc b/gtk2_ardour/editor_keys.cc index b3081e8c8a..c4d9a173ea 100644 --- a/gtk2_ardour/editor_keys.cc +++ b/gtk2_ardour/editor_keys.cc @@ -1,127 +1,112 @@ /* - Copyright (C) 2000 Paul Davis - - 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) 2005-2017 Paul Davis + * Copyright (C) 2005 Taybin Rutkin + * Copyright (C) 2006-2012 David Robillard + * Copyright (C) 2009-2012 Carl Hetherington + * Copyright (C) 2014-2018 Ben Loftis + * Copyright (C) 2015-2016 Robin Gareus + * Copyright (C) 2016-2017 Nick Mainsbridge + * + * 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 #include #include -#include +#include -#include -#include +#include "pbd/error.h" + +#include "ardour/session.h" -#include "ardour_ui.h" #include "editor.h" -#include "time_axis_view.h" #include "region_view.h" #include "selection.h" +#include "time_axis_view.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace ARDOUR; using namespace PBD; -using namespace sigc; +using namespace Editing; void -Editor::keyboard_selection_finish (bool add) +Editor::keyboard_selection_finish (bool /*add*/, Editing::EditIgnoreOption ign) { - if (session && have_pending_keyboard_selection) { - begin_reversible_command (_("keyboard selection")); - if (add) { - selection->add (pending_keyboard_selection_start, session->audible_frame()); + if (_session) { + + MusicSample start (selection->time.start(), 0); + samplepos_t end; + if ((_edit_point == EditAtPlayhead) && _session->transport_rolling()) { + end = _session->audible_sample(); } else { - selection->set (0, pending_keyboard_selection_start, session->audible_frame()); + end = get_preferred_edit_position(ign); } - commit_reversible_command (); - have_pending_keyboard_selection = false; - } -} -void -Editor::keyboard_selection_begin () -{ - if (session) { - pending_keyboard_selection_start = session->audible_frame(); - have_pending_keyboard_selection = true; - } -} + //if no tracks are selected and we're working from the keyboard, enable all tracks (_something_ has to be selected for any range selection) + if ( (_edit_point == EditAtPlayhead) && selection->tracks.empty() ) + select_all_tracks(); -void -Editor::keyboard_duplicate_region () -{ - if (selection->regions.empty()) { - return; - } + selection->set (start.sample, end); - float prefix = 0; - bool was_floating; + //if session is playing a range, cancel that + if (_session->get_play_range()) + _session->request_cancel_play_range(); - if (get_prefix (prefix, was_floating) == 0) { - duplicate_some_regions (selection->regions, prefix); - } else { - duplicate_some_regions (selection->regions, 1); } } void -Editor::keyboard_duplicate_selection () +Editor::keyboard_selection_begin (Editing::EditIgnoreOption ign) { - float prefix = 0; - bool was_floating; + if (_session) { - if (get_prefix (prefix, was_floating) == 0) { - duplicate_selection (prefix); - } else { - duplicate_selection (1); - } -} + MusicSample start (0, 0); + MusicSample end (selection->time.end_sample(), 0); + if ((_edit_point == EditAtPlayhead) && _session->transport_rolling()) { + start.sample = _session->audible_sample(); + } else { + start.sample = get_preferred_edit_position(ign); + } -void -Editor::keyboard_paste () -{ - float prefix = 0; - bool was_floating; + //if there's not already a sensible selection endpoint, go "forever" + if (start.sample > end.sample) { +#ifdef MIXBUS + // 4hours at most. + // This works around a visual glitch in red-bordered selection rect. + end.sample = start.sample + _session->nominal_sample_rate() * 60 * 60 * 4; +#else + end.sample = max_samplepos; +#endif + } - if (get_prefix (prefix, was_floating) == 0) { - paste (prefix); - } else { - paste (1); - } -} + //if no tracks are selected and we're working from the keyboard, enable all tracks (_something_ has to be selected for any range selection) + if ( selection->tracks.empty() ) + select_all_tracks(); -void -Editor::keyboard_insert_region_list_selection () -{ - float prefix = 0; - bool was_floating; + selection->set (start.sample, end.sample); - if (get_prefix (prefix, was_floating) == 0) { - insert_region_list_selection (prefix); - } else { - insert_region_list_selection (1); + //if session is playing a range, cancel that + if (_session->get_play_range()) + _session->request_cancel_play_range(); } } -int -Editor::get_prefix (float& val, bool& was_floating) +void +Editor::keyboard_paste () { - was_floating = false; - return 1; + paste (1, false); } -