Fix a few framecnt / framepos type confusions.

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

5 files changed, 6 insertions, 6 deletions

diff --git a/gtk2_ardour/editor_drag.h b/gtk2_ardour/editor_drag.h
index 2c806126bd..0d457a39d9 100644
--- a/gtk2_ardour/editor_drag.h
+++ b/gtk2_ardour/editor_drag.h
@@ -310,7 +310,7 @@ public:
 
 protected:
 
-	double compute_x_delta (GdkEvent const *, ARDOUR::framecnt_t *);
+	double compute_x_delta (GdkEvent const *, ARDOUR::framepos_t *);
 	bool y_movement_allowed (int, double) const;
 
 	bool _brushing;
diff --git a/gtk2_ardour/midi_region_view.cc b/gtk2_ardour/midi_region_view.cc
index c535d4b02b..e87a8418b3 100644
--- a/gtk2_ardour/midi_region_view.cc
+++ b/gtk2_ardour/midi_region_view.cc
@@ -2953,7 +2953,7 @@ MidiRegionView::nudge_notes (bool forward)
 
 	framepos_t ref_point = source_beats_to_absolute_frames ((*(_selection.begin()))->note()->time());
 	framepos_t unused;
-	framepos_t distance;
+	framecnt_t distance;
 
 	if (trackview.editor().snap_mode() == Editing::SnapOff) {
 
diff --git a/gtk2_ardour/rhythm_ferret.cc b/gtk2_ardour/rhythm_ferret.cc
index 7d7250d055..bd9dd42f87 100644
--- a/gtk2_ardour/rhythm_ferret.cc
+++ b/gtk2_ardour/rhythm_ferret.cc
@@ -216,7 +216,7 @@ RhythmFerret::run_analysis ()
 }
 
 int
-RhythmFerret::run_percussion_onset_analysis (boost::shared_ptr<Readable> readable, framepos_t /*offset*/, AnalysisFeatureList& results)
+RhythmFerret::run_percussion_onset_analysis (boost::shared_ptr<Readable> readable, frameoffset_t /*offset*/, AnalysisFeatureList& results)
 {
 	TransientDetector t (_session->frame_rate());
 
@@ -263,7 +263,7 @@ RhythmFerret::get_note_onset_function ()
 }
 
 int
-RhythmFerret::run_note_onset_analysis (boost::shared_ptr<Readable> readable, framepos_t /*offset*/, AnalysisFeatureList& results)
+RhythmFerret::run_note_onset_analysis (boost::shared_ptr<Readable> readable, frameoffset_t /*offset*/, AnalysisFeatureList& results)
 {
 	try {
 		OnsetDetector t (_session->frame_rate());
diff --git a/gtk2_ardour/time_axis_view_item.cc b/gtk2_ardour/time_axis_view_item.cc
index 9df586bf7f..9e0c83aa1e 100644
--- a/gtk2_ardour/time_axis_view_item.cc
+++ b/gtk2_ardour/time_axis_view_item.cc
@@ -321,7 +321,7 @@ TimeAxisViewItem::get_position() const
  */
 
 bool
-TimeAxisViewItem::set_duration (framepos_t dur, void* src)
+TimeAxisViewItem::set_duration (framecnt_t dur, void* src)
 {
 	if ((dur > max_item_duration) || (dur < min_item_duration)) {
 		warning << string_compose (_("new duration %1 frames is out of bounds for %2"), get_item_name(), dur)
diff --git a/gtk2_ardour/time_axis_view_item.h b/gtk2_ardour/time_axis_view_item.h
index 5bcaa48545..6b4bc09ec1 100644
--- a/gtk2_ardour/time_axis_view_item.h
+++ b/gtk2_ardour/time_axis_view_item.h
@@ -144,7 +144,7 @@ class TimeAxisViewItem : public Selectable, public PBD::ScopedConnectionList
 
   protected:
 	TimeAxisViewItem(const std::string &, ArdourCanvas::Group&, TimeAxisView&, double, Gdk::Color const &,
-			 framepos_t, framepos_t, bool recording = false, bool automation = false, Visibility v = Visibility (0));
+			 framepos_t, framecnt_t, bool recording = false, bool automation = false, Visibility v = Visibility (0));
 
 	TimeAxisViewItem (const TimeAxisViewItem&);