start code reorganization needed to deal with backend choices. compiles, links and...

[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 afb6ecc9088c4b88d881501909e49681439eaab1..21efc5c20c7ac4421fe1fc6b2236888347b6f3a1 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) {
@@ -151,7 +151,7 @@ class AudioDiskstream : public Diskstream
   protected:
        friend class AudioTrack;
 
-       int  process (framepos_t transport_frame, pframes_t nframes, framecnt_t &);
+        int  process (BufferSet&, framepos_t transport_frame, pframes_t nframes, framecnt_t &, bool need_disk_signal);
        bool commit  (framecnt_t);
 
   private:
@@ -159,7 +159,7 @@ class AudioDiskstream : public Diskstream
                std::string name;
 
                bool is_physical () const;
-               void request_jack_monitors_input (bool) const;
+               void request_input_monitoring (bool) const;
        };
 
        /** Information about one of our channels */
@@ -242,9 +242,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();