subtle changes to accomplish two goals (1) playhead should stop where the user presse...

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

diff --git a/libs/ardour/ardour/diskstream.h b/libs/ardour/ardour/diskstream.h
index 5d3693052dada42cd4c9888aa180df5f2a9eaa60..c960e925c81046ce651a6288f34b90a027bde117 100644 (file)
--- a/libs/ardour/ardour/diskstream.h
+++ b/libs/ardour/ardour/diskstream.h
@@ -34,6 +34,7 @@
 #include "ardour/ardour.h"
 #include "ardour/chan_count.h"
 #include "ardour/session_object.h"
+#include "ardour/libardour_visibility.h"
 #include "ardour/types.h"
 #include "ardour/utils.h"
 #include "ardour/public_diskstream.h"
@@ -49,11 +50,12 @@ class Source;
 class Session;
 class Track;
 class Location;
+class BufferSet;
 
 /** Parent class for classes which can stream data to and from disk.
  *  These are used by Tracks to get playback and put recorded data.
  */
-class Diskstream : public SessionObject, public PublicDiskstream
+class LIBARDOUR_API Diskstream : public SessionObject, public PublicDiskstream
 {
   public:
        enum Flag {
@@ -68,6 +70,17 @@ class Diskstream : public SessionObject, public PublicDiskstream
        virtual ~Diskstream();
 
        virtual bool set_name (const std::string& str);
+       virtual bool set_write_source_name (const std::string& str);
+
+       std::string write_source_name () const {
+               if (_write_source_name.empty()) {
+                       return name();
+               } else {
+                       return _write_source_name;
+               }
+       }
+
+       virtual std::string steal_write_source_name () { return std::string(); }
 
        boost::shared_ptr<ARDOUR::IO> io() const { return _io; }
        void set_track (ARDOUR::Track *);
@@ -132,8 +145,8 @@ class Diskstream : public SessionObject, public PublicDiskstream
        virtual XMLNode& get_state(void);
        virtual int      set_state(const XMLNode&, int version);
 
-       virtual void request_jack_monitors_input (bool) {}
-       virtual void ensure_jack_monitors_input (bool) {}
+       virtual void request_input_monitoring (bool) {}
+       virtual void ensure_input_monitoring (bool) {}
 
        framecnt_t   capture_offset() const { return _capture_offset; }
        virtual void set_capture_offset ();
@@ -191,7 +204,8 @@ class Diskstream : public SessionObject, public PublicDiskstream
   protected:
        friend class Track;
 
-       virtual int  process (framepos_t transport_frame, pframes_t nframes, framecnt_t &) = 0;
+    virtual int  process (BufferSet&, framepos_t transport_frame, pframes_t nframes, framecnt_t &, bool need_disk_signal) = 0;
+    virtual frameoffset_t calculate_playback_distance (pframes_t nframes) = 0;
        virtual bool commit  (framecnt_t) = 0;
 
        //private:
@@ -241,7 +255,13 @@ class Diskstream : public SessionObject, public PublicDiskstream
        virtual void set_align_style_from_io() {}
        virtual void setup_destructive_playlist () {}
        virtual void use_destructive_playlist () {}
-       virtual void prepare_to_stop (framepos_t pos);
+       virtual void prepare_to_stop (framepos_t transport_pos, framepos_t audible_frame);
+
+       void engage_record_enable ();
+       void disengage_record_enable ();
+
+        virtual bool prep_record_enable () = 0;
+        virtual bool prep_record_disable () = 0;
 
        void calculate_record_range (
                Evoral::OverlapType ot, framepos_t transport_frame, framecnt_t nframes,
@@ -301,6 +321,8 @@ class Diskstream : public SessionObject, public PublicDiskstream
 
        bool          in_set_state;
 
+       std::string   _write_source_name;
+
        Glib::Threads::Mutex state_lock;
 
        PBD::ScopedConnectionList playlist_connections;