#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 && have_pending_keyboard_selection) {
-
- framepos_t end;
- bool ignored;
+ if (_session) {
- if (_session->transport_rolling()) {
- end = _session->audible_frame();
+ MusicSample start (selection->time.start(), 0);
+ samplepos_t end;
+ if ((_edit_point == EditAtPlayhead) && _session->transport_rolling()) {
+ end = _session->audible_sample();
} else {
- if (!mouse_frame (end, ignored)) {
- return;
- }
+ end = get_preferred_edit_position(ign);
}
- if (add) {
- selection->add (pending_keyboard_selection_start, end);
- } else {
- selection->set (pending_keyboard_selection_start, end);
- }
+ //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.sample, end);
+
+ //if session is playing a range, cancel that
+ if (_session->get_play_range())
+ _session->request_cancel_play_range();
- have_pending_keyboard_selection = false;
}
}
void
-Editor::keyboard_selection_begin ()
+Editor::keyboard_selection_begin (Editing::EditIgnoreOption ign)
{
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;
- }
+ 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);
+ }
+ //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 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.sample, end.sample);
+
+ //if session is playing a range, cancel that
+ if (_session->get_play_range())
+ _session->request_cancel_play_range();
}
}
void
Editor::keyboard_paste ()
{
- paste (1);
+ paste (1, false);
}