From bb457bb960c5bd7ed538f9d31477293415739f68 Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Thu, 10 Jan 2008 21:20:59 +0000
Subject: Merge libs/ardour and gtk2_ardour with 2.0-ongoing R2837.

git-svn-id: svn://localhost/ardour2/trunk@2883 d708f5d6-7413-0410-9779-e7cbd77b26cf
---
 libs/ardour/session_events.cc | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'libs/ardour/session_events.cc')

diff --git a/libs/ardour/session_events.cc b/libs/ardour/session_events.cc
index bf1d9f1a09..f1355b331b 100644
--- a/libs/ardour/session_events.cc
+++ b/libs/ardour/session_events.cc
@@ -41,6 +41,7 @@ static const char* event_names[] = {
 	"SetDiskstreamSpeed",
 	"Locate",
 	"LocateRoll",
+	"LocateRollLocate",
 	"SetLoop",
 	"PunchIn",
 	"PunchOut",
@@ -351,6 +352,13 @@ Session::process_event (Event* ev)
 		_send_smpte_update = true;
 		break;
 
+	case Event::LocateRollLocate:
+		// locate is handled by ::request_roll_at_and_return()
+		_requested_return_frame = ev->target_frame;
+		set_transport_speed (ev->speed, true);
+		break;
+
+
 	case Event::SetTransportSpeed:
 		set_transport_speed (ev->speed, ev->yes_or_no);
 		break;
-- 
cgit v1.2.3