From ff122d0fe8fde6a8a4edc71f9dbba5d161036300 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Sun, 8 Nov 2009 16:28:21 +0000 Subject: 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 --- libs/ardour/slave.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'libs/ardour/slave.cc') diff --git a/libs/ardour/slave.cc b/libs/ardour/slave.cc index f07ea4c872..be88fe223c 100644 --- a/libs/ardour/slave.cc +++ b/libs/ardour/slave.cc @@ -35,13 +35,13 @@ SlaveSessionProxy::frame_rate() const return session.frame_rate(); } -nframes_t +nframes64_t SlaveSessionProxy::audible_frame() const { return session.audible_frame(); } -nframes_t +nframes64_t SlaveSessionProxy::transport_frame() const { return session.transport_frame(); @@ -53,14 +53,14 @@ SlaveSessionProxy::frames_since_cycle_start() const return session.engine().frames_since_cycle_start(); } -nframes_t +nframes64_t SlaveSessionProxy::frame_time() const { return session.engine().frame_time(); } void -SlaveSessionProxy::request_locate(nframes_t frame, bool with_roll) +SlaveSessionProxy::request_locate(nframes64_t frame, bool with_roll) { session.request_locate(frame, with_roll); } -- cgit v1.2.3