diff options
Diffstat (limited to 'libs/ardour/ardour')
-rw-r--r-- | libs/ardour/ardour/io_processor.h | 2 | ||||
-rw-r--r-- | libs/ardour/ardour/port_insert.h | 3 | ||||
-rw-r--r-- | libs/ardour/ardour/return.h | 3 | ||||
-rw-r--r-- | libs/ardour/ardour/send.h | 2 |
4 files changed, 3 insertions, 7 deletions
diff --git a/libs/ardour/ardour/io_processor.h b/libs/ardour/ardour/io_processor.h index 4f7d1467c8..4385b1c041 100644 --- a/libs/ardour/ardour/io_processor.h +++ b/libs/ardour/ardour/io_processor.h @@ -75,6 +75,8 @@ class IOProcessor : public Processor XMLNode& state (bool full_state); int set_state (const XMLNode&, int version); + static void prepare_for_reset (XMLNode& state, const std::string& name); + protected: boost::shared_ptr<IO> _input; boost::shared_ptr<IO> _output; diff --git a/libs/ardour/ardour/port_insert.h b/libs/ardour/ardour/port_insert.h index f42294b2b4..657c2c0de6 100644 --- a/libs/ardour/ardour/port_insert.h +++ b/libs/ardour/ardour/port_insert.h @@ -45,8 +45,6 @@ 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); @@ -74,7 +72,6 @@ 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: diff --git a/libs/ardour/ardour/return.h b/libs/ardour/ardour/return.h index f41360b73b..55ca2d84f6 100644 --- a/libs/ardour/ardour/return.h +++ b/libs/ardour/ardour/return.h @@ -33,11 +33,11 @@ namespace ARDOUR { class Amp; class PeakMeter; + 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; } @@ -60,7 +60,6 @@ public: bool configure_io (ChanCount in, ChanCount out); static uint32_t how_many_returns(); - static void make_unique (XMLNode &); static std::string name_and_id_new_return (Session&, uint32_t&); protected: diff --git a/libs/ardour/ardour/send.h b/libs/ardour/ardour/send.h index dce8fd31d5..fa023a3b68 100644 --- a/libs/ardour/ardour/send.h +++ b/libs/ardour/ardour/send.h @@ -36,7 +36,6 @@ 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; } @@ -68,7 +67,6 @@ 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 &); static std::string name_and_id_new_send (Session&, Delivery::Role r, uint32_t&); protected: |