projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix merge regression: use TempoLines class instead of same built in to editor.
[ardour.git]
/
libs
/
ardour
/
session_events.cc
diff --git
a/libs/ardour/session_events.cc
b/libs/ardour/session_events.cc
index aa5a1b87d4e5f6fab7302cdb800539715ddbc8a7..5fc8cd75353561f3e90aa002304f21fc8d1eee96 100644
(file)
--- a/
libs/ardour/session_events.cc
+++ b/
libs/ardour/session_events.cc
@@
-41,6
+41,7
@@
static const char* event_names[] = {
"SetDiskstreamSpeed",
"Locate",
"LocateRoll",
"SetDiskstreamSpeed",
"Locate",
"LocateRoll",
+ "LocateRollLocate",
"SetLoop",
"PunchIn",
"PunchOut",
"SetLoop",
"PunchIn",
"PunchOut",
@@
-351,6
+352,14
@@
Session::process_event (Event* ev)
_send_smpte_update = true;
break;
_send_smpte_update = true;
break;
+ case Event::LocateRollLocate:
+ // locate is handled by ::request_roll_at_and_return()
+ _requested_return_frame = ev->target_frame;
+ cerr << "Set RRF " << ev->target_frame << endl;
+ request_locate (ev->target2_frame, true);
+ break;
+
+
case Event::SetTransportSpeed:
set_transport_speed (ev->speed, ev->yes_or_no);
break;
case Event::SetTransportSpeed:
set_transport_speed (ev->speed, ev->yes_or_no);
break;
@@
-397,7
+406,7
@@
Session::process_event (Event* ev)
break;
case Event::Overwrite:
break;
case Event::Overwrite:
- overwrite_some_buffers (static_cast<
Audio
Diskstream*>(ev->ptr));
+ overwrite_some_buffers (static_cast<Diskstream*>(ev->ptr));
break;
case Event::SetDiskstreamSpeed:
break;
case Event::SetDiskstreamSpeed: