monster commit: transport mgmt changes from 2.X (omnibus edition); make slave use nframes64_t ; avoid crashes in Drags when commiting reversible transactions that do not exist

git-svn-id: svn://localhost/ardour2/branches/3.0@6034 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 2 insertions, 2 deletions

diff --git a/libs/ardour/session_butler.cc b/libs/ardour/session_butler.cc
index 41b4851ce5..0ffc14ff3a 100644
--- a/libs/ardour/session_butler.cc
+++ b/libs/ardour/session_butler.cc
@@ -68,7 +68,7 @@ static inline uint32_t next_power_of_two (uint32_t n)
 void
 Session::schedule_curve_reallocation ()
 {
-	post_transport_work = PostTransportWork (post_transport_work | PostTransportCurveRealloc);
+	add_post_transport_work (PostTransportCurveRealloc);
 	_butler->schedule_transport_work ();
 }
 
@@ -100,7 +100,7 @@ Session::overwrite_some_buffers (Diskstream* ds)
 		}
 	}
 
-	post_transport_work = PostTransportWork (post_transport_work | PostTransportOverWrite);
+	add_post_transport_work (PostTransportOverWrite);
 	_butler->schedule_transport_work ();
 }