diff options
Diffstat (limited to 'libs/ardour/ardour')
| -rw-r--r-- | libs/ardour/ardour/port_insert.h | 9 | ||||
| -rw-r--r-- | libs/ardour/ardour/return.h | 4 | ||||
| -rw-r--r-- | libs/ardour/ardour/send.h | 5 |
3 files changed, 13 insertions, 5 deletions
diff --git a/libs/ardour/ardour/port_insert.h b/libs/ardour/ardour/port_insert.h index 2ff9031afa..f42294b2b4 100644 --- a/libs/ardour/ardour/port_insert.h +++ b/libs/ardour/ardour/port_insert.h @@ -45,6 +45,8 @@ class PortInsert : public IOProcessor { public: PortInsert (Session&, boost::shared_ptr<Pannable>, boost::shared_ptr<MuteMaster> mm); + PortInsert (Session&, const std::string&, uint32_t bitslot, + boost::shared_ptr<Pannable>, boost::shared_ptr<MuteMaster> mm); ~PortInsert (); XMLNode& state(bool full); @@ -63,7 +65,7 @@ class PortInsert : public IOProcessor void activate (); void deactivate (); - uint32_t bit_slot() const { return bitslot; } + uint32_t bit_slot() const { return _bitslot; } void start_latency_detection (); void stop_latency_detection (); @@ -72,13 +74,16 @@ class PortInsert : public IOProcessor void set_measured_latency (framecnt_t); framecnt_t latency () const; + static void make_unique (XMLNode &); + static std::string name_and_id_new_insert (Session&, uint32_t&); + private: /* disallow copy construction */ PortInsert (const PortInsert&); boost::shared_ptr<Delivery> _out; - uint32_t bitslot; + uint32_t _bitslot; MTDM* _mtdm; bool _latency_detect; framecnt_t _latency_flush_frames; diff --git a/libs/ardour/ardour/return.h b/libs/ardour/ardour/return.h index 153e50f482..f41360b73b 100644 --- a/libs/ardour/ardour/return.h +++ b/libs/ardour/ardour/return.h @@ -37,6 +37,7 @@ class Return : public IOProcessor { public: Return (Session&, bool internal = false); + Return (Session&, const std::string& name, uint32_t bslot, bool internal = false); virtual ~Return (); uint32_t bit_slot() const { return _bitslot; } @@ -59,7 +60,8 @@ public: bool configure_io (ChanCount in, ChanCount out); static uint32_t how_many_returns(); - static void make_unique (XMLNode &, Session &); + static void make_unique (XMLNode &); + static std::string name_and_id_new_return (Session&, uint32_t&); protected: bool _metering; diff --git a/libs/ardour/ardour/send.h b/libs/ardour/ardour/send.h index c83eff65ab..dce8fd31d5 100644 --- a/libs/ardour/ardour/send.h +++ b/libs/ardour/ardour/send.h @@ -36,6 +36,7 @@ class Send : public Delivery { public: Send (Session&, boost::shared_ptr<Pannable> pannable, boost::shared_ptr<MuteMaster>, Delivery::Role r = Delivery::Send); + Send (Session&, const std::string& name, uint32_t bitslot, boost::shared_ptr<Pannable> pannable, boost::shared_ptr<MuteMaster>, Delivery::Role r = Delivery::Send); virtual ~Send (); uint32_t bit_slot() const { return _bitslot; } @@ -67,7 +68,8 @@ class Send : public Delivery std::string value_as_string (boost::shared_ptr<AutomationControl>) const; static uint32_t how_many_sends(); - static void make_unique (XMLNode &, Session &); + static void make_unique (XMLNode &); + static std::string name_and_id_new_send (Session&, Delivery::Role r, uint32_t&); protected: bool _metering; @@ -81,7 +83,6 @@ class Send : public Delivery int set_state_2X (XMLNode const &, int); uint32_t _bitslot; - static std::string name_and_id_new_send (Session&, Delivery::Role r, uint32_t&); }; } // namespace ARDOUR |