diff options
author | Carl Hetherington <carl@carlh.net> | 2011-12-08 14:14:21 +0000 |
---|---|---|
committer | Carl Hetherington <carl@carlh.net> | 2011-12-08 14:14:21 +0000 |
commit | 26366a40629693b387331c81ed255116fa8f7f7c (patch) | |
tree | b3ae41bd4270fcc23e8167a3a8c029bf67368082 /libs | |
parent | 32c1c8a1c76d68dfb2edb08742a308d24766b96e (diff) |
Remove unused buffers and associated support code from
InternalReturn.
git-svn-id: svn://localhost/ardour2/branches/3.0@10942 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs')
-rw-r--r-- | libs/ardour/ardour/internal_return.h | 13 | ||||
-rw-r--r-- | libs/ardour/audioengine.cc | 1 | ||||
-rw-r--r-- | libs/ardour/internal_return.cc | 43 |
3 files changed, 2 insertions, 55 deletions
diff --git a/libs/ardour/ardour/internal_return.h b/libs/ardour/ardour/internal_return.h index b6a3e26253..56fa3cf3ba 100644 --- a/libs/ardour/ardour/internal_return.h +++ b/libs/ardour/ardour/internal_return.h @@ -34,27 +34,18 @@ class InternalReturn : public Return public: InternalReturn (Session&); - XMLNode& state(bool full); - XMLNode& get_state(void); - int set_state(const XMLNode&, int version); + XMLNode& state (bool full); + XMLNode& get_state (); void run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame, pframes_t nframes, bool); - bool configure_io (ChanCount in, ChanCount out); bool can_support_io_configuration (const ChanCount& in, ChanCount& out) const; - int set_block_size (pframes_t); void add_send (InternalSend *); void remove_send (InternalSend *); - static PBD::Signal1<void, pframes_t> CycleStart; - private: - BufferSet buffers; /** sends that we are receiving data from */ std::list<InternalSend*> _sends; - - void allocate_buffers (pframes_t); - void cycle_start (pframes_t); }; } // namespace ARDOUR diff --git a/libs/ardour/audioengine.cc b/libs/ardour/audioengine.cc index f105963cb5..74936fbc34 100644 --- a/libs/ardour/audioengine.cc +++ b/libs/ardour/audioengine.cc @@ -492,7 +492,6 @@ AudioEngine::process_callback (pframes_t nframes) Delivery::CycleStart (nframes); Port::set_global_port_buffer_offset (0); Port::set_cycle_framecnt (nframes); - InternalReturn::CycleStart (nframes); /* tell all Ports that we're starting a new cycle */ diff --git a/libs/ardour/internal_return.cc b/libs/ardour/internal_return.cc index ef38d806ff..568604272b 100644 --- a/libs/ardour/internal_return.cc +++ b/libs/ardour/internal_return.cc @@ -30,12 +30,9 @@ using namespace std; using namespace ARDOUR; -PBD::Signal1<void, pframes_t> InternalReturn::CycleStart; - InternalReturn::InternalReturn (Session& s) : Return (s, true) { - CycleStart.connect_same_thread (*this, boost::bind (&InternalReturn::cycle_start, this, _1)); _display_to_user = false; } @@ -57,28 +54,6 @@ InternalReturn::run (BufferSet& bufs, framepos_t /*start_frame*/, framepos_t /*e _active = _pending_active; } -bool -InternalReturn::configure_io (ChanCount in, ChanCount out) -{ - IOProcessor::configure_io (in, out); - allocate_buffers (_session.engine().frames_per_cycle()); - return true; -} - -int -InternalReturn::set_block_size (pframes_t nframes) -{ - allocate_buffers (nframes); - return 0; -} - -void -InternalReturn::allocate_buffers (pframes_t nframes) -{ - buffers.ensure_buffers (_configured_input, nframes); - buffers.set_count (_configured_input); -} - void InternalReturn::add_send (InternalSend* send) { @@ -93,16 +68,6 @@ InternalReturn::remove_send (InternalSend* send) _sends.remove (send); } -void -InternalReturn::cycle_start (pframes_t nframes) -{ - /* called from process cycle - no lock necessary */ - if (!_sends.empty ()) { - /* don't bother with this if nobody is going to feed us anything */ - buffers.silence (nframes, 0); - } -} - XMLNode& InternalReturn::state (bool full) { @@ -118,17 +83,9 @@ InternalReturn::get_state() return state (true); } -int -InternalReturn::set_state (const XMLNode& node, int version) -{ - return Return::set_state (node, version); -} - bool InternalReturn::can_support_io_configuration (const ChanCount& in, ChanCount& out) const { out = in; return true; } - - |