diff options
author | Robin Gareus <robin@gareus.org> | 2019-09-29 18:24:54 +0200 |
---|---|---|
committer | Robin Gareus <robin@gareus.org> | 2019-09-29 18:25:14 +0200 |
commit | 0daee87803b39adb9e9fab7d81281c4dd6a6a43d (patch) | |
tree | 7eaf420ac18c4ca419ccf3cfd3c44dd29880659b /libs | |
parent | c5b6b232a6ed251e256b13f4c0c3deed0792ab5b (diff) |
Ardour::IO is not latent by itself
Diffstat (limited to 'libs')
-rw-r--r-- | libs/ardour/ardour/io.h | 4 | ||||
-rw-r--r-- | libs/ardour/ardour/route.h | 1 | ||||
-rw-r--r-- | libs/ardour/io.cc | 4 | ||||
-rw-r--r-- | libs/ardour/route.cc | 16 |
4 files changed, 2 insertions, 23 deletions
diff --git a/libs/ardour/ardour/io.h b/libs/ardour/ardour/io.h index 784b6ce398..c4fabba5e7 100644 --- a/libs/ardour/ardour/io.h +++ b/libs/ardour/ardour/io.h @@ -68,7 +68,7 @@ class UserBundle; * An IO can contain ports of varying types, making routes/inserts/etc with * varied combinations of types (eg MIDI and audio) possible. */ -class LIBARDOUR_API IO : public SessionObject, public Latent +class LIBARDOUR_API IO : public SessionObject { public: static const std::string state_node_name; @@ -119,8 +119,6 @@ public: bool connected () const; bool physically_connected () const; - samplecnt_t signal_latency () const { return 0; } - samplecnt_t latency () const; samplecnt_t public_latency () const; samplecnt_t connected_latency (bool for_playback) const; diff --git a/libs/ardour/ardour/route.h b/libs/ardour/ardour/route.h index 72011a68d6..e11ddf8eca 100644 --- a/libs/ardour/ardour/route.h +++ b/libs/ardour/ardour/route.h @@ -353,7 +353,6 @@ public: samplecnt_t set_private_port_latencies (bool playback) const; void set_public_port_latencies (samplecnt_t, bool playback) const; - void set_user_latency (samplecnt_t); samplecnt_t signal_latency() const { return _signal_latency; } samplecnt_t playback_latency (bool incl_downstream = false) const; diff --git a/libs/ardour/io.cc b/libs/ardour/io.cc index 1cf8b4d401..f185e073b0 100644 --- a/libs/ardour/io.cc +++ b/libs/ardour/io.cc @@ -563,8 +563,6 @@ IO::state () node->add_child_nocopy (*pnode); } - Latent::add_state (node); - return *node; } @@ -639,8 +637,6 @@ IO::set_state (const XMLNode& node, int version) ConnectingLegal.connect_same_thread (connection_legal_c, boost::bind (&IO::connecting_became_legal, this)); } - Latent::set_state (node, version); - return 0; } diff --git a/libs/ardour/route.cc b/libs/ardour/route.cc index 84bd5706d7..f897884384 100644 --- a/libs/ardour/route.cc +++ b/libs/ardour/route.cc @@ -1164,8 +1164,6 @@ Route::add_processors (const ProcessorList& others, boost::shared_ptr<Processor> } } } - - _output->unset_user_latency (); } reset_instrument_info (); @@ -1488,8 +1486,6 @@ Route::remove_processor (boost::shared_ptr<Processor> processor, ProcessorStream } else { ++i; } - - _output->unset_user_latency (); } if (!removed) { @@ -1617,7 +1613,6 @@ Route::replace_processor (boost::shared_ptr<Processor> old, boost::shared_ptr<Pr } sub->ActiveChanged.connect_same_thread (*this, boost::bind (&Session::update_latency_compensation, &_session, false)); - _output->unset_user_latency (); } reset_instrument_info (); @@ -1689,8 +1684,6 @@ Route::remove_processors (const ProcessorList& to_be_deleted, ProcessorStreams* return 0; } - _output->unset_user_latency (); - if (configure_processors_unlocked (err, &lm)) { pstate.restore (); /* we know this will work, because it worked before :) */ @@ -4113,7 +4106,7 @@ Route::update_signal_latency (bool apply_to_delayline) Glib::Threads::RWLock::ReaderLock lm (_processor_lock); samplecnt_t l_in = 0; - samplecnt_t l_out = _output->effective_latency (); + samplecnt_t l_out = 0; for (ProcessorList::reverse_iterator i = _processors.rbegin(); i != _processors.rend(); ++i) { if (boost::shared_ptr<LatentSend> snd = boost::dynamic_pointer_cast<LatentSend> (*i)) { snd->set_delay_in (l_out + _output->latency()); @@ -4182,13 +4175,6 @@ Route::update_signal_latency (bool apply_to_delayline) } void -Route::set_user_latency (samplecnt_t nframes) -{ - _output->set_user_latency (nframes); - _session.update_latency_compensation (); -} - -void Route::apply_latency_compensation () { if (_delayline) { |