redesign how XML state, bitslots and names get propagated during copying a send/port...

[ardour.git] / libs / ardour / ardour / return.h

diff --git a/libs/ardour/ardour/return.h b/libs/ardour/ardour/return.h
index f663c109a505f355bafc44d187c64bd05aedde57..f41360b73b96b730f9f69782677f27756a560570 100644 (file)
--- a/libs/ardour/ardour/return.h
+++ b/libs/ardour/ardour/return.h
@@ -1,6 +1,6 @@
 /*
     Copyright (C) 2009 Paul Davis
-    Author: Dave Robillard
+    Author: David Robillard
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -26,7 +26,6 @@
 
 #include "pbd/stateful.h"
 #include "ardour/ardour.h"
-#include "ardour/audioengine.h"
 #include "ardour/io_processor.h"
 
 namespace ARDOUR {
@@ -38,12 +37,12 @@ class Return : public IOProcessor
 {
 public:
        Return (Session&, bool internal = false);
-       Return (Session&, const XMLNode&, bool internal = false);
+       Return (Session&, const std::string& name, uint32_t bslot, bool internal = false);
        virtual ~Return ();
 
        uint32_t bit_slot() const { return _bitslot; }
 
-       void run (BufferSet& bufs, sframes_t start_frame, sframes_t end_frame, nframes_t nframes, bool);
+       void run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame, pframes_t nframes, bool);
 
        boost::shared_ptr<Amp> amp() const { return _amp; }
        boost::shared_ptr<PeakMeter> meter() const { return _meter; }
@@ -61,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;
@@ -72,10 +72,9 @@ private:
        /* disallow copy construction */
        Return (const Return&);
 
-       uint32_t  _bitslot;
+       uint32_t _bitslot;
 
-       void collect_input  (BufferSet& bufs, nframes_t nframes, ChanCount offset=ChanCount::ZERO);
-       void just_meter_input (sframes_t start_frame, sframes_t end_frame, nframes_t nframes);
+       void collect_input (BufferSet& bufs, pframes_t nframes, ChanCount offset = ChanCount::ZERO);
 };
 
 } // namespace ARDOUR