#include "ardour/session.h"
-#include "ardour_ui.h"
#include "editor.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 Editing;
void
-Editor::keyboard_selection_finish (bool add)
+Editor::keyboard_selection_finish (bool /*add*/, Editing::EditIgnoreOption ign)
{
if (_session) {
framepos_t start = selection->time.start();
framepos_t end;
-
+
if ((_edit_point == EditAtPlayhead) && _session->transport_rolling()) {
end = _session->audible_frame();
} else {
- end = get_preferred_edit_position();
+ end = get_preferred_edit_position(ign);
}
//snap the selection start/end
snap_to(start);
-
+
//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();
selection->set (start, end);
//if session is playing a range, cancel that
-// if (_session->get_play_range())
-// _session->request_cancel_play_range();
+ if (_session->get_play_range())
+ _session->request_cancel_play_range();
}
}
void
-Editor::keyboard_selection_begin ()
+Editor::keyboard_selection_begin (Editing::EditIgnoreOption ign)
{
if (_session) {
if ((_edit_point == EditAtPlayhead) && _session->transport_rolling()) {
start = _session->audible_frame();
} else {
- start = get_preferred_edit_position();
+ start = get_preferred_edit_position(ign);
}
-
+
//snap the selection start/end
snap_to(start);
-
+
//if there's not already a sensible selection endpoint, go "forever"
if ( start > end ) {
end = max_framepos;
}
-
+
//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();
-
+
selection->set (start, end);
//if session is playing a range, cancel that
if (_session->get_play_range())
- _session->request_transport_speed ( 1.0 );
-
- //if join playhead, locate to the newly selected start
-// if ( !_session->transport_rolling() && Config->get_join_play_range() )
-// _session->request_cancel_play_range();
+ _session->request_cancel_play_range();
}
}
-/*
-void
-Editor::keyboard_selection_finish (bool add)
-{
- if (_session && have_pending_keyboard_selection) {
-
- framepos_t end;
- bool ignored;
-
- if (_session->transport_rolling()) {
- end = _session->audible_frame();
- } else {
- if (!mouse_frame (end, ignored)) {
- return;
- }
- }
-
- if (add) {
- selection->add (pending_keyboard_selection_start, end);
- } else {
- selection->set (pending_keyboard_selection_start, end);
- }
-
- have_pending_keyboard_selection = false;
- }
-}
-
-void
-Editor::keyboard_selection_begin ()
-{
- if (_session) {
- if (_session->transport_rolling()) {
- pending_keyboard_selection_start = _session->audible_frame();
- have_pending_keyboard_selection = true;
- } else {
- bool ignored;
- framepos_t where; // XXX fix me
-
- if (mouse_frame (where, ignored)) {
- pending_keyboard_selection_start = where;
- have_pending_keyboard_selection = true;
- }
-
- }
- }
-}*/
-
void
Editor::keyboard_paste ()
{
- paste (1);
+ paste (1, false);
}