Fix uninitialised variable and remove bind of shared_ptr to a slot.

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

diff --git a/libs/ardour/ardour/return.h b/libs/ardour/ardour/return.h
index 2b6cd0b69eaea82781723faa4bc3aa1cfa0dee29..b3212fe4a05c56f397ccc70a852593a1d767ac5c 100644 (file)
--- a/libs/ardour/ardour/return.h
+++ b/libs/ardour/ardour/return.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2009 Paul Davis 
+    Copyright (C) 2009 Paul Davis
     Author: Dave Robillard
 
     This program is free software; you can redistribute it and/or modify
@@ -25,44 +25,58 @@
 #include <string>
 
 
-#include "pbd/stateful.h" 
+#include "pbd/stateful.h"
 #include "ardour/ardour.h"
 #include "ardour/audioengine.h"
 #include "ardour/io_processor.h"
 
 namespace ARDOUR {
 
-class Return : public IOProcessor 
+class Amp;
+class PeakMeter;
+
+class Return : public IOProcessor
 {
-public:        
-       Return (Session&);
-       Return (Session&, const XMLNode&);
+public:
+       Return (Session&, bool internal = false);
+       Return (Session&, const XMLNode&, bool internal = false);
        virtual ~Return ();
-       
+
        uint32_t bit_slot() const { return _bitslot; }
 
-       void run_in_place (BufferSet& bufs, sframes_t start_frame, sframes_t end_frame, nframes_t nframes);
-       
-       void activate() {}
-       void deactivate () {}
+       void run (BufferSet& bufs, sframes_t start_frame, sframes_t end_frame, nframes_t nframes);
+
+       boost::shared_ptr<Amp> amp() const { return _amp; }
+       boost::shared_ptr<PeakMeter> meter() const { return _meter; }
+
+       bool metering() const { return _metering; }
+       void set_metering (bool yn) { _metering = yn; }
 
        XMLNode& state(bool full);
        XMLNode& get_state(void);
-       int      set_state(const XMLNode& node);
+       int      set_state(const XMLNode&, int version);
 
        uint32_t pans_required() const { return _configured_input.n_audio(); }
 
        bool can_support_io_configuration (const ChanCount& in, ChanCount& out) const;
        bool configure_io (ChanCount in, ChanCount out);
 
-       static uint32_t how_many_sends();
+       static uint32_t how_many_returns();
        static void make_unique (XMLNode &, Session &);
 
+  protected:
+       bool _metering;
+       boost::shared_ptr<Amp> _amp;
+       boost::shared_ptr<PeakMeter> _meter;
+
 private:
        /* disallow copy construction */
        Return (const Return&);
-       
+
        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);
 };
 
 } // namespace ARDOUR