tweak Stateful/StatefulDiffCommand changes so that SessionObject's actually get a...

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

diff --git a/libs/ardour/ardour/delivery.h b/libs/ardour/ardour/delivery.h
index add222a0f175fd87fe9821f6cc91fea7de257beb..a7ccd96a2db96e39efcfa65ddb070c81e475ab5c 100644 (file)
--- a/libs/ardour/ardour/delivery.h
+++ b/libs/ardour/ardour/delivery.h
@@ -20,6 +20,7 @@
 #define __ardour_delivery_h__
 
 #include <string>
+
 #include "ardour/types.h"
 #include "ardour/chan_count.h"
 #include "ardour/io_processor.h"
@@ -31,7 +32,8 @@ class IO;
 class MuteMaster;
 class Panner;
 
-class Delivery : public IOProcessor {
+class Delivery : public IOProcessor
+{
 public:
        enum Role {
                /* main outputs - delivers out-of-place to port buffers, and cannot be removed */
@@ -65,7 +67,7 @@ public:
        bool can_support_io_configuration (const ChanCount& in, ChanCount& out) const;
        bool configure_io (ChanCount in, ChanCount out);
 
-       void run (BufferSet& bufs, sframes_t start_frame, sframes_t end_frame, nframes_t nframes);
+       void run (BufferSet& bufs, sframes_t start_frame, sframes_t end_frame, nframes_t nframes, bool);
 
        /* supplemental method used with MIDI */
 
@@ -83,9 +85,9 @@ public:
 
        BufferSet& output_buffers() { return *_output_buffers; }
 
-       sigc::signal<void> MuteChange;
+       PBD::Signal0<void> MuteChange;
 
-       static sigc::signal<void,nframes_t> CycleStart;
+       static PBD::Signal1<void,nframes_t> CycleStart;
 
        XMLNode& state (bool full);
        int set_state (const XMLNode&, int version);
@@ -118,10 +120,10 @@ public:
        boost::shared_ptr<Panner> _panner;
 
        static bool panners_legal;
-       static sigc::signal<int>            PannersLegal;
+       static PBD::Signal0<int>            PannersLegal;
 
        int panners_became_legal ();
-       sigc::connection panner_legal_c;
+       PBD::ScopedConnection panner_legal_c;
        void output_changed (IOChange, void*);
 
        gain_t target_gain ();