ardour/livetrax
13
0
Fork 0
Code

fix touch-recording of automation in a loop

Browse Source
This commit is contained in:
Ben Loftis 2015-03-25 14:28:25 -05:00
parent 3c55eb1e39
commit 4a7236b773
2 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libs/ardour/ardour/automation_watch.h
View File

@ -48,6 +48,7 @@ class LIBARDOUR_API AutomationWatch : public sigc::trackable, public ARDOUR::Ses
static AutomationWatch* _instance;
Glib::Threads::Thread* _thread;
framepos_t _last_time;
bool _run_thread;
AutomationWatches automation_watches;
Glib::Threads::Mutex automation_watch_lock;

24
libs/ardour/automation_watch.cc
View File

@ -44,6 +44,7 @@ AutomationWatch::instance ()
AutomationWatch::AutomationWatch ()
: _thread (0)
, _last_time (0)
, _run_thread (false)
{
@ -121,12 +122,25 @@ AutomationWatch::timer ()
Glib::Threads::Mutex::Lock lm (automation_watch_lock);
framepos_t time = _session->audible_frame ();
for (AutomationWatches::iterator aw = automation_watches.begin(); aw != automation_watches.end(); ++aw) {
if ((*aw)->alist()->automation_write()) {
(*aw)->list()->add (time, (*aw)->user_double(), true);
if (time > _last_time) { //we only write automation in the forward direction; this fixes automation-recording in a loop
for (AutomationWatches::iterator aw = automation_watches.begin(); aw != automation_watches.end(); ++aw) {
if ((*aw)->alist()->automation_write()) {
(*aw)->list()->add (time, (*aw)->user_double(), true);
}
}
} else { //transport stopped or reversed. stop the automation pass and start a new one (for bonus points, someday store the previous pass in an undo record)
for (AutomationWatches::iterator aw = automation_watches.begin(); aw != automation_watches.end(); ++aw) {
DEBUG_TRACE (DEBUG::Automation, string_compose ("%1: transport in rewind, speed %2, in write pass ? %3 writing ? %4\n",
(*aw)->name(), _session->transport_speed(), rolling,
(*aw)->alist()->automation_write()));
(*aw)->list()->set_in_write_pass (false);
if ( (*aw)->alist()->automation_write() ) {
(*aw)->list()->set_in_write_pass (true);
}
}
}
_last_time = time;
}
return TRUE;
@ -170,6 +184,8 @@ AutomationWatch::transport_state_change ()
}
bool rolling = _session->transport_rolling();
_last_time = _session->audible_frame ();
{
Glib::Threads::Mutex::Lock lm (automation_watch_lock);