Fix my name :)

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

diff --git a/libs/ardour/ardour/return.h b/libs/ardour/ardour/return.h
index 3f75cc57b7335d2f5e46061491e9549a805e0b89..344e877ddf911213c5aafd0810565c8f5fc17c36 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
+    Copyright (C) 2009 Paul Davis
+    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
@@ -21,11 +21,10 @@
 #ifndef __ardour_return_h__
 #define __ardour_return_h__
 
-#include <sigc++/signal.h>
 #include <string>
 
 
-#include "pbd/stateful.h" 
+#include "pbd/stateful.h"
 #include "ardour/ardour.h"
 #include "ardour/audioengine.h"
 #include "ardour/io_processor.h"
@@ -35,26 +34,25 @@ namespace ARDOUR {
 class Amp;
 class PeakMeter;
 
-class Return : public IOProcessor 
+class Return : public IOProcessor
 {
-public:        
-       Return (Session&);
-       Return (Session&, const XMLNode&);
+public:
+       Return (Session&, 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);
-       
+       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; }
 
        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(); }
 
@@ -72,11 +70,11 @@ public:
 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);
+       uint32_t _bitslot;
+
+       void collect_input (BufferSet& bufs, pframes_t nframes, ChanCount offset = ChanCount::ZERO);
+       void just_meter_input (framepos_t start_frame, framepos_t end_frame, pframes_t nframes);
 };
 
 } // namespace ARDOUR