Less weak plugin preset system (maybe AU preset stuff can use the 'normal' thing...

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

diff --git a/libs/ardour/ardour/route.h b/libs/ardour/ardour/route.h
index c7c0b77102f441b5d9c72369a621ff632ac932cb..cbf49108991b3ea7be3cb3abf4a48c3cd4a71fb4 100644 (file)
--- a/libs/ardour/ardour/route.h
+++ b/libs/ardour/ardour/route.h
@@ -27,6 +27,7 @@
 #include <string>
 
 #include <boost/shared_ptr.hpp>
+#include <boost/weak_ptr.hpp>
 
 #include <pbd/fastlog.h>
 #include <glibmm/thread.h>
@@ -38,13 +39,12 @@
 
 #include <ardour/ardour.h>
 #include <ardour/io.h>
-#include <ardour/session.h>
-#include <ardour/io_processor.h>
 #include <ardour/types.h>
 
 namespace ARDOUR {
 
 class Processor;
+class IOProcessor;
 class Send;
 class RouteGroup;
 
@@ -107,6 +107,8 @@ class Route : public IO
 
        /* end of vfunc-based API */
 
+       void shift (nframes64_t, nframes64_t);
+
        /* override IO::set_gain() to provide group control */
 
        void set_gain (gain_t val, void *src);
@@ -117,7 +119,7 @@ class Route : public IO
 
        void set_solo_safe (bool yn, void *src);
        bool solo_safe() const { return _solo_safe; }
-
+       
        void set_mute (bool yn, void *src);
        bool muted() const { return _muted; }
        bool solo_muted() const { return desired_solo_gain == 0.0; }
@@ -140,10 +142,10 @@ class Route : public IO
 
        void flush_processors ();
 
-       template<class T> void foreach_processor (T *obj, void (T::*func)(boost::shared_ptr<Processor>)) {
+       void foreach_processor (sigc::slot<void, boost::weak_ptr<Processor> > method) {
                Glib::RWLock::ReaderLock lm (_processor_lock);
                for (ProcessorList::iterator i = _processors.begin(); i != _processors.end(); ++i) {
-                       (obj->*func) (*i);
+                       method (boost::weak_ptr<Processor> (*i));
                }
        }
 
@@ -152,7 +154,7 @@ class Route : public IO
                ProcessorList::iterator i;
                for (i = _processors.begin(); i != _processors.end() && n; ++i, --n);
                if (i == _processors.end()) {
-                       return boost::shared_ptr<IOProcessor> ();
+                       return boost::shared_ptr<Processor> ();
                } else {
                        return *i;
                }
@@ -225,7 +227,7 @@ class Route : public IO
        IO* control_outs() { return _control_outs; }
 
        bool feeds (boost::shared_ptr<Route>);
-       set<boost::shared_ptr<Route> > fed_by;
+       std::set<boost::shared_ptr<Route> > fed_by;
 
        struct ToggleControllable : public PBD::Controllable {
            enum ToggleType {
@@ -256,12 +258,13 @@ class Route : public IO
        uint32_t remote_control_id () const;
        sigc::signal<void> RemoteControlIDChanged;
 
-       void sync_order_keys ();
-       static sigc::signal<void> SyncOrderKeys;
+       void sync_order_keys (const char* base);
+       static sigc::signal<void,const char*> SyncOrderKeys;
 
   protected:
        friend class Session;
 
+       void catch_up_on_solo_mute_override ();
        void set_solo_mute (bool yn);
        void set_block_size (nframes_t nframes);
        bool has_external_redirects() const;
@@ -359,8 +362,8 @@ class Route : public IO
        void input_change_handler (IOChange, void *src);
        void output_change_handler (IOChange, void *src);
 
-       int reset_plugin_counts (ProcessorStreams*); /* locked */
-       int _reset_plugin_counts (ProcessorStreams*); /* unlocked */
+       int reset_processor_counts (ProcessorStreams*); /* locked */
+       int _reset_processor_counts (ProcessorStreams*); /* unlocked */
 
        /* processor I/O channels and plugin count handling */
 
@@ -372,8 +375,8 @@ class Route : public IO
            ProcessorCount (boost::shared_ptr<ARDOUR::Processor> ins) : processor(ins) {}
        };
        
-       int32_t apply_some_plugin_counts (std::list<ProcessorCount>& iclist);
-       bool    check_some_plugin_counts (std::list<ProcessorCount>& iclist, ChanCount required_inputs, ProcessorStreams* err_streams);
+       int32_t apply_some_processor_counts (std::list<ProcessorCount>& iclist);
+       bool    check_some_processor_counts (std::list<ProcessorCount>& iclist, ChanCount required_inputs, ProcessorStreams* err_streams);
 
        void set_deferred_state ();
        void add_processor_from_xml (const XMLNode&);