laying the groundwork for adding/removing transport masters

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

diff --git a/libs/ardour/ardour/delivery.h b/libs/ardour/ardour/delivery.h
index 80b8431737bdfd2046e2cf94f6d6b63ad5d418a0..451d7bdd0ceb8635007020c2b3e62d0240b6706f 100644 (file)
--- a/libs/ardour/ardour/delivery.h
+++ b/libs/ardour/ardour/delivery.h
@@ -71,20 +71,19 @@ public:
        bool can_support_io_configuration (const ChanCount& in, ChanCount& out);
        bool configure_io (ChanCount in, ChanCount out);
 
-       void run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame, double speed, pframes_t nframes, bool);
+       void run (BufferSet& bufs, samplepos_t start_sample, samplepos_t end_sample, double speed, pframes_t nframes, bool);
 
        /* supplemental method used with MIDI */
 
-       void flush_buffers (framecnt_t nframes);
+       void flush_buffers (samplecnt_t nframes);
        void no_outs_cuz_we_no_monitor(bool);
-       void transport_stopped (framepos_t frame);
+       void non_realtime_transport_stop (samplepos_t now, bool flush);
        void realtime_locate ();
 
        BufferSet& output_buffers() { return *_output_buffers; }
 
        PBD::Signal0<void> MuteChange;
 
-       XMLNode& state (bool full);
        int set_state (const XMLNode&, int version);
 
        /* Panning */
@@ -103,7 +102,9 @@ public:
        uint32_t pans_required() const { return _configured_input.n_audio(); }
        virtual uint32_t pan_outs() const;
 
-  protected:
+protected:
+       XMLNode& state ();
+
        Role        _role;
        BufferSet*  _output_buffers;
        gain_t      _current_gain;
@@ -111,7 +112,7 @@ public:
 
        gain_t target_gain ();
 
-  private:
+private:
        bool        _no_outs_cuz_we_no_monitor;
        boost::shared_ptr<MuteMaster> _mute_master;