mirror of
https://github.com/Ardour/ardour.git
synced 2025-12-18 12:46:32 +01:00
when stopping transport, revert _default_transport_speed to 1.0 if current speed is reversed (should fix #5264)
git-svn-id: svn://localhost/ardour2/branches/3.0@13848 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
parent
8f79c9c190
commit
244f07b2a4
1 changed files with 4 additions and 10 deletions
|
|
@ -204,6 +204,10 @@ Session::realtime_stop (bool abort, bool clear_state)
|
||||||
|
|
||||||
if (_transport_speed < 0.0f) {
|
if (_transport_speed < 0.0f) {
|
||||||
todo = (PostTransportWork (todo | PostTransportStop | PostTransportReverse));
|
todo = (PostTransportWork (todo | PostTransportStop | PostTransportReverse));
|
||||||
|
|
||||||
|
cerr << "Stop with reverse speed\n";
|
||||||
|
_default_transport_speed = 1.0;
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
todo = PostTransportWork (todo | PostTransportStop);
|
todo = PostTransportWork (todo | PostTransportStop);
|
||||||
}
|
}
|
||||||
|
|
@ -258,16 +262,6 @@ Session::realtime_stop (bool abort, bool clear_state)
|
||||||
|
|
||||||
reset_slave_state ();
|
reset_slave_state ();
|
||||||
|
|
||||||
/* XXX hack alert - hot-fix when playing backwards and hitting zero.
|
|
||||||
* This is probably not the right place for a long term solution of the issue.
|
|
||||||
*
|
|
||||||
* "hitting zero should just stop, and even if it didn't, pressing play should put the transport
|
|
||||||
* into forward play speed regardless. Nothing else makes sense." (oofus on #ardour, 20121230)
|
|
||||||
*/
|
|
||||||
if (_transport_frame == 0 && _transport_speed < 0 ) {
|
|
||||||
_default_transport_speed = 1.0;
|
|
||||||
}
|
|
||||||
|
|
||||||
_transport_speed = 0;
|
_transport_speed = 0;
|
||||||
_target_transport_speed = 0;
|
_target_transport_speed = 0;
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue