fully implement and deploy explicit x-thread signal connection syntax (testing comes...

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

diff --git a/libs/ardour/ardour/processor.h b/libs/ardour/ardour/processor.h
index 248f485c4f9c99afb413093ebf31e69dbbeabc38..2dd78c66f495d76d652550aa8326ba463ce79c51 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,9 +24,8 @@
 #include <string>
 #include <exception>
 
-#include "pbd/statefuldestructible.h" 
+#include "pbd/statefuldestructible.h"
 
-#include <sigc++/signal.h>
 
 #include "ardour/ardour.h"
 #include "ardour/automatable_controls.h"
@@ -53,27 +52,32 @@ class Processor : public SessionObject, public AutomatableControls, public Laten
        Processor(Session&, const XMLNode& node);
 
        virtual ~Processor() { }
-       
-       virtual bool visible() const { return true; }
-       virtual void set_visible (bool) {}
 
-       bool active () const { return _active; }
+       virtual std::string display_name() const { return SessionObject::name(); }
+
+       virtual bool display_to_user() const { return _display_to_user; }
+       virtual void set_display_to_user (bool);
+
+       bool active () const { return _pending_active; }
 
        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*/) {}
+
+       /** @param result_required true if, on return from this method, bufs is required to contain valid data;
+        *  if false, the method need not bother writing to bufs if it doesn't want to.
+        */  
+       virtual void run (BufferSet& /*bufs*/, sframes_t /*start_frame*/, sframes_t /*end_frame*/, nframes_t /*nframes*/, bool /*result_required*/) {}
+       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 */
@@ -89,15 +93,15 @@ 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; }
 
-       static sigc::signal<void,Processor*> ProcessorCreated;
+       static PBD::Signal1<void,Processor*> ProcessorCreated;
 
-       sigc::signal<void>                     ActiveChanged;
-       sigc::signal<void,ChanCount,ChanCount> ConfigurationChanged;
+       PBD::Signal0<void>                     ActiveChanged;
+       PBD::Signal2<void,ChanCount,ChanCount> ConfigurationChanged;
 
 protected:
        int       _pending_active;
@@ -107,6 +111,10 @@ protected:
        ChanCount _configured_input;
        ChanCount _configured_output;
        void*     _gui;  /* generic, we don't know or care what this is */
+       bool        _display_to_user;
+
+private:
+       int set_state_2X (const XMLNode&, int version);
 };
 
 } // namespace ARDOUR