smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-06 05:35:47 +01:00
Code Issues Projects Releases Wiki Activity

add a method to cancel a pending play_range. this is needed when we are modifying the range with keyboard commands.

Browse source
This commit is contained in:
Ben Loftis 2014-07-02 17:34:49 -05:00
parent 0f1c7b1d71
commit a1c8e67e50
6 changed files with 18 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

57
gtk2_ardour/editor_keys.cc
View file

@ -63,8 +63,8 @@ Editor::keyboard_selection_finish (bool add)
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();
}
}
@ -99,61 +99,10 @@ Editor::keyboard_selection_begin ()
//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 ()
{