Fix a few framecnt / framepos type confusions.

git-svn-id: svn://localhost/ardour2/branches/3.0@11975 d708f5d6-7413-0410-9779-e7cbd77b26cf

12 files changed, 16 insertions, 16 deletions

diff --git a/libs/ardour/ardour/audioregion.h b/libs/ardour/ardour/audioregion.h
index c1476f69a4..077f90c95a 100644
--- a/libs/ardour/ardour/audioregion.h
+++ b/libs/ardour/ardour/audioregion.h
@@ -166,7 +166,7 @@ class AudioRegion : public Region
 	int set_transients (AnalysisFeatureList&);
 	int get_transients (AnalysisFeatureList&, bool force_new = false);
 	int update_transient (framepos_t old_position, framepos_t new_position);
-	int adjust_transients (framepos_t delta);
+	int adjust_transients (frameoffset_t delta);
 
 	AudioIntervalResult find_silence (Sample, framecnt_t, InterThreadInfo&) const;
 
diff --git a/libs/ardour/ardour/importable_source.h b/libs/ardour/ardour/importable_source.h
index 804b062969..fc695d88c1 100644
--- a/libs/ardour/ardour/importable_source.h
+++ b/libs/ardour/ardour/importable_source.h
@@ -35,7 +35,7 @@ public:
 	virtual uint32_t   channels() const = 0;
 	virtual framecnt_t length() const = 0;
 	virtual framecnt_t samplerate() const = 0;
-	virtual void       seek (framecnt_t pos) = 0;
+	virtual void       seek (framepos_t pos) = 0;
 	virtual framepos_t natural_position() const = 0;
 
 	virtual bool clamped_at_unity () const = 0;
diff --git a/libs/ardour/ardour/midi_playlist_source.h b/libs/ardour/ardour/midi_playlist_source.h
index c64b6e53f9..b75e8c0bd2 100644
--- a/libs/ardour/ardour/midi_playlist_source.h
+++ b/libs/ardour/ardour/midi_playlist_source.h
@@ -60,12 +60,12 @@ protected:
 
 	void flush_midi();
 
-	framepos_t read_unlocked (Evoral::EventSink<framepos_t>& dst,
+	framecnt_t read_unlocked (Evoral::EventSink<framepos_t>& dst,
 	                          framepos_t position,
 	                          framepos_t start, framecnt_t cnt,
 	                          MidiStateTracker* tracker) const;
 
-	framepos_t write_unlocked (MidiRingBuffer<framepos_t>& dst,
+	framecnt_t write_unlocked (MidiRingBuffer<framepos_t>& dst,
 	                           framepos_t position,
 	                           framecnt_t cnt);
 
diff --git a/libs/ardour/ardour/midi_region.h b/libs/ardour/ardour/midi_region.h
index 9868d1408f..ba7c2972f3 100644
--- a/libs/ardour/ardour/midi_region.h
+++ b/libs/ardour/ardour/midi_region.h
@@ -77,7 +77,7 @@ class MidiRegion : public Region
 	                    NoteMode  mode = Sustained,
 	                    MidiStateTracker* tracker = 0) const;
 
-	framepos_t master_read_at (MidiRingBuffer<framepos_t>& dst,
+	framecnt_t master_read_at (MidiRingBuffer<framepos_t>& dst,
 	                           framepos_t position,
 	                           framecnt_t dur,
 	                           uint32_t  chan_n = 0,
diff --git a/libs/ardour/ardour/midi_track.h b/libs/ardour/ardour/midi_track.h
index 45055a0c3d..bb810ff74a 100644
--- a/libs/ardour/ardour/midi_track.h
+++ b/libs/ardour/ardour/midi_track.h
@@ -62,7 +62,7 @@ public:
 	boost::shared_ptr<Region> bounce (InterThreadInfo&);
 	boost::shared_ptr<Region> bounce_range (framepos_t start, framepos_t end, InterThreadInfo&, 
 						boost::shared_ptr<Processor> endpoint, bool include_endpoint);
-	int export_stuff (BufferSet& bufs, framecnt_t nframes, framepos_t end_frame, 
+	int export_stuff (BufferSet& bufs, framepos_t start_frame, framecnt_t end_frame, 
 			  boost::shared_ptr<Processor> endpoint, bool include_endpoint, bool for_export);
 
 	int set_state (const XMLNode&, int version);
diff --git a/libs/ardour/ardour/region.h b/libs/ardour/ardour/region.h
index 0acbf04af4..c698d2fdc2 100644
--- a/libs/ardour/ardour/region.h
+++ b/libs/ardour/ardour/region.h
@@ -128,7 +128,7 @@ class Region
 	float stretch () const { return _stretch; }
 	float shift ()   const { return _shift; }
 
-	void set_ancestral_data (framepos_t start, framepos_t length, float stretch, float shift);
+	void set_ancestral_data (framepos_t start, framecnt_t length, float stretch, float shift);
 
 	frameoffset_t sync_offset (int& dir) const;
 	framepos_t sync_position () const;
@@ -282,7 +282,7 @@ class Region
 		return 0;
 	}
 
-	virtual int adjust_transients (framepos_t /*delta*/) {
+	virtual int adjust_transients (frameoffset_t /*delta*/) {
 		// no transients, but its OK
 		return 0;
 	}
diff --git a/libs/ardour/ardour/resampled_source.h b/libs/ardour/ardour/resampled_source.h
index 74f1a76e5b..a36ad4331f 100644
--- a/libs/ardour/ardour/resampled_source.h
+++ b/libs/ardour/ardour/resampled_source.h
@@ -39,7 +39,7 @@ class ResampledImportableSource : public ImportableSource
 	uint32_t   channels() const { return source->channels(); }
 	framecnt_t length() const { return source->length(); }
 	framecnt_t samplerate() const { return source->samplerate(); }
-	void       seek (framecnt_t);
+	void       seek (framepos_t);
 	framepos_t natural_position() const;
 
 	bool clamped_at_unity () const {
diff --git a/libs/ardour/ardour/route.h b/libs/ardour/ardour/route.h
index 42b74b50bc..89a0cac214 100644
--- a/libs/ardour/ardour/route.h
+++ b/libs/ardour/ardour/route.h
@@ -132,7 +132,7 @@ class Route : public SessionObject, public Automatable, public RouteGroupMember,
 
 	/* end of vfunc-based API */
 
-	void shift (framepos_t, framepos_t);
+	void shift (framepos_t, framecnt_t);
 
 	void set_gain (gain_t val, void *src);
 	void inc_gain (gain_t delta, void *src);
@@ -435,7 +435,7 @@ class Route : public SessionObject, public Automatable, public RouteGroupMember,
 	virtual void set_block_size (pframes_t nframes);
 
   protected:
-	virtual framecnt_t check_initial_delay (framecnt_t nframes, framecnt_t&) { return nframes; }
+	virtual framecnt_t check_initial_delay (framecnt_t nframes, framepos_t&) { return nframes; }
 
 	void passthru (framepos_t start_frame, framepos_t end_frame,
 			pframes_t nframes, int declick);
diff --git a/libs/ardour/ardour/slave.h b/libs/ardour/ardour/slave.h
index 9bd3124e23..a487824e51 100644
--- a/libs/ardour/ardour/slave.h
+++ b/libs/ardour/ardour/slave.h
@@ -155,7 +155,7 @@ class Slave {
 	 * only if requires_seekahead() returns true.
 	 */
 
-	virtual framepos_t seekahead_distance() const { return 0; }
+	virtual framecnt_t seekahead_distance() const { return 0; }
 
 	/**
 	 * @return - when returning true, ARDOUR will use transport speed 1.0 no matter what
@@ -235,7 +235,7 @@ class MTC_Slave : public Slave {
 
 	framecnt_t resolution () const;
 	bool requires_seekahead () const { return true; }
-	framepos_t seekahead_distance() const;
+	framecnt_t seekahead_distance() const;
 	bool give_slave_full_control_over_transport_speed() const;
 
   private:
diff --git a/libs/ardour/ardour/sndfileimportable.h b/libs/ardour/ardour/sndfileimportable.h
index f085334a21..b146d3231c 100644
--- a/libs/ardour/ardour/sndfileimportable.h
+++ b/libs/ardour/ardour/sndfileimportable.h
@@ -37,7 +37,7 @@ class SndFileImportableSource : public ImportableSource {
 	uint32_t   channels() const;
 	framecnt_t length() const;
 	framecnt_t samplerate() const;
-	void       seek (framecnt_t pos);
+	void       seek (framepos_t pos);
 	framepos_t natural_position() const;
 	bool       clamped_at_unity () const;
 
diff --git a/libs/ardour/ardour/tempo.h b/libs/ardour/ardour/tempo.h
index fd89ace9d9..15032b8741 100644
--- a/libs/ardour/ardour/tempo.h
+++ b/libs/ardour/ardour/tempo.h
@@ -241,7 +241,7 @@ class TempoMap : public PBD::StatefulDestructible
 	   to provide an answer.
 	*/
 	void       bbt_time_rt (framepos_t when, Timecode::BBT_Time&);
-        framecnt_t frame_time (const Timecode::BBT_Time&);
+        framepos_t frame_time (const Timecode::BBT_Time&);
 	framecnt_t bbt_duration_at (framepos_t, const Timecode::BBT_Time&, int dir);
 
 	/* TEMPO-SENSITIVE FUNCTIONS
diff --git a/libs/ardour/ardour/track.h b/libs/ardour/ardour/track.h
index 71ec61bb24..99d9e3783a 100644
--- a/libs/ardour/ardour/track.h
+++ b/libs/ardour/ardour/track.h
@@ -220,7 +220,7 @@ class Track : public Route, public PublicDiskstream
 
 	boost::shared_ptr<RecEnableControl> _rec_enable_control;
 	
-	framecnt_t check_initial_delay (framecnt_t nframes, framecnt_t&);
+	framecnt_t check_initial_delay (framecnt_t nframes, framepos_t&);
 
 private: