Make a few things private in Delivery; couple of minor

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

diff --git a/libs/ardour/ardour/delivery.h b/libs/ardour/ardour/delivery.h
index beccab73ae939ee724e63ff40666267839499cfe..743854027deddb4f77db0c910c179ca16d9d6d13 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"
@@ -29,9 +30,12 @@ namespace ARDOUR {
 class BufferSet;
 class IO;
 class MuteMaster;
+class PannerShell;
 class Panner;
+class Pannable;
 
-class Delivery : public IOProcessor {
+class Delivery : public IOProcessor
+{
 public:
        enum Role {
                /* main outputs - delivers out-of-place to port buffers, and cannot be removed */
@@ -50,43 +54,35 @@ 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 (Session& s, boost::shared_ptr<IO> io, boost::shared_ptr<Pannable>, boost::shared_ptr<MuteMaster> mm, const std::string& name, Role);
 
        /* 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 (Session& s, boost::shared_ptr<Pannable>, boost::shared_ptr<MuteMaster> mm, const std::string& name, Role);
+       ~Delivery ();
 
        bool set_name (const std::string& name);
        std::string display_name() const;
 
-       bool visible() const;
        Role role() const { return _role; }
        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, framepos_t start_frame, framepos_t end_frame, pframes_t nframes, bool);
 
        /* supplemental method used with MIDI */
 
-       void flush (nframes_t nframes, nframes64_t time);
-       void transport_stopped ();
-
+       void flush_buffers (framecnt_t nframes, framepos_t time);
        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);
+       virtual void cycle_start (pframes_t);
+       void transport_stopped (framepos_t frame);
+       void realtime_locate ();
 
        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, pframes_t> CycleStart;
 
        XMLNode& state (bool full);
        int set_state (const XMLNode&, int version);
@@ -96,36 +92,37 @@ public:
        static int  disable_panners (void);
        static int  reset_panners (void);
 
-       boost::shared_ptr<Panner> panner() const { return _panner; }
+       boost::shared_ptr<PannerShell> panner_shell() const { return _panshell; }
+       boost::shared_ptr<Panner> panner() const;
 
+       void unpan ();
        void reset_panner ();
        void defer_pan_reset ();
        void allow_pan_reset ();
 
        uint32_t pans_required() const { return _configured_input.n_audio(); }
-       void start_pan_touch (uint32_t which);
-       void end_pan_touch (uint32_t which);
+       virtual uint32_t pan_outs() const;
 
   protected:
        Role        _role;
        BufferSet*  _output_buffers;
        gain_t      _current_gain;
-       nframes_t   _output_offset;
+       boost::shared_ptr<PannerShell> _panshell;
+
+       gain_t target_gain ();
+
+  private:
        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 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 ();
+       bool _no_panner_reset;
 };