projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add some comments.
[ardour.git]
/
libs
/
ardour
/
session_transport.cc
diff --git
a/libs/ardour/session_transport.cc
b/libs/ardour/session_transport.cc
index b199d77f97c7c44592f0f43d6a90461c8b18ed6f..d032e31b93febad22c2b8b90147888ab71d19ea4 100644
(file)
--- a/
libs/ardour/session_transport.cc
+++ b/
libs/ardour/session_transport.cc
@@
-718,6
+718,10
@@
Session::locate (nframes_t target_frame, bool with_roll, bool with_flush, bool w
_send_smpte_update = true;
}
_send_smpte_update = true;
}
+/** Set the transport speed.
+ * @param speed New speed
+ * @param abort
+ */
void
Session::set_transport_speed (float speed, bool abort)
{
void
Session::set_transport_speed (float speed, bool abort)
{
@@
-733,6
+737,8
@@
Session::set_transport_speed (float speed, bool abort)
if (transport_rolling() && speed == 0.0) {
if (transport_rolling() && speed == 0.0) {
+ /* we are rolling and we want to stop */
+
if (Config->get_monitoring_model() == HardwareMonitoring)
{
boost::shared_ptr<DiskstreamList> dsl = diskstreams.reader();
if (Config->get_monitoring_model() == HardwareMonitoring)
{
boost::shared_ptr<DiskstreamList> dsl = diskstreams.reader();
@@
-753,6
+759,8
@@
Session::set_transport_speed (float speed, bool abort)
} else if (transport_stopped() && speed == 1.0) {
} else if (transport_stopped() && speed == 1.0) {
+ /* we are stopped and we want to start rolling at speed 1 */
+
if (!get_record_enabled() && Config->get_stop_at_session_end() && _transport_frame >= current_end_frame()) {
return;
}
if (!get_record_enabled() && Config->get_stop_at_session_end() && _transport_frame >= current_end_frame()) {
return;
}
@@
-825,6
+833,8
@@
Session::set_transport_speed (float speed, bool abort)
}
}
}
}
+
+/** Stop the transport. */
void
Session::stop_transport (bool abort)
{
void
Session::stop_transport (bool abort)
{