summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2019-02-22 14:52:08 -0700
committerPaul Davis <paul@linuxaudiosystems.com>2019-02-22 14:54:34 -0700
commit63fdfd9e8557f898e32612449c3ba77d79fde45c (patch)
tree8a824ca098d2ee5f59012a7ed5e52345d0e007ac
parent11ef82954efa74dd281f950bd6f7a677296419ad (diff)
remove PostTransportWorkCurveReallocate (no longer used)
-rw-r--r--libs/ardour/ardour/route.h1
-rw-r--r--libs/ardour/ardour/session.h4
-rw-r--r--libs/ardour/enums.cc1
-rw-r--r--libs/ardour/route.cc7
-rw-r--r--libs/ardour/session_butler.cc7
-rw-r--r--libs/ardour/session_transport.cc6
6 files changed, 1 insertions, 25 deletions
diff --git a/libs/ardour/ardour/route.h b/libs/ardour/ardour/route.h
index 576578b961..7a9786bb3a 100644
--- a/libs/ardour/ardour/route.h
+++ b/libs/ardour/ardour/route.h
@@ -601,7 +601,6 @@ protected:
void catch_up_on_solo_mute_override ();
void set_listen (bool);
- void curve_reallocate ();
virtual void set_block_size (pframes_t nframes);
virtual int no_roll_unlocked (pframes_t nframes, samplepos_t start_sample, samplepos_t end_sample, bool session_state_changing);
diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h
index d9749f22fe..07e8f043e2 100644
--- a/libs/ardour/ardour/session.h
+++ b/libs/ardour/ardour/session.h
@@ -1109,7 +1109,7 @@ public:
PostTransportAudition = 0x80,
PostTransportReverse = 0x100,
/* PostTransportInputChange = 0x200, */
- PostTransportCurveRealloc = 0x400,
+ /*PostTransportCurveRealloc = 0x400, */
PostTransportClearSubstate = 0x800,
PostTransportAdjustPlaybackBuffering = 0x1000,
PostTransportAdjustCaptureBuffering = 0x2000
@@ -1214,7 +1214,6 @@ protected:
#endif
friend class Route;
- void schedule_curve_reallocation ();
void update_latency_compensation (bool force = false);
private:
@@ -1414,7 +1413,6 @@ private:
static const PostTransportWork ProcessCannotProceedMask =
PostTransportWork (
PostTransportReverse|
- PostTransportCurveRealloc|
PostTransportAudition|
PostTransportStop|
PostTransportClearSubstate);
diff --git a/libs/ardour/enums.cc b/libs/ardour/enums.cc
index 8ae2134ce2..d0afc9a07b 100644
--- a/libs/ardour/enums.cc
+++ b/libs/ardour/enums.cc
@@ -461,7 +461,6 @@ setup_enum_writer ()
REGISTER_CLASS_ENUM (Session, PostTransportOverWrite);
REGISTER_CLASS_ENUM (Session, PostTransportAudition);
REGISTER_CLASS_ENUM (Session, PostTransportReverse);
- REGISTER_CLASS_ENUM (Session, PostTransportCurveRealloc);
REGISTER_CLASS_ENUM (Session, PostTransportClearSubstate);
REGISTER_BITS (_Session_PostTransportWork);
diff --git a/libs/ardour/route.cc b/libs/ardour/route.cc
index b48b3b5a2b..e4e790b089 100644
--- a/libs/ardour/route.cc
+++ b/libs/ardour/route.cc
@@ -3071,13 +3071,6 @@ Route::set_processor_state (XMLNode const & node, XMLProperty const* prop, Proce
}
void
-Route::curve_reallocate ()
-{
-// _gain_automation_curve.finish_resize ();
-// _pan_automation_curve.finish_resize ();
-}
-
-void
Route::silence (samplecnt_t nframes)
{
Glib::Threads::RWLock::ReaderLock lm (_processor_lock, Glib::Threads::TRY_LOCK);
diff --git a/libs/ardour/session_butler.cc b/libs/ardour/session_butler.cc
index a520f430f2..854e542c12 100644
--- a/libs/ardour/session_butler.cc
+++ b/libs/ardour/session_butler.cc
@@ -69,13 +69,6 @@ Session::schedule_capture_buffering_adjustment ()
}
void
-Session::schedule_curve_reallocation ()
-{
- add_post_transport_work (PostTransportCurveRealloc);
- _butler->schedule_transport_work ();
-}
-
-void
Session::request_overwrite_buffer (boost::shared_ptr<Route> r)
{
boost::shared_ptr<Track> t = boost::dynamic_pointer_cast<Track> (r);
diff --git a/libs/ardour/session_transport.cc b/libs/ardour/session_transport.cc
index ad24623776..fda5bc4e6d 100644
--- a/libs/ardour/session_transport.cc
+++ b/libs/ardour/session_transport.cc
@@ -503,12 +503,6 @@ Session::butler_transport_work ()
}
}
- if (ptw & PostTransportCurveRealloc) {
- for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
- (*i)->curve_reallocate();
- }
- }
-
if (ptw & PostTransportReverse) {
clear_clicks();