introduce the notion that note additions and property changes can cause the removal...

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

diff --git a/libs/ardour/ardour/delivery.h b/libs/ardour/ardour/delivery.h
index 7a5931c5fb68551b4392a49ea1e3b6cf18074c6d..bb07b9ab2554b5e1ddcddb51070a2336b1631db9 100644 (file)
--- a/libs/ardour/ardour/delivery.h
+++ b/libs/ardour/ardour/delivery.h
@@ -53,12 +53,11 @@ public:
        /* Delivery to an existing output */
 
        Delivery (Session& s, boost::shared_ptr<IO> io, boost::shared_ptr<MuteMaster> mm, const std::string& name, Role);
-       Delivery (Session& s, boost::shared_ptr<IO> io, boost::shared_ptr<MuteMaster> mm, const XMLNode&);
 
        /* Delivery to a new output owned by this object */
 
        Delivery (Session& s, boost::shared_ptr<MuteMaster> mm, const std::string& name, Role);
-       Delivery (Session&, boost::shared_ptr<MuteMaster> mm, const XMLNode&);
+       ~Delivery ();
 
        bool set_name (const std::string& name);
        std::string display_name() const;
@@ -76,18 +75,15 @@ public:
 
        void no_outs_cuz_we_no_monitor(bool);
 
-       void set_solo_level (int32_t sl) { _solo_level = sl; }
-       void set_solo_isolated (bool yn) { _solo_isolated = yn; }
-
        void cycle_start (nframes_t);
        void increment_output_offset (nframes_t);
        void transport_stopped (sframes_t frame);
 
        BufferSet& output_buffers() { return *_output_buffers; }
 
-       boost::signals2::signal<void()> MuteChange;
+       PBD::Signal0<void> MuteChange;
 
-       static boost::signals2::signal<void(nframes_t)> CycleStart;
+       static PBD::Signal1<void,nframes_t> CycleStart;
 
        XMLNode& state (bool full);
        int set_state (const XMLNode&, int version);
@@ -113,17 +109,15 @@ public:
        gain_t      _current_gain;
        nframes_t   _output_offset;
        bool        _no_outs_cuz_we_no_monitor;
-       uint32_t    _solo_level;
-       bool        _solo_isolated;
        boost::shared_ptr<MuteMaster> _mute_master;
        bool         no_panner_reset;
        boost::shared_ptr<Panner> _panner;
 
        static bool panners_legal;
-       static boost::signals2::signal<int()>            PannersLegal;
+       static PBD::Signal0<int>            PannersLegal;
 
        int panners_became_legal ();
-       boost::signals2::scoped_connection panner_legal_c;
+       PBD::ScopedConnection panner_legal_c;
        void output_changed (IOChange, void*);
 
        gain_t target_gain ();