projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Put images on the fade in/out menus. Fixes #3411.
[ardour.git]
/
gtk2_ardour
/
editor_keys.cc
diff --git
a/gtk2_ardour/editor_keys.cc
b/gtk2_ardour/editor_keys.cc
index 03a025743c9bd42eed1f136d070a5eec2b8a5ba1..2ef22c827395acbce0f36d7b8215ba8fdb4b3e16 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
@@
-37,18
+37,17
@@
using namespace ARDOUR;
using namespace PBD;
using namespace ARDOUR;
using namespace PBD;
-using namespace sigc;
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;
@@
-58,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 (
TimeAxisViewPtr (),
pending_keyboard_selection_start, end);
+ selection->set (pending_keyboard_selection_start, end);
}
have_pending_keyboard_selection = false;
}
have_pending_keyboard_selection = false;
@@
-68,19
+67,19
@@
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;
have_pending_keyboard_selection = true;
}
if (mouse_frame (where, ignored)) {
pending_keyboard_selection_start = where;
have_pending_keyboard_selection = true;
}
-
+
}
}
}
}
}
}
@@
-99,7
+98,7
@@
Editor::keyboard_insert_region_list_selection ()
}
int
}
int
-Editor::get_prefix (float&
val
, bool& was_floating)
+Editor::get_prefix (float&
/*val*/
, bool& was_floating)
{
was_floating = false;
return 1;
{
was_floating = false;
return 1;