Respond to MMC even when synced to JACK. Fixes #3700.

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

diff --git a/libs/ardour/ardour/delivery.h b/libs/ardour/ardour/delivery.h
index b2bd283ef8cb132e17136af0fd8c53220c313271..e1aa389df7dac724a2135c5a18495f502d47715a 100644 (file)
--- a/libs/ardour/ardour/delivery.h
+++ b/libs/ardour/ardour/delivery.h
@@ -53,12 +53,10 @@ 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);
@@ -68,27 +66,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);
+       void cycle_start (pframes_t);
+       void increment_output_offset (framecnt_t);
+       void transport_stopped (framepos_t frame);
 
        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);
@@ -105,17 +97,15 @@ public:
        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);
+       void start_pan_touch (uint32_t which, double when);
+       void end_pan_touch (uint32_t which, bool mark, double when);
 
   protected:
        Role        _role;
        BufferSet*  _output_buffers;
        gain_t      _current_gain;
-       nframes_t   _output_offset;
+       framecnt_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;