Remove all use of nframes_t.

[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 7b7cdd7e3f262b8560db50e8fe9f6ce576a9284e..2bd44d62a6e3f2c6299e539ac3c4ab8d36eb4a3b 100644 (file)
--- a/libs/ardour/ardour/audio_diskstream.h
+++ b/libs/ardour/ardour/audio_diskstream.h
@@ -139,7 +139,7 @@ class AudioDiskstream : public Diskstream
                }
        }
 
-       static void swap_by_ptr (Sample *first, Sample *last, nframes_t n) {
+       static void swap_by_ptr (Sample *first, Sample *last, framecnt_t n) {
                while (n--) {
                        Sample tmp = *first;
                        *first++ = *last;
@@ -161,33 +161,33 @@ class AudioDiskstream : public Diskstream
 
        void set_pending_overwrite(bool);
        int  overwrite_existing_buffers ();
-       void set_block_size (nframes_t);
-       int  internal_playback_seek (nframes_t distance);
-       int  can_internal_playback_seek (nframes_t distance);
+       void set_block_size (pframes_t);
+       int  internal_playback_seek (framecnt_t distance);
+       int  can_internal_playback_seek (framecnt_t distance);
        int  rename_write_sources ();
         std::list<boost::shared_ptr<Source> > steal_write_sources();
        void reset_write_sources (bool, bool force = false);
        void non_realtime_input_change ();
-       void non_realtime_locate (nframes_t location);
+       void non_realtime_locate (framepos_t location);
 
   protected:
        friend class Auditioner;
-       int  seek (nframes_t which_sample, bool complete_refill = false);
+       int  seek (framepos_t which_sample, bool complete_refill = false);
 
   protected:
        friend class AudioTrack;
 
-       int  process (nframes_t transport_frame, nframes_t nframes, bool can_record, bool rec_monitors_input, bool& need_butler);
-       bool commit  (nframes_t nframes);
+       int  process (framepos_t transport_frame, pframes_t nframes, bool can_record, bool rec_monitors_input, bool& need_butler);
+       bool commit  (framecnt_t nframes);
 
   private:
 
        struct ChannelInfo : public boost::noncopyable {
 
-               ChannelInfo (nframes_t playback_buffer_size, 
-                             nframes_t capture_buffer_size,
-                             nframes_t speed_buffer_size, 
-                             nframes_t wrap_buffer_size);
+               ChannelInfo (framecnt_t playback_buffer_size, 
+                             framecnt_t capture_buffer_size,
+                             framecnt_t speed_buffer_size, 
+                             framecnt_t wrap_buffer_size);
                ~ChannelInfo ();
 
                Sample     *playback_wrap_buffer;
@@ -216,15 +216,15 @@ class AudioDiskstream : public Diskstream
 
                RingBufferNPT<CaptureTransition> * capture_transition_buf;
                // the following are used in the butler thread only
-               nframes_t                     curr_capture_cnt;
+               framecnt_t                     curr_capture_cnt;
 
-                void resize_playback (nframes_t);
-                void resize_capture (nframes_t);
+                void resize_playback (framecnt_t);
+                void resize_capture (framecnt_t);
        };
 
        typedef std::vector<ChannelInfo*> ChannelList;
 
-       void process_varispeed_playback(nframes_t nframes, boost::shared_ptr<ChannelList> c);
+       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);
@@ -233,12 +233,12 @@ class AudioDiskstream : public Diskstream
        int do_refill_with_alloc ();
 
        int read (Sample* buf, Sample* mixdown_buffer, float* gain_buffer,
-                       nframes_t& start, nframes_t cnt,
-                       ChannelInfo* channel_info, int channel, bool reversed);
+                  framepos_t& start, framecnt_t cnt,
+                  ChannelInfo* channel_info, int channel, bool reversed);
 
        void finish_capture (bool rec_monitors_input, boost::shared_ptr<ChannelList>);
        void transport_stopped_wallclock (struct tm&, time_t, bool abort);
-       void transport_looped (nframes_t transport_frame);
+       void transport_looped (framepos_t transport_frame);
 
        void init ();
 
@@ -254,7 +254,7 @@ class AudioDiskstream : public Diskstream
        int use_pending_capture_data (XMLNode& node);
 
        void get_input_sources ();
-       void prepare_record_status(nframes_t capture_start_frame);
+       void prepare_record_status(framepos_t capture_start_frame);
        void set_align_style_from_io();
        void setup_destructive_playlist ();
        void use_destructive_playlist ();