don't add a [shared] panner for the sends to monitoing section

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

diff --git a/libs/ardour/ardour/audio_diskstream.h b/libs/ardour/ardour/audio_diskstream.h
index 982d08e028f57a1d38f90dcc41f53717ab306d97..3a5dc2ad91a4af0d04489924a3b268192694e555 100644 (file)
--- a/libs/ardour/ardour/audio_diskstream.h
+++ b/libs/ardour/ardour/audio_diskstream.h
@@ -114,7 +114,7 @@ class AudioDiskstream : public Diskstream
        XMLNode& get_state(void);
        int      set_state(const XMLNode& node, int version);
 
-       void monitor_input (bool);
+       void request_input_monitoring (bool);
 
        static void swap_by_ptr (Sample *first, Sample *last) {
                while (first < last) {
@@ -146,20 +146,19 @@ class AudioDiskstream : public Diskstream
 
   protected:
        friend class Auditioner;
-       int  seek (framepos_t which_sample, bool complete_refill = false);
-
-  protected:
        friend class AudioTrack;
+       int  seek (framepos_t which_sample, bool complete_refill = false);
 
-       int  process (framepos_t transport_frame, pframes_t nframes, bool& need_butler);
-       bool commit  (framecnt_t nframes);
+        int  process (BufferSet&, framepos_t transport_frame, pframes_t nframes, framecnt_t &, bool need_disk_signal);
+        frameoffset_t calculate_playback_distance (pframes_t nframes);
+       bool commit  (framecnt_t);
 
   private:
        struct ChannelSource {
                std::string name;
 
                bool is_physical () const;
-               void ensure_monitor_input (bool) const;
+               void request_input_monitoring (bool) const;
        };
 
        /** Information about one of our channels */
@@ -206,8 +205,6 @@ class AudioDiskstream : public Diskstream
 
        typedef std::vector<ChannelInfo*> ChannelList;
 
-       void process_varispeed_playback (pframes_t nframes, boost::shared_ptr<ChannelList> c);
-
        /* The two central butler operations */
        int do_flush (RunContext context, bool force = false);
        int do_refill () { return _do_refill(_mixdown_buffer, _gain_buffer); }
@@ -244,9 +241,9 @@ class AudioDiskstream : public Diskstream
        void adjust_playback_buffering ();
        void adjust_capture_buffering ();
 
-       void engage_record_enable ();
-       void disengage_record_enable ();
-
+        bool prep_record_enable ();
+       bool prep_record_disable ();
+    
        // Working buffers for do_refill (butler thread)
        static void allocate_working_buffers();
        static void free_working_buffers();