projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
more MTC debugging
[ardour.git]
/
libs
/
ardour
/
session_process.cc
diff --git
a/libs/ardour/session_process.cc
b/libs/ardour/session_process.cc
index 882694cccf5ead23a5181b93bbb76a8e3923236f..9baa0aea9e81dc6657bb08c8ed3e82b42f0426f9 100644
(file)
--- a/
libs/ardour/session_process.cc
+++ b/
libs/ardour/session_process.cc
@@
-568,6
+568,7
@@
Session::follow_slave (nframes_t nframes)
if (_slave->give_slave_full_control_over_transport_speed()) {
set_transport_speed (slave_speed, false, false);
if (_slave->give_slave_full_control_over_transport_speed()) {
set_transport_speed (slave_speed, false, false);
+ //std::cout << "set speed = " << slave_speed << "\n";
} else {
float adjusted_speed = slave_speed + (1.5 * (delta / float(_current_frame_rate)));
request_transport_speed (adjusted_speed);
} else {
float adjusted_speed = slave_speed + (1.5 * (delta / float(_current_frame_rate)));
request_transport_speed (adjusted_speed);
@@
-576,10
+577,12
@@
Session::follow_slave (nframes_t nframes)
slave_speed));
}
slave_speed));
}
- if (abs(average_slave_delta) > _slave->resolution()) {
+#if 1
+ if ((nframes_t) abs(average_slave_delta) > _slave->resolution()) {
cerr << "average slave delta greater than slave resolution (" << _slave->resolution() << "), going to silent motion\n";
goto silent_motion;
}
cerr << "average slave delta greater than slave resolution (" << _slave->resolution() << "), going to silent motion\n";
goto silent_motion;
}
+#endif
}
}
}
}
@@
-1138,9
+1141,3
@@
Session::process_event (SessionEvent* ev)
}
}
}
}
-void
-Session::process_rtop (SessionEvent* ev)
-{
- ev->rt_slot ();
- ev->rt_return (ev);
-}