smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-21 14:16:31 +01:00
Code Issues Projects Releases Wiki Activity

NO-OP: consistent [internal] API name for Automatables

Browse source
This commit is contained in:
Robin Gareus 2017-07-22 04:45:48 +02:00
parent f756dc69f4
commit 24e92c1861
7 changed files with 13 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libs/ardour/ardour/automatable.h
View file

@ -84,7 +84,7 @@ public:
void clear_controls (); void clear_controls ();
virtual void non_realtime_locate (framepos_t now); virtual void non_realtime_locate (framepos_t now);
virtual void transport_stopped (framepos_t now); virtual void non_realtime_transport_stop (framepos_t now, bool flush);
virtual void automation_run (framepos_t, pframes_t); virtual void automation_run (framepos_t, pframes_t);

2
libs/ardour/ardour/delivery.h
View file

@ -77,7 +77,7 @@ public:
void flush_buffers (framecnt_t nframes); void flush_buffers (framecnt_t nframes);
void no_outs_cuz_we_no_monitor(bool); void no_outs_cuz_we_no_monitor(bool);
void transport_stopped (framepos_t frame); void non_realtime_transport_stop (framepos_t now, bool flush);
void realtime_locate (); void realtime_locate ();
BufferSet& output_buffers() { return *_output_buffers; } BufferSet& output_buffers() { return *_output_buffers; }

2
libs/ardour/ardour/route.h
View file

@ -134,7 +134,7 @@ public:
virtual bool can_record() { return false; } virtual bool can_record() { return false; }
virtual void nonrealtime_handle_transport_stopped (bool abort, bool did_locate, bool flush_processors); virtual void non_realtime_transport_stop (framepos_t now, bool flush);
virtual void realtime_handle_transport_stopped () {} virtual void realtime_handle_transport_stopped () {}
virtual void realtime_locate () {} virtual void realtime_locate () {}
virtual void non_realtime_locate (framepos_t); virtual void non_realtime_locate (framepos_t);

2
libs/ardour/automatable.cc
View file

@ -356,7 +356,7 @@ Automatable::non_realtime_locate (framepos_t now)
} }
void void
Automatable::transport_stopped (framepos_t now) Automatable::non_realtime_transport_stop (framepos_t now, bool /*flush_processors*/)
{ {
for (Controls::iterator li = controls().begin(); li != controls().end(); ++li) { for (Controls::iterator li = controls().begin(); li != controls().end(); ++li) {
boost::shared_ptr<AutomationControl> c = boost::shared_ptr<AutomationControl> c =

6
libs/ardour/delivery.cc
View file

@ -498,12 +498,12 @@ Delivery::flush_buffers (framecnt_t nframes)
} }
void void
Delivery::transport_stopped (framepos_t now) Delivery::non_realtime_transport_stop (framepos_t now, bool flush)
{ {
Processor::transport_stopped (now); Processor::non_realtime_transport_stop (now, flush);
if (_panshell) { if (_panshell) {
_panshell->pannable()->transport_stopped (now); _panshell->pannable()->non_realtime_transport_stop (now, flush);
} }
if (_output) { if (_output) {

10
libs/ardour/route.cc
View file

@ -3300,22 +3300,20 @@ Route::feeds_according_to_graph (boost::shared_ptr<Route> other)
/** Called from the (non-realtime) butler thread when the transport is stopped */ /** Called from the (non-realtime) butler thread when the transport is stopped */
void void
Route::nonrealtime_handle_transport_stopped (bool /*abort_ignored*/, bool /*did_locate*/, bool can_flush_processors) Route::non_realtime_transport_stop (framepos_t now, bool flush)
{ {
framepos_t now = _session.transport_frame();
{ {
Glib::Threads::RWLock::ReaderLock lm (_processor_lock); Glib::Threads::RWLock::ReaderLock lm (_processor_lock);
Automatable::transport_stopped (now); Automatable::non_realtime_transport_stop (now, flush);
for (ProcessorList::iterator i = _processors.begin(); i != _processors.end(); ++i) { for (ProcessorList::iterator i = _processors.begin(); i != _processors.end(); ++i) {
if (!_have_internal_generator && (Config->get_plugins_stop_with_transport() && can_flush_processors)) { if (!_have_internal_generator && (Config->get_plugins_stop_with_transport() && flush)) {
(*i)->flush (); (*i)->flush ();
} }
(*i)->transport_stopped (now); (*i)->non_realtime_transport_stop (now, flush);
} }
} }

4
libs/ardour/session_transport.cc
View file

@ -809,11 +809,11 @@ Session::non_realtime_stop (bool abort, int on_entry, bool& finished)
PostTransportWork ptw = post_transport_work (); PostTransportWork ptw = post_transport_work ();
for (RouteList::iterator i = r->begin(); i != r->end(); ++i) { for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
(*i)->nonrealtime_handle_transport_stopped (abort, (ptw & PostTransportLocate), (!(ptw & PostTransportLocate) || pending_locate_flush)); (*i)->non_realtime_transport_stop (_transport_frame, !(ptw & PostTransportLocate) || pending_locate_flush);
} }
VCAList v = _vca_manager->vcas (); VCAList v = _vca_manager->vcas ();
for (VCAList::const_iterator i = v.begin(); i != v.end(); ++i) { for (VCAList::const_iterator i = v.begin(); i != v.end(); ++i) {
(*i)->transport_stopped (_transport_frame); (*i)->non_realtime_transport_stop (_transport_frame, !(ptw & PostTransportLocate) || pending_locate_flush);
} }
update_latency_compensation (); update_latency_compensation ();