make 3.0 catch up with transport and other changes in 2.X (hand applied, not merged)

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

diff --git a/libs/ardour/ardour/processor.h b/libs/ardour/ardour/processor.h
index f91e9a686323c2708ccef7936ae007c6d2bb482d..473bb97130fe7332d3ccb86aa143d8f98748b125 100644 (file)
--- a/libs/ardour/ardour/processor.h
+++ b/libs/ardour/ardour/processor.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2000 Paul Davis 
+    Copyright (C) 2000 Paul Davis
 
     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
@@ -24,7 +24,7 @@
 #include <string>
 #include <exception>
 
-#include "pbd/statefuldestructible.h" 
+#include "pbd/statefuldestructible.h"
 
 #include <sigc++/signal.h>
 
@@ -53,36 +53,29 @@ class Processor : public SessionObject, public AutomatableControls, public Laten
        Processor(Session&, const XMLNode& node);
 
        virtual ~Processor() { }
-       
+
+       virtual std::string display_name() const { return SessionObject::name(); }
+
        virtual bool visible() const { return true; }
-       
-       bool active () const { return _active; }
+       virtual void set_visible (bool) {}
 
-       /* we keep loose tabs on the "placement" of a Processor. Ultimately,
-          they are all executed as a single list, but there are some
-          semantics that require knowing whether a Processor is before
-          or after the fader, or panner etc. See Route::reorder_processors()
-          to see where this gets set.
-       */
+       bool active () const { return _pending_active; }
 
-       Placement placement() const { return _placement; }
-       void set_placement (Placement p) { _placement = p; }
-       
        bool get_next_ab_is_active () const { return _next_ab_is_active; }
        void set_next_ab_is_active (bool yn) { _next_ab_is_active = yn; }
-       
+
        virtual nframes_t signal_latency() const { return 0; }
-       
-       virtual void transport_stopped (sframes_t frame) {}
-       
-       virtual void set_block_size (nframes_t nframes) {}
 
-       virtual void run (BufferSet& bufs, sframes_t start_frame, sframes_t end_frame, nframes_t nframes) {}
-       virtual void silence (nframes_t nframes) {}
-       
-       void activate ()   { _active = true; ActiveChanged(); }
-       void deactivate () { _active = false; ActiveChanged(); }
-       
+       virtual void transport_stopped (sframes_t /*frame*/) {}
+
+       virtual void set_block_size (nframes_t /*nframes*/) {}
+
+       virtual void run (BufferSet& /*bufs*/, sframes_t /*start_frame*/, sframes_t /*end_frame*/, nframes_t /*nframes*/) {}
+       virtual void silence (nframes_t /*nframes*/) {}
+
+       virtual void activate ()   { _pending_active = true; ActiveChanged(); }
+       virtual void deactivate () { _pending_active = false; ActiveChanged(); }
+
        virtual bool configure_io (ChanCount in, ChanCount out);
 
        /* Derived classes should override these, or processor appears as an in-place pass-through */
@@ -98,7 +91,7 @@ class Processor : public SessionObject, public AutomatableControls, public Laten
 
        virtual XMLNode& state (bool full);
        XMLNode& get_state (void);
-       int set_state (const XMLNode&);
+       int set_state (const XMLNode&, int version);
        
        void *get_gui () const { return _gui; }
        void  set_gui (void *p) { _gui = p; }
@@ -116,7 +109,9 @@ protected:
        ChanCount _configured_input;
        ChanCount _configured_output;
        void*     _gui;  /* generic, we don't know or care what this is */
-       Placement _placement;
+
+private:
+       int set_state_2X (const XMLNode&, int version);
 };
 
 } // namespace ARDOUR