fixes for destructive track offsets of various kinds; move from jack_nframes_t -...

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

diff --git a/libs/ardour/ardour/destructive_filesource.h b/libs/ardour/ardour/destructive_filesource.h
index fed84217e797801353c7ef0571e588c105b80fb7..1e75042ce9a1a4d4525fb615e4d1a6c9c6adda84 100644 (file)
--- a/libs/ardour/ardour/destructive_filesource.h
+++ b/libs/ardour/ardour/destructive_filesource.h
@@ -31,7 +31,7 @@ namespace ARDOUR {
 
 class DestructiveFileSource : public SndFileSource {
   public:
-       DestructiveFileSource (Session&, std::string path, SampleFormat samp_format, HeaderFormat hdr_format, jack_nframes_t rate,
+       DestructiveFileSource (Session&, std::string path, SampleFormat samp_format, HeaderFormat hdr_format, nframes_t rate,
                               Flag flags = AudioFileSource::Flag (AudioFileSource::Writable));
 
        DestructiveFileSource (Session&, std::string path, Flag flags);
@@ -39,34 +39,34 @@ class DestructiveFileSource : public SndFileSource {
        DestructiveFileSource (Session&, const XMLNode&);
        ~DestructiveFileSource ();
 
-       jack_nframes_t last_capture_start_frame() const;
-       void mark_capture_start (jack_nframes_t);
+       nframes_t last_capture_start_frame() const;
+       void mark_capture_start (nframes_t);
        void mark_capture_end ();
        void clear_capture_marks();
 
        XMLNode& get_state ();
 
-       static void setup_standard_crossfades (jack_nframes_t sample_rate);
+       static void setup_standard_crossfades (nframes_t sample_rate);
 
   protected:
-       jack_nframes_t write_unlocked (Sample *src, jack_nframes_t cnt);
+       nframes_t write_unlocked (Sample *src, nframes_t cnt);
 
        virtual void handle_header_position_change ();
 
   private:
-       static jack_nframes_t xfade_frames;
+       static nframes_t xfade_frames;
        static gain_t* out_coefficient;
        static gain_t* in_coefficient;
 
        bool          _capture_start;
        bool          _capture_end;
-       jack_nframes_t capture_start_frame;
-       jack_nframes_t file_pos; // unit is frames
+       nframes_t capture_start_frame;
+       nframes_t file_pos; // unit is frames
        Sample*        xfade_buf;
 
        void init ();
-       jack_nframes_t crossfade (Sample* data, jack_nframes_t cnt, int dir);
-       void set_timeline_position (jack_nframes_t);
+       nframes_t crossfade (Sample* data, nframes_t cnt, int dir);
+       void set_timeline_position (nframes_t);
 };
 
 }