projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LuaProc::can_support_io_configuration: don't mix int and int32_t
[ardour.git]
/
gtk2_ardour
/
editor_keys.cc
diff --git
a/gtk2_ardour/editor_keys.cc
b/gtk2_ardour/editor_keys.cc
index b3081e8c8add34b17ca5d1720c45965c1db540b0..e1562dbe053ae78031185d82f478453c0604fd33 100644
(file)
--- a/
gtk2_ardour/editor_keys.cc
+++ b/
gtk2_ardour/editor_keys.cc
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2000 Paul Davis
+ 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
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
@@
-21,107
+21,89
@@
#include <cmath>
#include <string>
#include <cmath>
#include <string>
-#include <
pbd/error
.h>
+#include <
gtkmm/treeview
.h>
-#include <ardour/session.h>
-#include <ardour/region.h>
+#include "pbd/error.h"
+
+#include "ardour/session.h"
-#include "ardour_ui.h"
#include "editor.h"
#include "editor.h"
-#include "time_axis_view.h"
#include "region_view.h"
#include "selection.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 ARDOUR;
using namespace PBD;
-using namespace
sigc
;
+using namespace
Editing
;
void
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) {
+
+ framepos_t start = selection->time.start();
+ framepos_t end;
+
+ if ((_edit_point == EditAtPlayhead) && _session->transport_rolling()) {
+ end = _session->audible_frame();
} else {
} 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;
- }
-}
+ //snap the selection start/end
+ snap_to(start);
-void
-Editor::keyboard_duplicate_region ()
-{
- if (selection->regions.empty()) {
- return;
- }
+ //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();
- float prefix = 0;
- bool was_floating;
+ selection->set (start, end);
+
+ //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
}
}
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);
- }
-}
+ framepos_t start;
+ framepos_t end = selection->time.end_frame(); //0 if no current selection
-void
-Editor::keyboard_paste ()
-{
-
float prefix = 0
;
- bool was_floating;
+ if ((_edit_point == EditAtPlayhead) && _session->transport_rolling()) {
+ start = _session->audible_frame();
+
} else
{
+
start = get_preferred_edit_position(ign)
;
+ }
- if (get_prefix (prefix, was_floating) == 0) {
- paste (prefix);
- } else {
- paste (1);
- }
-}
+ //snap the selection start/end
+ snap_to(start);
-void
-Editor::keyboard_insert_region_list_selection ()
-{
- float prefix = 0;
- bool was_floating;
+ //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();
- if (get_prefix (prefix, was_floating) == 0) {
- insert_region_list_selection (prefix);
- } else {
- insert_region_list_selection (1);
+ selection->set (start, end);
+
+ //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);
}
}
-