X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Fdelivery.h;h=743854027deddb4f77db0c910c179ca16d9d6d13;hb=da9b82732eed632d8b940818382f7eb369100964;hp=b2bd283ef8cb132e17136af0fd8c53220c313271;hpb=650c6d5824222a8879df5c5ba9645c264ed3b84f;p=ardour.git

diff --git a/libs/ardour/ardour/delivery.h b/libs/ardour/ardour/delivery.h
index b2bd283ef8..743854027d 100644
--- a/libs/ardour/ardour/delivery.h
+++ b/libs/ardour/ardour/delivery.h
@@ -30,7 +30,9 @@ namespace ARDOUR {
 class BufferSet;
 class IO;
 class MuteMaster;
+class PannerShell;
 class Panner;
+class Pannable;
 
 class Delivery : public IOProcessor
 {
@@ -52,13 +54,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 (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);
@@ -68,27 +68,21 @@ 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, bool);
+	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; }
 
 	PBD::Signal0<void> MuteChange;
 
-	static PBD::Signal1<void,nframes_t> CycleStart;
+	static PBD::Signal1<void, pframes_t> CycleStart;
 
 	XMLNode& state (bool full);
 	int set_state (const XMLNode&, int version);
@@ -98,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 PBD::Signal0<int>            PannersLegal;
+	static PBD::Signal0<int> PannersLegal;
 
 	int panners_became_legal ();
 	PBD::ScopedConnection panner_legal_c;
 	void output_changed (IOChange, void*);
 
-	gain_t target_gain ();
+	bool _no_panner_reset;
 };