mirror of
https://github.com/Ardour/ardour.git
synced 2025-12-12 09:36:33 +01:00
make 3.0 catch up with transport and other changes in 2.X (hand applied, not merged)
git-svn-id: svn://localhost/ardour2/branches/3.0@5989 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
parent
c83e48e07a
commit
e98b3c1ec6
18 changed files with 253 additions and 228 deletions
|
|
@ -2367,37 +2367,6 @@ Editor::transition_to_rolling (bool fwd)
|
|||
session->request_transport_speed (fwd ? 1.0f : -1.0f);
|
||||
}
|
||||
|
||||
void
|
||||
Editor::toggle_playback (bool with_abort)
|
||||
{
|
||||
if (!session) {
|
||||
return;
|
||||
}
|
||||
|
||||
switch (Config->get_slave_source()) {
|
||||
case None:
|
||||
case JACK:
|
||||
break;
|
||||
default:
|
||||
/* transport controlled by the master */
|
||||
return;
|
||||
}
|
||||
|
||||
if (session->is_auditioning()) {
|
||||
session->cancel_audition ();
|
||||
return;
|
||||
}
|
||||
|
||||
if (session->transport_rolling()) {
|
||||
session->request_stop (with_abort);
|
||||
if (session->get_play_loop()) {
|
||||
session->request_play_loop (false);
|
||||
}
|
||||
} else {
|
||||
session->request_transport_speed (1.0f);
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
Editor::play_from_start ()
|
||||
{
|
||||
|
|
@ -2638,7 +2607,6 @@ Editor::play_selected_region ()
|
|||
}
|
||||
}
|
||||
|
||||
session->request_stop ();
|
||||
session->request_bounded_roll (start, end);
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue