projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove duplicate Automation menu entry.
[ardour.git]
/
gtk2_ardour
/
editor_keys.cc
diff --git
a/gtk2_ardour/editor_keys.cc
b/gtk2_ardour/editor_keys.cc
index cbbe11f37b76948b215eb91a026fd22d9e0d54fe..930c5a229d6997cc82ed4a629863956c48e0075a 100644
(file)
--- a/
gtk2_ardour/editor_keys.cc
+++ b/
gtk2_ardour/editor_keys.cc
@@
-41,13
+41,13
@@
using namespace PBD;
void
Editor::keyboard_selection_finish (bool add)
{
void
Editor::keyboard_selection_finish (bool add)
{
- if (session && have_pending_keyboard_selection) {
+ if (
_
session && have_pending_keyboard_selection) {
-
nframes64
_t end;
+
framepos
_t end;
bool ignored;
bool ignored;
- if (session->transport_rolling()) {
- end = session->audible_frame();
+ if (
_
session->transport_rolling()) {
+ end =
_
session->audible_frame();
} else {
if (!mouse_frame (end, ignored)) {
return;
} else {
if (!mouse_frame (end, ignored)) {
return;
@@
-57,7
+57,7
@@
Editor::keyboard_selection_finish (bool add)
if (add) {
selection->add (pending_keyboard_selection_start, end);
} else {
if (add) {
selection->add (pending_keyboard_selection_start, end);
} else {
- selection->set (
0,
pending_keyboard_selection_start, end);
+ selection->set (pending_keyboard_selection_start, end);
}
have_pending_keyboard_selection = false;
}
have_pending_keyboard_selection = false;
@@
-67,13
+67,13
@@
Editor::keyboard_selection_finish (bool add)
void
Editor::keyboard_selection_begin ()
{
void
Editor::keyboard_selection_begin ()
{
- if (session) {
- if (session->transport_rolling()) {
- pending_keyboard_selection_start = session->audible_frame();
+ if (
_
session) {
+ if (
_
session->transport_rolling()) {
+ pending_keyboard_selection_start =
_
session->audible_frame();
have_pending_keyboard_selection = true;
} else {
bool ignored;
have_pending_keyboard_selection = true;
} else {
bool ignored;
-
nframes64
_t where; // XXX fix me
+
framepos
_t where; // XXX fix me
if (mouse_frame (where, ignored)) {
pending_keyboard_selection_start = where;
if (mouse_frame (where, ignored)) {
pending_keyboard_selection_start = where;
@@
-91,12
+91,6
@@
Editor::keyboard_paste ()
paste (1);
}
paste (1);
}
-void
-Editor::keyboard_insert_region_list_selection ()
-{
- insert_region_list_selection (1);
-}
-
int
Editor::get_prefix (float& /*val*/, bool& was_floating)
{
int
Editor::get_prefix (float& /*val*/, bool& was_floating)
{