megaopus patch #2 for today: remove nframes64_t and sframes_t from source

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

52 files changed, 629 insertions, 623 deletions

diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index 608e50466e..d770260907 100644
--- a/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@ -1457,7 +1457,7 @@ ARDOUR_UI::transport_goto_wallclock ()
 
 		time_t now;
 		struct tm tmnow;
-		nframes64_t frames;
+		framepos_t frames;
 
 		time (&now);
 		localtime_r (&now, &tmnow);
diff --git a/gtk2_ardour/audio_clock.cc b/gtk2_ardour/audio_clock.cc
index 7e3cf19ca5..3201583e11 100644
--- a/gtk2_ardour/audio_clock.cc
+++ b/gtk2_ardour/audio_clock.cc
@@ -668,7 +668,7 @@ AudioClock::set_bbt (nframes_t when, bool force)
 	}
 
 	if (bbt_upper_info_label) {
-		nframes64_t pos;
+		framepos_t pos;
 
 		if (bbt_reference_time < 0) {
 			pos = when;
@@ -2078,7 +2078,7 @@ AudioClock::set_size_requests ()
 }
 
 void
-AudioClock::set_bbt_reference (nframes64_t pos)
+AudioClock::set_bbt_reference (framepos_t pos)
 {
 	bbt_reference_time = pos;
 }
diff --git a/gtk2_ardour/audio_clock.h b/gtk2_ardour/audio_clock.h
index c51c321ba4..e5f0b0111a 100644
--- a/gtk2_ardour/audio_clock.h
+++ b/gtk2_ardour/audio_clock.h
@@ -54,7 +54,7 @@ class AudioClock : public Gtk::HBox, public ARDOUR::SessionHandlePtr
 	void set_from_playhead ();
 	void locate ();
 	void set_mode (Mode);
-	void set_bbt_reference (nframes64_t);
+	void set_bbt_reference (framepos_t);
 
 	void set_widget_name (std::string);
 
@@ -162,7 +162,7 @@ class AudioClock : public Gtk::HBox, public ARDOUR::SessionHandlePtr
 	Gtk::EventBox  clock_base;
 	Gtk::Frame     clock_frame;
 
-	nframes64_t bbt_reference_time;
+	framepos_t bbt_reference_time;
 	nframes_t last_when;
 	bool last_pdelta;
 	bool last_sdelta;
diff --git a/gtk2_ardour/audio_region_view.cc b/gtk2_ardour/audio_region_view.cc
index 7f1b84c227..c3e0bd0898 100644
--- a/gtk2_ardour/audio_region_view.cc
+++ b/gtk2_ardour/audio_region_view.cc
@@ -272,7 +272,7 @@ AudioRegionView::~AudioRegionView ()
 		delete *i;
 	}
 
-	for (list<std::pair<nframes64_t, ArdourCanvas::SimpleLine*> >::iterator i = feature_lines.begin(); i != feature_lines.end(); ++i) {
+	for (list<std::pair<framepos_t, ArdourCanvas::SimpleLine*> >::iterator i = feature_lines.begin(); i != feature_lines.end(); ++i) {
 		delete ((*i).second);
 	}
 	
@@ -411,7 +411,7 @@ AudioRegionView::region_resized (const PropertyChange& what_changed)
 		
 		/* hide transient lines that extend beyond the region end */
 		
-		list<std::pair<nframes64_t, ArdourCanvas::SimpleLine*> >::iterator l;
+		list<std::pair<framepos_t, ArdourCanvas::SimpleLine*> >::iterator l;
 		
 		for (l = feature_lines.begin(); l != feature_lines.end(); ++l) {
 			if ((*l).first > _region->length()- 1){
@@ -447,7 +447,7 @@ AudioRegionView::reset_width_dependent_items (double pixel_width)
 
 	AnalysisFeatureList analysis_features = _region->transients();
 	AnalysisFeatureList::const_iterator i;
-	list<std::pair<nframes64_t, ArdourCanvas::SimpleLine*> >::iterator l;
+	list<std::pair<framepos_t, ArdourCanvas::SimpleLine*> >::iterator l;
 
 	for (i = analysis_features.begin(), l = feature_lines.begin(); i != analysis_features.end() && l != feature_lines.end(); ++i, ++l) {
 		(*l).second->property_x1() = trackview.editor().frame_to_pixel (*i);
@@ -529,7 +529,7 @@ AudioRegionView::set_height (gdouble height)
 	reset_fade_shapes ();
 	
 	/* Update hights for any active feature lines */
-	list<std::pair<nframes64_t, ArdourCanvas::SimpleLine*> >::iterator l;
+	list<std::pair<framepos_t, ArdourCanvas::SimpleLine*> >::iterator l;
 
 	for (l = feature_lines.begin(); l != feature_lines.end(); ++l) {
 		(*l).second->property_y2() = _height - TimeAxisViewItem::NAME_HIGHLIGHT_SIZE - 1;
@@ -1433,7 +1433,7 @@ AudioRegionView::show_region_editor ()
 
 
 void
-AudioRegionView::show_fade_line (nframes64_t pos)
+AudioRegionView::show_fade_line (framepos_t pos)
 {
 	fade_position_line->property_x1() = trackview.editor().frame_to_pixel (pos);
 	fade_position_line->property_x2() = trackview.editor().frame_to_pixel (pos);
@@ -1466,7 +1466,7 @@ AudioRegionView::transients_changed ()
 	}
 
 	AnalysisFeatureList::const_iterator i;
-	list<std::pair<nframes64_t, ArdourCanvas::SimpleLine*> >::iterator l;
+	list<std::pair<framepos_t, ArdourCanvas::SimpleLine*> >::iterator l;
 
 	for (i = analysis_features.begin(), l = feature_lines.begin(); i != analysis_features.end() && l != feature_lines.end(); ++i, ++l) {
 		(*l).first = *i;
@@ -1486,14 +1486,14 @@ void
 AudioRegionView::update_transient(float /*old_pos*/, float new_pos)
 {
 	/* Find frame at old pos, calulate new frame then update region transients*/
-	list<std::pair<nframes64_t, ArdourCanvas::SimpleLine*> >::iterator l;
+	list<std::pair<framepos_t, ArdourCanvas::SimpleLine*> >::iterator l;
 
 	for (l = feature_lines.begin(); l != feature_lines.end(); ++l) {
 		/* Simple line x1 has been updated in drag so we compare to new_pos */
 		if (rint(new_pos) == rint((*l).second->property_x1())) {
 		    
-		    nframes64_t old_frame = (*l).first;
-		    nframes64_t new_frame = trackview.editor().pixel_to_frame (new_pos);
+		    framepos_t old_frame = (*l).first;
+		    framepos_t new_frame = trackview.editor().pixel_to_frame (new_pos);
 
 		    _region->update_transient (old_frame, new_frame);
 		    
@@ -1506,7 +1506,7 @@ void
 AudioRegionView::remove_transient(float pos)
 {
 	/* Find frame at old pos, calulate new frame then update region transients*/
-	list<std::pair<nframes64_t, ArdourCanvas::SimpleLine*> >::iterator l;
+	list<std::pair<framepos_t, ArdourCanvas::SimpleLine*> >::iterator l;
 
 	for (l = feature_lines.begin(); l != feature_lines.end(); ++l) {
 		/* Simple line x1 has been updated in drag so we compare to new_pos */
diff --git a/gtk2_ardour/audio_region_view.h b/gtk2_ardour/audio_region_view.h
index eec6a0b2d6..8673b6901d 100644
--- a/gtk2_ardour/audio_region_view.h
+++ b/gtk2_ardour/audio_region_view.h
@@ -103,7 +103,7 @@ class AudioRegionView : public RegionView
 	void reset_fade_in_shape_width (nframes_t);
 	void reset_fade_out_shape_width (nframes_t);
 	
-	void show_fade_line(nframes64_t pos);
+	void show_fade_line(framepos_t pos);
 	void hide_fade_line();
 	
 	void set_fade_visibility (bool);
@@ -134,7 +134,7 @@ class AudioRegionView : public RegionView
     std::vector<ArdourCanvas::WaveView *> waves;
     std::vector<ArdourCanvas::WaveView *> tmp_waves; ///< see ::create_waves()
     
-    std::list<std::pair<nframes64_t, ArdourCanvas::SimpleLine*> > feature_lines;
+    std::list<std::pair<framepos_t, ArdourCanvas::SimpleLine*> > feature_lines;
     
     ArdourCanvas::Polygon*           sync_mark; ///< polgyon for sync position
     ArdourCanvas::SimpleLine*        zero_line;
diff --git a/gtk2_ardour/automation_line.cc b/gtk2_ardour/automation_line.cc
index e674fd4fff..d51a4fe1eb 100644
--- a/gtk2_ardour/automation_line.cc
+++ b/gtk2_ardour/automation_line.cc
@@ -55,11 +55,11 @@ using namespace PBD;
 using namespace Editing;
 using namespace Gnome; // for Canvas
 
-static const Evoral::IdentityConverter<double, sframes_t> default_converter;
+static const Evoral::IdentityConverter<double, framepos_t> default_converter;
 
 AutomationLine::AutomationLine (const string& name, TimeAxisView& tv, ArdourCanvas::Group& parent,
 		boost::shared_ptr<AutomationList> al,
-		const Evoral::TimeConverter<double, sframes_t>* converter)
+		const Evoral::TimeConverter<double, framepos_t>* converter)
 	: trackview (tv)
 	, _name (name)
 	, alist (al)
diff --git a/gtk2_ardour/automation_line.h b/gtk2_ardour/automation_line.h
index fdace9a6e6..6fea1699cc 100644
--- a/gtk2_ardour/automation_line.h
+++ b/gtk2_ardour/automation_line.h
@@ -59,7 +59,7 @@ class AutomationLine : public sigc::trackable, public PBD::StatefulDestructible
   public:
 	AutomationLine (const std::string& name, TimeAxisView&, ArdourCanvas::Group&,
 			boost::shared_ptr<ARDOUR::AutomationList>,
-			const Evoral::TimeConverter<double, ARDOUR::sframes_t>* converter = 0);
+			const Evoral::TimeConverter<double, ARDOUR::framepos_t>* converter = 0);
 	virtual ~AutomationLine ();
 
 	void queue_reset ();
@@ -134,7 +134,7 @@ class AutomationLine : public sigc::trackable, public PBD::StatefulDestructible
 
 	virtual MementoCommandBinder<ARDOUR::AutomationList>* memento_command_binder ();
 
-	const Evoral::TimeConverter<double, ARDOUR::sframes_t>& time_converter () const {
+	const Evoral::TimeConverter<double, ARDOUR::framepos_t>& time_converter () const {
 		return _time_converter;
 	}
 
@@ -201,7 +201,7 @@ class AutomationLine : public sigc::trackable, public PBD::StatefulDestructible
 	double _last_drag_fraction; ///< last y position of the drag, as a fraction
 	std::list<double> _always_in_view;
 
-	const Evoral::TimeConverter<double, ARDOUR::sframes_t>& _time_converter;
+	const Evoral::TimeConverter<double, ARDOUR::framepos_t>& _time_converter;
 
 	void reset_line_coords (ControlPoint&);
 	void add_visible_control_point (uint32_t, uint32_t, double, double, ARDOUR::AutomationList::iterator, uint32_t);
diff --git a/gtk2_ardour/automation_region_view.cc b/gtk2_ardour/automation_region_view.cc
index ca1e787f3a..1cda2051dd 100644
--- a/gtk2_ardour/automation_region_view.cc
+++ b/gtk2_ardour/automation_region_view.cc
@@ -179,7 +179,7 @@ AutomationRegionView::set_height (double h)
 }
 
 bool
-AutomationRegionView::set_position (nframes64_t pos, void* src, double* ignored)
+AutomationRegionView::set_position (framepos_t pos, void* src, double* ignored)
 {
 	if (_line) {
 		_line->set_maximum_time (_region->length ());
diff --git a/gtk2_ardour/automation_region_view.h b/gtk2_ardour/automation_region_view.h
index 9654d6afa1..04dd308def 100644
--- a/gtk2_ardour/automation_region_view.h
+++ b/gtk2_ardour/automation_region_view.h
@@ -64,7 +64,7 @@ public:
 
 protected:
 	void create_line(boost::shared_ptr<ARDOUR::AutomationList> list);
-	bool set_position(nframes64_t pos, void* src, double* ignored);
+	bool set_position(framepos_t pos, void* src, double* ignored);
 	void region_resized (const PBD::PropertyChange&);
 	bool canvas_event(GdkEvent* ev);
 	void add_automation_event (GdkEvent* event, nframes_t when, double y);
diff --git a/gtk2_ardour/automation_time_axis.cc b/gtk2_ardour/automation_time_axis.cc
index 760794dd1e..63c755139d 100644
--- a/gtk2_ardour/automation_time_axis.cc
+++ b/gtk2_ardour/automation_time_axis.cc
@@ -637,7 +637,7 @@ AutomationTimeAxisView::cut_copy_clear_one (AutomationLine& line, Selection& sel
 	XMLNode &before = alist->get_state();
 
 	/* convert time selection to automation list model coordinates */
-	const Evoral::TimeConverter<double, ARDOUR::sframes_t>& tc = line.time_converter ();
+	const Evoral::TimeConverter<double, ARDOUR::framepos_t>& tc = line.time_converter ();
 	double const start = tc.from (selection.time.front().start - tc.origin_b ());
 	double const end = tc.from (selection.time.front().end - tc.origin_b ());
 	
diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index c134c4190c..a002d5428a 100644
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -866,10 +866,10 @@ Editor::zoom_adjustment_changed ()
 
 	if (fpu < 1.0) {
 		fpu = 1.0;
-		zoom_range_clock.set ((nframes64_t) floor (fpu * _canvas_width));
+		zoom_range_clock.set ((framepos_t) floor (fpu * _canvas_width));
 	} else if (fpu > _session->current_end_frame() / _canvas_width) {
 		fpu = _session->current_end_frame() / _canvas_width;
-		zoom_range_clock.set ((nframes64_t) floor (fpu * _canvas_width));
+		zoom_range_clock.set ((framepos_t) floor (fpu * _canvas_width));
 	}
 
 	temporal_zoom (fpu);
@@ -889,7 +889,7 @@ Editor::control_scroll (float fraction)
 	/*
 		_control_scroll_target is an optional<T>
 
-		it acts like a pointer to an nframes64_t, with
+		it acts like a pointer to an framepos_t, with
 		a operator conversion to boolean to check
 		that it has a value could possibly use
 		playhead_cursor->current_frame to store the
@@ -902,12 +902,12 @@ Editor::control_scroll (float fraction)
 		_dragging_playhead = true;
 	}
 
-	if ((fraction < 0.0f) && (*_control_scroll_target < (nframes64_t) fabs(step))) {
+	if ((fraction < 0.0f) && (*_control_scroll_target < (framepos_t) fabs(step))) {
 		*_control_scroll_target = 0;
 	} else if ((fraction > 0.0f) && (max_framepos - *_control_scroll_target < step)) {
 		*_control_scroll_target = max_framepos - (current_page_frames()*2); // allow room for slop in where the PH is on the screen
 	} else {
-		*_control_scroll_target += (nframes64_t) floor (step);
+		*_control_scroll_target += (framepos_t) floor (step);
 	}
 
 	/* move visuals, we'll catch up with it later */
@@ -938,7 +938,7 @@ Editor::control_scroll (float fraction)
 }
 
 bool
-Editor::deferred_control_scroll (nframes64_t /*target*/)
+Editor::deferred_control_scroll (framepos_t /*target*/)
 {
 	_session->request_locate (*_control_scroll_target, _session->transport_rolling());
 	// reset for next stream
@@ -972,7 +972,7 @@ Editor::on_realize ()
 }
 
 void
-Editor::map_position_change (nframes64_t frame)
+Editor::map_position_change (framepos_t frame)
 {
 	ENSURE_GUI_THREAD (*this, &Editor::map_position_change, frame)
 
@@ -988,7 +988,7 @@ Editor::map_position_change (nframes64_t frame)
 }
 
 void
-Editor::center_screen (nframes64_t frame)
+Editor::center_screen (framepos_t frame)
 {
 	double page = _canvas_width * frames_per_unit;
 
@@ -1001,12 +1001,12 @@ Editor::center_screen (nframes64_t frame)
 }
 
 void
-Editor::center_screen_internal (nframes64_t frame, float page)
+Editor::center_screen_internal (framepos_t frame, float page)
 {
 	page /= 2;
 
 	if (frame > page) {
-		frame -= (nframes64_t) page;
+		frame -= (framepos_t) page;
 	} else {
 		frame = 0;
 	}
@@ -1356,10 +1356,10 @@ Editor::popup_fade_context_menu (int button, int32_t time, ArdourCanvas::Item* i
 }
 
 void
-Editor::popup_track_context_menu (int button, int32_t time, ItemType item_type, bool with_selection, nframes64_t frame)
+Editor::popup_track_context_menu (int button, int32_t time, ItemType item_type, bool with_selection, framepos_t frame)
 {
 	using namespace Menu_Helpers;
-	Menu* (Editor::*build_menu_function)(nframes64_t);
+	Menu* (Editor::*build_menu_function)(framepos_t);
 	Menu *menu;
 
 	switch (item_type) {
@@ -1476,7 +1476,7 @@ Editor::popup_track_context_menu (int button, int32_t time, ItemType item_type,
 }
 
 Menu*
-Editor::build_track_context_menu (nframes64_t)
+Editor::build_track_context_menu (framepos_t)
 {
 	using namespace Menu_Helpers;
 
@@ -1488,7 +1488,7 @@ Editor::build_track_context_menu (nframes64_t)
 }
 
 Menu*
-Editor::build_track_bus_context_menu (nframes64_t)
+Editor::build_track_bus_context_menu (framepos_t)
 {
 	using namespace Menu_Helpers;
 
@@ -1500,7 +1500,7 @@ Editor::build_track_bus_context_menu (nframes64_t)
 }
 
 Menu*
-Editor::build_track_region_context_menu (nframes64_t frame)
+Editor::build_track_region_context_menu (framepos_t frame)
 {
 	using namespace Menu_Helpers;
 	MenuList& edit_items  = track_region_context_menu.items();
@@ -1551,7 +1551,7 @@ Editor::build_track_region_context_menu (nframes64_t frame)
 }
 
 Menu*
-Editor::build_track_crossfade_context_menu (nframes64_t frame)
+Editor::build_track_crossfade_context_menu (framepos_t frame)
 {
 	using namespace Menu_Helpers;
 	MenuList& edit_items  = track_crossfade_context_menu.items();
@@ -1641,7 +1641,7 @@ Editor::analyze_range_selection()
 }
 
 Menu*
-Editor::build_track_selection_context_menu (nframes64_t)
+Editor::build_track_selection_context_menu (framepos_t)
 {
 	using namespace Menu_Helpers;
 	MenuList& edit_items  = track_selection_context_menu.items();
@@ -2327,7 +2327,7 @@ Editor::set_edit_point_preference (EditPoint ep, bool force)
 		Glib::RefPtr<RadioAction>::cast_dynamic(act)->set_active (true);
 	}
 
-	nframes64_t foo;
+	framepos_t foo;
 	bool in_track_canvas;
 
 	if (!mouse_frame (foo, in_track_canvas)) {
@@ -2407,7 +2407,7 @@ Editor::set_state (const XMLNode& node, int /*version*/)
 	move (x, y);
 
 	if (_session && (prop = node.property ("playhead"))) {
-		nframes64_t pos;
+		framepos_t pos;
                 sscanf (prop->value().c_str(), "%" PRIi64, &pos);
 		playhead_cursor->set_position (pos);
 	} else {
@@ -2444,7 +2444,7 @@ Editor::set_state (const XMLNode& node, int /*version*/)
 	}
 
 	if ((prop = node.property ("left-frame")) != 0){
-		nframes64_t pos;
+		framepos_t pos;
 		if (sscanf (prop->value().c_str(), "%" PRId64, &pos) == 1) {
 			reset_x_origin (pos);
 		}
@@ -2677,7 +2677,7 @@ Editor::trackview_by_y_position (double y)
  *  @param event Event to get current key modifier information from, or 0.
  */
 void
-Editor::snap_to_with_modifier (nframes64_t& start, GdkEvent const * event, int32_t direction, bool for_mark)
+Editor::snap_to_with_modifier (framepos_t& start, GdkEvent const * event, int32_t direction, bool for_mark)
 {
 	if (!_session || !event) {
 		return;
@@ -2695,7 +2695,7 @@ Editor::snap_to_with_modifier (nframes64_t& start, GdkEvent const * event, int32
 }
 
 void
-Editor::snap_to (nframes64_t& start, int32_t direction, bool for_mark)
+Editor::snap_to (framepos_t& start, int32_t direction, bool for_mark)
 {
 	if (!_session || _snap_mode == SnapOff) {
 		return;
@@ -2705,17 +2705,17 @@ Editor::snap_to (nframes64_t& start, int32_t direction, bool for_mark)
 }
 
 void
-Editor::timecode_snap_to_internal (nframes64_t& start, int32_t direction, bool /*for_mark*/)
+Editor::timecode_snap_to_internal (framepos_t& start, int32_t direction, bool /*for_mark*/)
 {
-	const nframes64_t one_timecode_second = (nframes64_t)(rint(_session->timecode_frames_per_second()) * _session->frames_per_timecode_frame());
-	nframes64_t one_timecode_minute = (nframes64_t)(rint(_session->timecode_frames_per_second()) * _session->frames_per_timecode_frame() * 60);
+	const framepos_t one_timecode_second = (framepos_t)(rint(_session->timecode_frames_per_second()) * _session->frames_per_timecode_frame());
+	framepos_t one_timecode_minute = (framepos_t)(rint(_session->timecode_frames_per_second()) * _session->frames_per_timecode_frame() * 60);
 
 	switch (_snap_type) {
 	case SnapToTimecodeFrame:
 		if (((direction == 0) && (fmod((double)start, (double)_session->frames_per_timecode_frame()) > (_session->frames_per_timecode_frame() / 2))) || (direction > 0)) {
-			start = (nframes64_t) (ceil ((double) start / _session->frames_per_timecode_frame()) * _session->frames_per_timecode_frame());
+			start = (framepos_t) (ceil ((double) start / _session->frames_per_timecode_frame()) * _session->frames_per_timecode_frame());
 		} else {
-			start = (nframes64_t) (floor ((double) start / _session->frames_per_timecode_frame()) *  _session->frames_per_timecode_frame());
+			start = (framepos_t) (floor ((double) start / _session->frames_per_timecode_frame()) *  _session->frames_per_timecode_frame());
 		}
 		break;
 
@@ -2727,9 +2727,9 @@ Editor::timecode_snap_to_internal (nframes64_t& start, int32_t direction, bool /
 			start -= _session->timecode_offset ();
 		}
 		if (((direction == 0) && (start % one_timecode_second > one_timecode_second / 2)) || direction > 0) {
-			start = (nframes64_t) ceil ((double) start / one_timecode_second) * one_timecode_second;
+			start = (framepos_t) ceil ((double) start / one_timecode_second) * one_timecode_second;
 		} else {
-			start = (nframes64_t) floor ((double) start / one_timecode_second) * one_timecode_second;
+			start = (framepos_t) floor ((double) start / one_timecode_second) * one_timecode_second;
 		}
 
 		if (_session->timecode_offset_negative())
@@ -2748,9 +2748,9 @@ Editor::timecode_snap_to_internal (nframes64_t& start, int32_t direction, bool /
 			start -= _session->timecode_offset ();
 		}
 		if (((direction == 0) && (start % one_timecode_minute > one_timecode_minute / 2)) || direction > 0) {
-			start = (nframes64_t) ceil ((double) start / one_timecode_minute) * one_timecode_minute;
+			start = (framepos_t) ceil ((double) start / one_timecode_minute) * one_timecode_minute;
 		} else {
-			start = (nframes64_t) floor ((double) start / one_timecode_minute) * one_timecode_minute;
+			start = (framepos_t) floor ((double) start / one_timecode_minute) * one_timecode_minute;
 		}
 		if (_session->timecode_offset_negative())
 		{
@@ -2766,13 +2766,13 @@ Editor::timecode_snap_to_internal (nframes64_t& start, int32_t direction, bool /
 }
 
 void
-Editor::snap_to_internal (nframes64_t& start, int32_t direction, bool for_mark)
+Editor::snap_to_internal (framepos_t& start, int32_t direction, bool for_mark)
 {
-	const nframes64_t one_second = _session->frame_rate();
-	const nframes64_t one_minute = _session->frame_rate() * 60;
-	nframes64_t presnap = start;
-	nframes64_t before;
-	nframes64_t after;
+	const framepos_t one_second = _session->frame_rate();
+	const framepos_t one_minute = _session->frame_rate() * 60;
+	framepos_t presnap = start;
+	framepos_t before;
+	framepos_t after;
 
 	switch (_snap_type) {
 	case SnapToTimecodeFrame:
@@ -2782,25 +2782,25 @@ Editor::snap_to_internal (nframes64_t& start, int32_t direction, bool for_mark)
 
 	case SnapToCDFrame:
 		if (((direction == 0) && (start % (one_second/75) > (one_second/75) / 2)) || (direction > 0)) {
-			start = (nframes64_t) ceil ((double) start / (one_second / 75)) * (one_second / 75);
+			start = (framepos_t) ceil ((double) start / (one_second / 75)) * (one_second / 75);
 		} else {
-			start = (nframes64_t) floor ((double) start / (one_second / 75)) * (one_second / 75);
+			start = (framepos_t) floor ((double) start / (one_second / 75)) * (one_second / 75);
 		}
 		break;
 
 	case SnapToSeconds:
 		if (((direction == 0) && (start % one_second > one_second / 2)) || (direction > 0)) {
-			start = (nframes64_t) ceil ((double) start / one_second) * one_second;
+			start = (framepos_t) ceil ((double) start / one_second) * one_second;
 		} else {
-			start = (nframes64_t) floor ((double) start / one_second) * one_second;
+			start = (framepos_t) floor ((double) start / one_second) * one_second;
 		}
 		break;
 
 	case SnapToMinutes:
 		if (((direction == 0) && (start % one_minute > one_minute / 2)) || (direction > 0)) {
-			start = (nframes64_t) ceil ((double) start / one_minute) * one_minute;
+			start = (framepos_t) ceil ((double) start / one_minute) * one_minute;
 		} else {
-			start = (nframes64_t) floor ((double) start / one_minute) * one_minute;
+			start = (framepos_t) floor ((double) start / one_minute) * one_minute;
 		}
 		break;
 
@@ -2886,8 +2886,8 @@ Editor::snap_to_internal (nframes64_t& start, int32_t direction, bool for_mark)
 	case SnapToRegionBoundary:
 		if (!region_boundary_cache.empty()) {
 
-			vector<nframes64_t>::iterator prev = region_boundary_cache.end ();
-			vector<nframes64_t>::iterator next = region_boundary_cache.end ();
+			vector<framepos_t>::iterator prev = region_boundary_cache.end ();
+			vector<framepos_t>::iterator next = region_boundary_cache.end ();
 
 			if (direction > 0) {
 				next = std::upper_bound (region_boundary_cache.begin(), region_boundary_cache.end(), start);
@@ -2900,8 +2900,8 @@ Editor::snap_to_internal (nframes64_t& start, int32_t direction, bool for_mark)
 				prev--;
 			}
 
-			nframes64_t const p = (prev == region_boundary_cache.end()) ? region_boundary_cache.front () : *prev;
-			nframes64_t const n = (next == region_boundary_cache.end()) ? region_boundary_cache.back () : *next;
+			framepos_t const p = (prev == region_boundary_cache.end()) ? region_boundary_cache.front () : *prev;
+			framepos_t const n = (next == region_boundary_cache.end()) ? region_boundary_cache.back () : *next;
 
 			if (start > (p + n) / 2) {
 				start = n;
@@ -4012,7 +4012,7 @@ Editor::playlist_selector () const
 }
 
 Evoral::MusicalTime
-Editor::get_grid_type_as_beats (bool& success, nframes64_t position)
+Editor::get_grid_type_as_beats (bool& success, framepos_t position)
 {
 	success = true;
 
@@ -4091,10 +4091,10 @@ Editor::get_grid_type_as_beats (bool& success, nframes64_t position)
 	return 0.0;
 }
 
-nframes64_t
-Editor::get_nudge_distance (nframes64_t pos, nframes64_t& next)
+framecnt_t
+Editor::get_nudge_distance (framepos_t pos, framecnt_t& next)
 {
-	nframes64_t ret;
+	framecnt_t ret;
 
 	ret = nudge_clock.current_duration (pos);
 	next = ret + 1; /* XXXX fix me */
@@ -4139,7 +4139,7 @@ Editor::playlist_deletion_dialog (boost::shared_ptr<Playlist> pl)
 }
 
 bool
-Editor::audio_region_selection_covers (nframes64_t where)
+Editor::audio_region_selection_covers (framepos_t where)
 {
 	for (RegionSelection::iterator a = selection->regions.begin(); a != selection->regions.end(); ++a) {
 		if ((*a)->region()->covers (where)) {
@@ -4370,7 +4370,7 @@ Editor::on_key_release_event (GdkEventKey* ev)
  *  @param frame New x origin.
  */
 void
-Editor::reset_x_origin (nframes64_t frame)
+Editor::reset_x_origin (framepos_t frame)
 {
 	queue_visual_change (frame);
 }
@@ -4388,7 +4388,7 @@ Editor::reset_zoom (double fpu)
 }
 
 void
-Editor::reposition_and_zoom (nframes64_t frame, double fpu)
+Editor::reposition_and_zoom (framepos_t frame, double fpu)
 {
 	reset_x_origin (frame);
 	reset_zoom (fpu);
@@ -4522,7 +4522,7 @@ Editor::post_zoom ()
 {
 	// convert fpu to frame count
 
-	nframes64_t frames = (nframes64_t) floor (frames_per_unit * _canvas_width);
+	framepos_t frames = (framepos_t) floor (frames_per_unit * _canvas_width);
 
 	if (frames_per_unit != zoom_range_clock.current_duration()) {
 		zoom_range_clock.set (frames);
@@ -4549,7 +4549,7 @@ Editor::post_zoom ()
 }
 
 void
-Editor::queue_visual_change (nframes64_t where)
+Editor::queue_visual_change (framepos_t where)
 {
 	pending_visual_change.add (VisualChange::TimeOrigin);
 	pending_visual_change.time_origin = where;
@@ -4641,11 +4641,11 @@ Editor::sort_track_selection (TrackViewList* sel)
 	}
 }
 
-nframes64_t
+framepos_t
 Editor::get_preferred_edit_position (bool ignore_playhead)
 {
 	bool ignored;
-	nframes64_t where = 0;
+	framepos_t where = 0;
 	EditPoint ep = _edit_point;
 
 	if (entered_marker) {
@@ -4690,7 +4690,7 @@ Editor::get_preferred_edit_position (bool ignore_playhead)
 }
 
 void
-Editor::set_loop_range (nframes64_t start, nframes64_t end, string cmd)
+Editor::set_loop_range (framepos_t start, framepos_t end, string cmd)
 {
 	if (!_session) return;
 
@@ -4717,7 +4717,7 @@ Editor::set_loop_range (nframes64_t start, nframes64_t end, string cmd)
 }
 
 void
-Editor::set_punch_range (nframes64_t start, nframes64_t end, string cmd)
+Editor::set_punch_range (framepos_t start, framepos_t end, string cmd)
 {
 	if (!_session) return;
 
@@ -4750,7 +4750,7 @@ Editor::set_punch_range (nframes64_t start, nframes64_t end, string cmd)
  *  @param ts Tracks to look on; if this is empty, all tracks are examined.
  */
 void
-Editor::get_regions_at (RegionSelection& rs, nframes64_t where, const TrackViewList& ts) const
+Editor::get_regions_at (RegionSelection& rs, framepos_t where, const TrackViewList& ts) const
 {
 	const TrackViewList* tracks;
 
@@ -4769,7 +4769,7 @@ Editor::get_regions_at (RegionSelection& rs, nframes64_t where, const TrackViewL
 			if ((tr = rtv->track()) && ((pl = tr->playlist()))) {
 
 				Playlist::RegionList* regions = pl->regions_at (
-						(nframes64_t) floor ( (double)where * tr->speed()));
+						(framepos_t) floor ( (double)where * tr->speed()));
 
 				for (Playlist::RegionList::iterator i = regions->begin(); i != regions->end(); ++i) {
 					RegionView* rv = rtv->view()->find_view (*i);
@@ -4785,7 +4785,7 @@ Editor::get_regions_at (RegionSelection& rs, nframes64_t where, const TrackViewL
 }
 
 void
-Editor::get_regions_after (RegionSelection& rs, nframes64_t where, const TrackViewList& ts) const
+Editor::get_regions_after (RegionSelection& rs, framepos_t where, const TrackViewList& ts) const
 {
 	const TrackViewList* tracks;
 
@@ -4858,7 +4858,7 @@ Editor::get_regions_for_action (RegionSelection& rs, bool allow_entered, bool al
 
 		if (!tracks.empty()) {
 			/* now find regions that are at the edit position on those tracks */
-			nframes64_t const where = get_preferred_edit_position ();
+			framepos_t const where = get_preferred_edit_position ();
 			get_regions_at (rs, where, tracks);
 		}
 	}
@@ -5368,7 +5368,7 @@ Editor::horizontal_scroll_right_release ()
 void
 Editor::reset_x_origin_to_follow_playhead ()
 {
-	nframes64_t const frame = playhead_cursor->current_frame;
+	framepos_t const frame = playhead_cursor->current_frame;
 
 	if (frame < leftmost_frame || frame > leftmost_frame + current_page_frames()) {
 
@@ -5384,7 +5384,7 @@ Editor::reset_x_origin_to_follow_playhead ()
 						
 			if (frame < leftmost_frame) {
 				/* moving left */
-				nframes64_t l = 0;
+				framepos_t l = 0;
 				if (_session->transport_rolling()) {
 					/* rolling; end up with the playhead at the right of the page */
 					l = frame - current_page_frames ();
@@ -5438,7 +5438,7 @@ Editor::super_rapid_screen_update ()
 
 	/* PLAYHEAD AND VIEWPORT */
 
-	nframes64_t const frame = _session->audible_frame();
+	framepos_t const frame = _session->audible_frame();
 
 	/* There are a few reasons why we might not update the playhead / viewport stuff:
 	 *
diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h
index 1c5a38bbb4..390b94664b 100644
--- a/gtk2_ardour/editor.h
+++ b/gtk2_ardour/editor.h
@@ -142,17 +142,17 @@ struct EditorCursor {
 	Editor&               editor;
 	ArdourCanvas::Points  points;
 	ArdourCanvas::Line    canvas_item;
-	nframes64_t           current_frame;
+	framepos_t           current_frame;
 	double		  length;
 
 	EditorCursor (Editor&, bool (Editor::*)(GdkEvent*,ArdourCanvas::Item*));
 	~EditorCursor ();
 
-	void set_position (nframes64_t);
+	void set_position (framepos_t);
 	void set_length (double units);
 	void set_y_axis (double position);
 
-        PBD::Signal1<void, nframes64_t> PositionChanged;
+        PBD::Signal1<void, framepos_t> PositionChanged;
 };
 
 class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARDOUR::SessionHandlePtr
@@ -167,10 +167,10 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
 	void             first_idle ();
 	virtual bool     have_idled () const { return _have_idled; }
 
-	nframes64_t leftmost_position() const { return leftmost_frame; }
+	framepos_t leftmost_position() const { return leftmost_frame; }
 
-	nframes64_t current_page_frames() const {
-		return (nframes64_t) floor (_canvas_width * frames_per_unit);
+	framecnt_t current_page_frames() const {
+		return (framecnt_t) floor (_canvas_width * frames_per_unit);
 	}
 
 	double canvas_height () const {
@@ -236,11 +236,11 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
 
 	/* undo related */
 
-	nframes64_t unit_to_frame (double unit) const {
-		return (nframes64_t) rint (unit * frames_per_unit);
+	framepos_t unit_to_frame (double unit) const {
+		return (framepos_t) rint (unit * frames_per_unit);
 	}
 
-	double frame_to_unit (nframes64_t frame) const {
+	double frame_to_unit (framepos_t frame) const {
 		return rint ((double) frame / (double) frames_per_unit);
 	}
 
@@ -255,7 +255,7 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
 	   xscroll_adjustment.
 	*/
 
-	nframes64_t pixel_to_frame (double pixel) const {
+	framepos_t pixel_to_frame (double pixel) const {
 
 		/* pixel can be less than zero when motion events
 		   are processed. since we've already run the world->canvas
@@ -264,13 +264,13 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
 		*/
 
 		if (pixel >= 0) {
-			return (nframes64_t) rint (pixel * frames_per_unit * GNOME_CANVAS(track_canvas->gobj())->pixels_per_unit);
+			return (framepos_t) rint (pixel * frames_per_unit * GNOME_CANVAS(track_canvas->gobj())->pixels_per_unit);
 		} else {
 			return 0;
 		}
 	}
 
-	gulong frame_to_pixel (nframes64_t frame) const {
+	gulong frame_to_pixel (framepos_t frame) const {
 		return (gulong) rint ((frame / (frames_per_unit * GNOME_CANVAS(track_canvas->gobj())->pixels_per_unit)));
 	}
 
@@ -340,8 +340,8 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
 
 	/* nudge is initiated by transport controls owned by ARDOUR_UI */
 
-	nframes64_t get_nudge_distance (nframes64_t pos, nframes64_t& next);
-	Evoral::MusicalTime get_grid_type_as_beats (bool& success, nframes64_t position);
+	framecnt_t get_nudge_distance (framepos_t pos, framecnt_t& next);
+	Evoral::MusicalTime get_grid_type_as_beats (bool& success, framepos_t position);
 
 	void nudge_forward (bool next, bool force_playhead);
 	void nudge_backward (bool next, bool force_playhead);
@@ -394,13 +394,13 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
 	void maximise_editing_space();
 	void restore_editing_space();
 
-	void reset_x_origin (nframes64_t);
+	void reset_x_origin (framepos_t);
 	void reset_x_origin_to_follow_playhead ();
 	void reset_y_origin (double);
 	void reset_zoom (double);
-	void reposition_and_zoom (nframes64_t, double);
+	void reposition_and_zoom (framepos_t, double);
 
-	nframes64_t get_preferred_edit_position (bool ignore_playhead = false);
+	framepos_t get_preferred_edit_position (bool ignore_playhead = false);
 
 	bool update_mouse_speed ();
 	bool decelerate_mouse_speed ();
@@ -422,23 +422,23 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
 
 	int get_regionview_count_from_region_list (boost::shared_ptr<ARDOUR::Region>);
 
-	void do_import (std::vector<std::string> paths, Editing::ImportDisposition, Editing::ImportMode mode, ARDOUR::SrcQuality, nframes64_t&);
-	void do_embed (std::vector<std::string> paths, Editing::ImportDisposition, Editing::ImportMode mode,  nframes64_t&);
+	void do_import (std::vector<std::string> paths, Editing::ImportDisposition, Editing::ImportMode mode, ARDOUR::SrcQuality, framepos_t&);
+	void do_embed (std::vector<std::string> paths, Editing::ImportDisposition, Editing::ImportMode mode,  framepos_t&);
 
 	void get_regions_corresponding_to (boost::shared_ptr<ARDOUR::Region> region, std::vector<RegionView*>& regions);
 
 	void show_verbose_canvas_cursor_with (const std::string& txt);
 	void hide_verbose_canvas_cursor();
 
-	void center_screen (nframes64_t);
+	void center_screen (framepos_t);
 
 	TrackViewList axis_views_from_routes (boost::shared_ptr<ARDOUR::RouteList>) const;
 	Gtkmm2ext::TearOff* mouse_mode_tearoff () const { return _mouse_mode_tearoff; }
 	Gtkmm2ext::TearOff* tools_tearoff () const { return _tools_tearoff; }
 
-	void snap_to (nframes64_t& first, int32_t direction = 0, bool for_mark = false);
-	void snap_to_with_modifier (nframes64_t& first, GdkEvent const *, int32_t direction = 0, bool for_mark = false);
-	void snap_to (nframes64_t& first, nframes64_t& last, int32_t direction = 0, bool for_mark = false);
+	void snap_to (framepos_t& first, int32_t direction = 0, bool for_mark = false);
+	void snap_to_with_modifier (framepos_t& first, GdkEvent const *, int32_t direction = 0, bool for_mark = false);
+	void snap_to (framepos_t& first, framepos_t& last, int32_t direction = 0, bool for_mark = false);
 
 	void begin_reversible_command (std::string cmd_name);
 	void commit_reversible_command ();
@@ -476,7 +476,7 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
 
   protected:
 	void map_transport_state ();
-	void map_position_change (nframes64_t);
+	void map_position_change (framepos_t);
 
 	void on_realize();
 
@@ -487,7 +487,7 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
 	bool                 constructed;
 
 	// to keep track of the playhead position for control_scroll
-	boost::optional<nframes64_t> _control_scroll_target;
+	boost::optional<framepos_t> _control_scroll_target;
 
 	PlaylistSelector* _playlist_selector;
 
@@ -496,7 +496,7 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
 	struct VisualState {
 	    double              y_position;
 	    double              frames_per_unit;
-	    nframes64_t         leftmost_frame;
+	    framepos_t         leftmost_frame;
 	    Editing::ZoomFocus  zoom_focus;
 	    std::list<TAVState> track_states;
 	};
@@ -516,7 +516,7 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
 	void cancel_visual_state_op (uint32_t n);
 	bool end_visual_state_op (uint32_t n);
 
-	nframes64_t leftmost_frame;
+	framepos_t leftmost_frame;
 	double      frames_per_unit;
 	Editing::ZoomFocus zoom_focus;
 
@@ -588,7 +588,7 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
 	    void hide();
 	    void show ();
 	    void set_name (const std::string&);
-	    void set_position (nframes64_t start, nframes64_t end = 0);
+	    void set_position (framepos_t start, framepos_t end = 0);
 	    void set_color_rgba (uint32_t);
 	};
 
@@ -601,7 +601,7 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
 
 	void hide_marker (ArdourCanvas::Item*, GdkEvent*);
 	void clear_marker_display ();
-	void mouse_add_new_marker (nframes64_t where, bool is_cd=false, bool is_xrun=false);
+	void mouse_add_new_marker (framepos_t where, bool is_cd=false, bool is_xrun=false);
 	bool choose_new_marker_name(std::string &name);
 	void update_cd_marker_display ();
 	void ensure_cd_marker_updated (LocationMarkers * lam, ARDOUR::Location * location);
@@ -663,12 +663,12 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
 	Gtk::Menu * track_edit_playlist_submenu;
 	Gtk::Menu * track_selection_edit_playlist_submenu;
 
-	void popup_track_context_menu (int, int, ItemType, bool, nframes64_t);
-	Gtk::Menu* build_track_context_menu (nframes64_t);
-	Gtk::Menu* build_track_bus_context_menu (nframes64_t);
-	Gtk::Menu* build_track_region_context_menu (nframes64_t frame);
-	Gtk::Menu* build_track_crossfade_context_menu (nframes64_t);
-	Gtk::Menu* build_track_selection_context_menu (nframes64_t);
+	void popup_track_context_menu (int, int, ItemType, bool, framepos_t);
+	Gtk::Menu* build_track_context_menu (framepos_t);
+	Gtk::Menu* build_track_bus_context_menu (framepos_t);
+	Gtk::Menu* build_track_region_context_menu (framepos_t frame);
+	Gtk::Menu* build_track_crossfade_context_menu (framepos_t);
+	Gtk::Menu* build_track_selection_context_menu (framepos_t);
 	void add_dstream_context_items (Gtk::Menu_Helpers::MenuList&);
 	void add_bus_context_items (Gtk::Menu_Helpers::MenuList&);
 	void add_region_context_items (StreamView*, std::list<boost::shared_ptr<ARDOUR::Region> >, Gtk::Menu_Helpers::MenuList&,
@@ -784,7 +784,7 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
 	void compute_fixed_ruler_scale (); //calculates the RulerScale of the fixed rulers
 	void update_fixed_rulers ();
 	void update_tempo_based_rulers ();
-	void popup_ruler_menu (nframes64_t where = 0, ItemType type = RegionItem);
+	void popup_ruler_menu (framepos_t where = 0, ItemType type = RegionItem);
 	void update_ruler_visibility ();
 	void set_ruler_visible (RulerType, bool);
 	void toggle_ruler_visibility (RulerType rt);
@@ -845,7 +845,7 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
 	gint bbt_nmarks;
 	uint32_t bbt_bar_helper_on;
 	uint32_t bbt_accent_modulo;
-	void compute_bbt_ruler_scale (nframes64_t lower, nframes64_t upper);
+	void compute_bbt_ruler_scale (framepos_t lower, framepos_t upper);
 
 	gint metric_get_timecode (GtkCustomRulerMark **, gdouble, gdouble, gint);
 	gint metric_get_bbt (GtkCustomRulerMark **, gdouble, gdouble, gint);
@@ -895,7 +895,7 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
 	EditorCursor*        playhead_cursor;
 	ArdourCanvas::Group* cursor_group;
 
-	nframes64_t get_region_boundary (nframes64_t pos, int32_t dir, bool with_selection, bool only_onscreen);
+	framepos_t get_region_boundary (framepos_t pos, int32_t dir, bool with_selection, bool only_onscreen);
 
 	void    cursor_to_region_boundary (bool with_selection, int32_t dir);
 	void    cursor_to_next_region_boundary (bool with_selection);
@@ -963,7 +963,7 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
 
 	void control_scroll (float);
 	void access_action (std::string,std::string);
-	bool deferred_control_scroll (nframes64_t);
+	bool deferred_control_scroll (framepos_t);
 	sigc::connection control_scroll_connection;
 
 	gdouble get_trackview_group_vertical_offset () const { return vertical_adjustment.get_value () - canvas_timebars_vsize;}
@@ -984,7 +984,7 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
 		};
 
 		Type pending;
-		nframes64_t time_origin;
+		framepos_t time_origin;
 		double frames_per_unit;
 		double y_origin;
 
@@ -1002,7 +1002,7 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
 	static int _idle_visual_changer (void *arg);
 	int idle_visual_changer ();
 
-	void queue_visual_change (nframes64_t);
+	void queue_visual_change (framepos_t);
 	void queue_visual_change (double);
 	void queue_visual_change_y (double);
 	void ensure_visual_change_idle_handler ();
@@ -1017,15 +1017,15 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
 	static void build_cursors ();
 
 	sigc::connection super_rapid_screen_update_connection;
-	nframes64_t last_update_frame;
-	void center_screen_internal (nframes64_t, float);
+	framepos_t last_update_frame;
+	void center_screen_internal (framepos_t, float);
 
 	void super_rapid_screen_update ();
 
 	void session_going_away ();
 
-	nframes64_t cut_buffer_start;
-	nframes64_t cut_buffer_length;
+	framepos_t cut_buffer_start;
+	framecnt_t cut_buffer_length;
 
 	bool typed_event (ArdourCanvas::Item*, GdkEvent*, ItemType);
 	bool button_press_handler (ArdourCanvas::Item*, GdkEvent*, ItemType);
@@ -1040,7 +1040,7 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
 
 	void register_actions ();
 
-	int ensure_cursor (nframes64_t* pos);
+	int ensure_cursor (framepos_t* pos);
 
 	void cut_copy (Editing::CutCopyOp);
 	bool can_cut_copy () const;
@@ -1050,7 +1050,7 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
 	void cut_copy_midi (Editing::CutCopyOp);
 
 	void mouse_paste ();
-	void paste_internal (nframes64_t position, float times);
+	void paste_internal (framepos_t position, float times);
 
 	/* EDITING OPERATIONS */
 
@@ -1065,18 +1065,18 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
         void change_region_layering_order (ARDOUR::framepos_t);
 	void lower_region ();
 	void lower_region_to_bottom ();
-	void split_regions_at (nframes64_t, RegionSelection&);
+	void split_regions_at (framepos_t, RegionSelection&);
 	void split_region_at_transients ();
 	void split_region_at_points (boost::shared_ptr<ARDOUR::Region>, ARDOUR::AnalysisFeatureList&, bool can_ferret);
 	void crop_region_to_selection ();
-	void crop_region_to (nframes64_t start, nframes64_t end);
-	void set_sync_point (nframes64_t, const RegionSelection&);
+	void crop_region_to (framepos_t start, framepos_t end);
+	void set_sync_point (framepos_t, const RegionSelection&);
 	void set_region_sync_from_edit_point ();
 	void remove_region_sync();
-	void align_selection (ARDOUR::RegionPoint, nframes64_t position, const RegionSelection&);
-	void align_selection_relative (ARDOUR::RegionPoint point, nframes64_t position, const RegionSelection&);
-	void align_region (boost::shared_ptr<ARDOUR::Region>, ARDOUR::RegionPoint point, nframes64_t position);
-	void align_region_internal (boost::shared_ptr<ARDOUR::Region>, ARDOUR::RegionPoint point, nframes64_t position);
+	void align_selection (ARDOUR::RegionPoint, framepos_t position, const RegionSelection&);
+	void align_selection_relative (ARDOUR::RegionPoint point, framepos_t position, const RegionSelection&);
+	void align_region (boost::shared_ptr<ARDOUR::Region>, ARDOUR::RegionPoint point, framepos_t position);
+	void align_region_internal (boost::shared_ptr<ARDOUR::Region>, ARDOUR::RegionPoint point, framepos_t position);
 	void remove_selected_regions ();
 	void remove_clicked_region ();
 	void edit_region ();
@@ -1100,14 +1100,14 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
 	void fork_region ();
 
 	void do_insert_time ();
-	void insert_time (nframes64_t, nframes64_t, Editing::InsertTimeOption, bool, bool, bool, bool, bool);
+	void insert_time (framepos_t, framecnt_t, Editing::InsertTimeOption, bool, bool, bool, bool, bool);
 
 	void tab_to_transient (bool forward);
 
 	void use_region_as_bar ();
 	void use_range_as_bar ();
 
-	void define_one_bar (nframes64_t start, nframes64_t end);
+	void define_one_bar (framepos_t start, framepos_t end);
 
 	void audition_region_from_region_list ();
 	void hide_region_from_region_list ();
@@ -1152,8 +1152,8 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
 	void zoom_to_region (bool both_axes);
 	void temporal_zoom_session ();
 	void temporal_zoom (gdouble scale);
-	void temporal_zoom_by_frame (nframes64_t start, nframes64_t end, const std::string & op);
-	void temporal_zoom_to_frame (bool coarser, nframes64_t frame);
+	void temporal_zoom_by_frame (framepos_t start, framepos_t end, const std::string & op);
+	void temporal_zoom_to_frame (bool coarser, framepos_t frame);
 
 	void amplitude_zoom (gdouble scale);
 	void amplitude_zoom_step (bool in);
@@ -1174,19 +1174,19 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
 
 	SoundFileOmega* sfbrowser;
 
-	void bring_in_external_audio (Editing::ImportMode mode,  nframes64_t& pos);
+	void bring_in_external_audio (Editing::ImportMode mode,  framepos_t& pos);
 
-	bool  idle_drop_paths  (std::vector<std::string> paths, nframes64_t frame, double ypos);
-	void  drop_paths_part_two  (const std::vector<std::string>& paths, nframes64_t frame, double ypos);
+	bool  idle_drop_paths  (std::vector<std::string> paths, framepos_t frame, double ypos);
+	void  drop_paths_part_two  (const std::vector<std::string>& paths, framepos_t frame, double ypos);
 
-	int  import_sndfiles (std::vector<std::string> paths, Editing::ImportMode mode,  ARDOUR::SrcQuality, nframes64_t& pos,
+	int  import_sndfiles (std::vector<std::string> paths, Editing::ImportMode mode,  ARDOUR::SrcQuality, framepos_t& pos,
 			      int target_regions, int target_tracks, boost::shared_ptr<ARDOUR::Track>&, bool);
 	int  embed_sndfiles (std::vector<std::string> paths, bool multiple_files, bool& check_sample_rate, Editing::ImportMode mode,
-			     nframes64_t& pos, int target_regions, int target_tracks, boost::shared_ptr<ARDOUR::Track>&);
+			     framepos_t& pos, int target_regions, int target_tracks, boost::shared_ptr<ARDOUR::Track>&);
 
-	int add_sources (std::vector<std::string> paths, ARDOUR::SourceList& sources, nframes64_t& pos, Editing::ImportMode,
+	int add_sources (std::vector<std::string> paths, ARDOUR::SourceList& sources, framepos_t& pos, Editing::ImportMode,
 			 int target_regions, int target_tracks, boost::shared_ptr<ARDOUR::Track>&, bool add_channel_suffix);
-	int finish_bringing_in_material (boost::shared_ptr<ARDOUR::Region> region, uint32_t, uint32_t,  nframes64_t& pos, Editing::ImportMode mode,
+	int finish_bringing_in_material (boost::shared_ptr<ARDOUR::Region> region, uint32_t, uint32_t,  framepos_t& pos, Editing::ImportMode mode,
 				      boost::shared_ptr<ARDOUR::Track>& existing_track);
 
 	boost::shared_ptr<ARDOUR::AudioTrack> get_nth_selected_audio_track (int nth) const;
@@ -1200,7 +1200,7 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
 
 	struct EditorImportStatus : public ARDOUR::ImportStatus {
 	    Editing::ImportMode mode;
-	    nframes64_t pos;
+	    framepos_t pos;
 	    int target_tracks;
 	    int target_regions;
 	    boost::shared_ptr<ARDOUR::Track> track;
@@ -1257,7 +1257,7 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
 	void set_selection_from_loop ();
 	void set_selection_from_region ();
 
-	void add_location_mark (nframes64_t where);
+	void add_location_mark (framepos_t where);
 	void add_location_from_audio_region ();
 	void add_locations_from_audio_region ();
 	void add_location_from_selection ();
@@ -1269,8 +1269,8 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
 	void set_loop_from_region (bool play);
 	void set_punch_from_edit_range ();
 
-	void set_loop_range (nframes64_t start, nframes64_t end, std::string cmd);
-	void set_punch_range (nframes64_t start, nframes64_t end, std::string cmd);
+	void set_loop_range (framepos_t start, framepos_t end, std::string cmd);
+	void set_punch_range (framepos_t start, framepos_t end, std::string cmd);
 
 	void add_location_from_playhead_cursor ();
 	bool select_new_marker;
@@ -1282,12 +1282,12 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
 	int scrubbing_direction;
 	int scrub_reversals;
 	int scrub_reverse_distance;
-	void scrub (nframes64_t, double);
+	void scrub (framepos_t, double);
 
 	void keyboard_selection_begin ();
 	void keyboard_selection_finish (bool add);
 	bool have_pending_keyboard_selection;
-	nframes64_t pending_keyboard_selection_start;
+	framepos_t pending_keyboard_selection_start;
 
 	boost::shared_ptr<ARDOUR::Region> select_region_for_operation (int dir, TimeAxisView **tv);
 	void extend_selection_to_end_of_region (bool next);
@@ -1337,11 +1337,11 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
 	void remove_gain_control_point (ArdourCanvas::Item*, GdkEvent*);
 	void remove_control_point (ArdourCanvas::Item*, GdkEvent*);
 
-	void mouse_brush_insert_region (RegionView*, nframes64_t pos);
-	void brush (nframes64_t);
+	void mouse_brush_insert_region (RegionView*, framepos_t pos);
+	void brush (framepos_t);
 
-	void show_verbose_time_cursor (nframes64_t frame, double offset = 0, double xpos=-1, double ypos=-1);
-	void show_verbose_duration_cursor (nframes64_t start, nframes64_t end, double offset = 0, double xpos=-1, double ypos=-1);
+	void show_verbose_time_cursor (framepos_t frame, double offset = 0, double xpos=-1, double ypos=-1);
+	void show_verbose_duration_cursor (framepos_t start, framepos_t end, double offset = 0, double xpos=-1, double ypos=-1);
 	double clamp_verbose_cursor_x (double);
 	double clamp_verbose_cursor_y (double);
 
@@ -1439,8 +1439,8 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
 
 	void new_tempo_section ();
 
-	void mouse_add_new_tempo_event (nframes64_t where);
-	void mouse_add_new_meter_event (nframes64_t where);
+	void mouse_add_new_tempo_event (framepos_t where);
+	void mouse_add_new_meter_event (framepos_t where);
 
 	void remove_tempo_marker (ArdourCanvas::Item*);
 	void remove_meter_marker (ArdourCanvas::Item*);
@@ -1623,7 +1623,7 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
 	void region_selection_op (void (ARDOUR::Region::*pmf)(void*), void*);
 	void region_selection_op (void (ARDOUR::Region::*pmf)(bool), bool);
 
-	bool audio_region_selection_covers (nframes64_t where);
+	bool audio_region_selection_covers (framepos_t where);
 
 	/* transport range select process */
 
@@ -1651,14 +1651,14 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
 
 	/* object rubberband select process */
 
-	bool select_all_within (nframes64_t, nframes64_t, double, double, TrackViewList const &, Selection::Operation, bool);
+	bool select_all_within (framepos_t, framepos_t, double, double, TrackViewList const &, Selection::Operation, bool);
 
 	ArdourCanvas::SimpleRect   *rubberband_rect;
 
 	/* mouse zoom process */
 
 	ArdourCanvas::SimpleRect   *zoom_rect;
-	void reposition_zoom_rect (nframes64_t start, nframes64_t end);
+	void reposition_zoom_rect (framepos_t start, framepos_t end);
 
 	EditorRouteGroups* _route_groups;
 	EditorRoutes* _routes;
@@ -1685,7 +1685,7 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
 	int last_autoscroll_x;
 	int last_autoscroll_y;
 	uint32_t autoscroll_cnt;
-	nframes64_t autoscroll_x_distance;
+	framecnt_t autoscroll_x_distance;
 	double autoscroll_y_distance;
 
 	static gint _autoscroll_canvas (void *);
@@ -1694,10 +1694,10 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
 	void stop_canvas_autoscroll ();
 
 	/* trimming */
-	void point_trim (GdkEvent *, nframes64_t);
-	void single_contents_trim (RegionView&, nframes64_t, bool, bool);
-	void single_start_trim (RegionView&, nframes64_t, bool);
-	void single_end_trim (RegionView&, nframes64_t, bool);
+	void point_trim (GdkEvent *, framepos_t);
+	void single_contents_trim (RegionView&, framepos_t, bool, bool);
+	void single_start_trim (RegionView&, framepos_t, bool);
+	void single_end_trim (RegionView&, framepos_t, bool);
 
 	void thaw_region_after_trim (RegionView& rv);
 
@@ -1808,11 +1808,11 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
 
 	void duplicate_dialog (bool with_dialog);
 
-	nframes64_t event_frame (GdkEvent const *, double* px = 0, double* py = 0) const;
+	framepos_t event_frame (GdkEvent const *, double* px = 0, double* py = 0) const;
 
 	/* returns false if mouse pointer is not in track or marker canvas
 	 */
-	bool mouse_frame (nframes64_t&, bool& in_track_canvas) const;
+	bool mouse_frame (framepos_t&, bool& in_track_canvas) const;
 
 	/* "whats mine is yours" */
 
@@ -1975,10 +1975,10 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
 
 	void selected_marker_moved (ARDOUR::Location*);
 
-	bool get_edit_op_range (nframes64_t& start, nframes64_t& end) const;
+	bool get_edit_op_range (framepos_t& start, framepos_t& end) const;
 
-	void get_regions_at (RegionSelection&, nframes64_t where, const TrackViewList& ts) const;
-	void get_regions_after (RegionSelection&, nframes64_t where, const TrackViewList& ts) const;
+	void get_regions_at (RegionSelection&, framepos_t where, const TrackViewList& ts) const;
+	void get_regions_after (RegionSelection&, framepos_t where, const TrackViewList& ts) const;
 
 	void get_regions_for_action (RegionSelection&, bool allow_entered = false, bool allow_edit_position = true);
 
@@ -1989,8 +1989,8 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
 	void select_next_route ();
 	void select_prev_route ();
 
-	void snap_to_internal (nframes64_t& first, int32_t direction = 0, bool for_mark = false);
-	void timecode_snap_to_internal (nframes64_t& first, int32_t direction = 0, bool for_mark = false);
+	void snap_to_internal (framepos_t& first, int32_t direction = 0, bool for_mark = false);
+	void timecode_snap_to_internal (framepos_t& first, int32_t direction = 0, bool for_mark = false);
 
 	RhythmFerret* rhythm_ferret;
 	BundleManager* _bundle_manager;
diff --git a/gtk2_ardour/editor_audio_import.cc b/gtk2_ardour/editor_audio_import.cc
index db470fbe64..d3a2dd6608 100644
--- a/gtk2_ardour/editor_audio_import.cc
+++ b/gtk2_ardour/editor_audio_import.cc
@@ -156,7 +156,7 @@ Editor::external_audio_dialog ()
 		ImportPosition pos = sfbrowser->get_position ();
 		ImportMode mode = sfbrowser->get_mode ();
 		ImportDisposition chns = sfbrowser->get_channel_disposition ();
-		nframes64_t where;
+		framepos_t where;
 
 		switch (pos) {
 			case ImportAtEditPoint:
@@ -325,7 +325,7 @@ Editor::get_nth_selected_midi_track (int nth) const
 }
 
 void
-Editor::do_import (vector<string> paths, ImportDisposition chns, ImportMode mode, SrcQuality quality, nframes64_t& pos)
+Editor::do_import (vector<string> paths, ImportDisposition chns, ImportMode mode, SrcQuality quality, framepos_t& pos)
 {
 	boost::shared_ptr<Track> track;
 	vector<string> to_import;
@@ -426,7 +426,7 @@ Editor::do_import (vector<string> paths, ImportDisposition chns, ImportMode mode
 }
 
 void
-Editor::do_embed (vector<string> paths, ImportDisposition chns, ImportMode mode, nframes64_t& pos)
+Editor::do_embed (vector<string> paths, ImportDisposition chns, ImportMode mode, framepos_t& pos)
 {
 	boost::shared_ptr<Track> track;
 	bool check_sample_rate = true;
@@ -492,7 +492,7 @@ Editor::do_embed (vector<string> paths, ImportDisposition chns, ImportMode mode,
 }
 
 int
-Editor::import_sndfiles (vector<string> paths, ImportMode mode, SrcQuality quality, nframes64_t& pos,
+Editor::import_sndfiles (vector<string> paths, ImportMode mode, SrcQuality quality, framepos_t& pos,
 			 int target_regions, int target_tracks, boost::shared_ptr<Track>& track, bool replace)
 {
 	import_status.paths = paths;
@@ -550,7 +550,7 @@ Editor::import_sndfiles (vector<string> paths, ImportMode mode, SrcQuality quali
 
 int
 Editor::embed_sndfiles (vector<string> paths, bool multifile,
-			bool& check_sample_rate, ImportMode mode, nframes64_t& pos, int target_regions, int target_tracks,
+			bool& check_sample_rate, ImportMode mode, framepos_t& pos, int target_regions, int target_tracks,
 			boost::shared_ptr<Track>& track)
 {
 	boost::shared_ptr<AudioFileSource> source;
@@ -717,7 +717,7 @@ Editor::embed_sndfiles (vector<string> paths, bool multifile,
 }
 
 int
-Editor::add_sources (vector<string> paths, SourceList& sources, nframes64_t& pos, ImportMode mode,
+Editor::add_sources (vector<string> paths, SourceList& sources, framepos_t& pos, ImportMode mode,
 		     int target_regions, int target_tracks, boost::shared_ptr<Track>& track, bool /*add_channel_suffix*/)
 {
 	vector<boost::shared_ptr<Region> > regions;
@@ -865,7 +865,7 @@ Editor::add_sources (vector<string> paths, SourceList& sources, nframes64_t& pos
 }
 
 int
-Editor::finish_bringing_in_material (boost::shared_ptr<Region> region, uint32_t in_chans, uint32_t out_chans, nframes64_t& pos,
+Editor::finish_bringing_in_material (boost::shared_ptr<Region> region, uint32_t in_chans, uint32_t out_chans, framepos_t& pos,
 				  ImportMode mode, boost::shared_ptr<Track>& existing_track)
 {
 	boost::shared_ptr<AudioRegion> ar = boost::dynamic_pointer_cast<AudioRegion>(region);
diff --git a/gtk2_ardour/editor_canvas.cc b/gtk2_ardour/editor_canvas.cc
index 004c4a3fd2..5989cb7c92 100644
--- a/gtk2_ardour/editor_canvas.cc
+++ b/gtk2_ardour/editor_canvas.cc
@@ -57,7 +57,7 @@ using namespace Glib;
 using namespace Gtkmm2ext;
 using namespace Editing;
 
-/* XXX this is a hack. it ought to be the maximum value of an nframes64_t */
+/* XXX this is a hack. it ought to be the maximum value of an framepos_t */
 
 const double max_canvas_coordinate = (double) JACK_MAX_FRAMES;
 
@@ -443,14 +443,14 @@ Editor::track_canvas_drag_data_received (const RefPtr<Gdk::DragContext>& context
 }
 
 bool
-Editor::idle_drop_paths (vector<string> paths, nframes64_t frame, double ypos)
+Editor::idle_drop_paths (vector<string> paths, framepos_t frame, double ypos)
 {
 	drop_paths_part_two (paths, frame, ypos);
 	return false;
 }
 
 void
-Editor::drop_paths_part_two (const vector<string>& paths, nframes64_t frame, double ypos)
+Editor::drop_paths_part_two (const vector<string>& paths, framepos_t frame, double ypos)
 {
 	RouteTimeAxisView* tv;
 
@@ -492,7 +492,7 @@ Editor::drop_paths (const RefPtr<Gdk::DragContext>& context,
 {
 	vector<string> paths;
 	GdkEvent ev;
-	nframes64_t frame;
+	framepos_t frame;
 	double wx;
 	double wy;
 	double cy;
@@ -538,7 +538,7 @@ Editor::drop_regions (const RefPtr<Gdk::DragContext>& /*context*/,
 void
 Editor::maybe_autoscroll (bool allow_horiz, bool allow_vert)
 {
-	nframes64_t rightmost_frame = leftmost_frame + current_page_frames();
+	framepos_t rightmost_frame = leftmost_frame + current_page_frames();
 	bool startit = false;
 
 	double ty = _drags->current_pointer_y() - get_trackview_group_vertical_offset ();
@@ -715,7 +715,7 @@ Editor::start_canvas_autoscroll (int dx, int dy)
 	autoscroll_active = true;
 	autoscroll_x = dx;
 	autoscroll_y = dy;
-	autoscroll_x_distance = (nframes64_t) floor (current_page_frames()/50.0);
+	autoscroll_x_distance = (framepos_t) floor (current_page_frames()/50.0);
 	autoscroll_y_distance = fabs (dy * 5); /* pixels */
 	autoscroll_cnt = 0;
 
@@ -780,7 +780,7 @@ Editor::set_horizontal_position (double p)
 	time_line_group->move (x_delta, 0);
 	cursor_group->move (x_delta, 0);
 
-	leftmost_frame = (nframes64_t) floor (p * frames_per_unit);
+	leftmost_frame = (framepos_t) floor (p * frames_per_unit);
 
 	update_fixed_rulers ();
 	redisplay_tempo (true);
diff --git a/gtk2_ardour/editor_canvas_events.cc b/gtk2_ardour/editor_canvas_events.cc
index eb37d11282..d25492287d 100644
--- a/gtk2_ardour/editor_canvas_events.cc
+++ b/gtk2_ardour/editor_canvas_events.cc
@@ -61,7 +61,7 @@ using Gtkmm2ext::Keyboard;
 bool
 Editor::track_canvas_scroll (GdkEventScroll* ev)
 {
-	nframes64_t xdelta;
+	framepos_t xdelta;
 	int direction = ev->direction;
 
   retry:
@@ -1033,7 +1033,7 @@ Editor::track_canvas_drag_motion (Glib::RefPtr<Gdk::DragContext> const & /*c*/,
 
 		double px;
 		double py;
-		nframes64_t const pos = event_frame (&event, &px, &py);
+		framepos_t const pos = event_frame (&event, &px, &py);
 
 		std::pair<TimeAxisView*, int> const tv = trackview_by_y_position (py);
 		if (tv.first == 0) {
diff --git a/gtk2_ardour/editor_cursors.cc b/gtk2_ardour/editor_cursors.cc
index 89d2fcbaa1..e2a04d939b 100644
--- a/gtk2_ardour/editor_cursors.cc
+++ b/gtk2_ardour/editor_cursors.cc
@@ -56,7 +56,7 @@ EditorCursor::~EditorCursor ()
 }
 
 void
-EditorCursor::set_position (nframes64_t frame)
+EditorCursor::set_position (framepos_t frame)
 {
 	PositionChanged (frame);
 
diff --git a/gtk2_ardour/editor_export_audio.cc b/gtk2_ardour/editor_export_audio.cc
index 6aa43c8bcf..bab5d4c1e6 100644
--- a/gtk2_ardour/editor_export_audio.cc
+++ b/gtk2_ardour/editor_export_audio.cc
@@ -159,11 +159,11 @@ bool
 Editor::write_region (string path, boost::shared_ptr<AudioRegion> region)
 {
 	boost::shared_ptr<AudioFileSource> fs;
-	const nframes64_t chunk_size = 4096;
-	nframes64_t to_read;
+	const framepos_t chunk_size = 4096;
+	framepos_t to_read;
 	Sample buf[chunk_size];
 	gain_t gain_buffer[chunk_size];
-	nframes64_t pos;
+	framepos_t pos;
 	char s[PATH_MAX+1];
 	uint32_t cnt;
 	vector<boost::shared_ptr<AudioFileSource> > sources;
@@ -231,7 +231,7 @@ Editor::write_region (string path, boost::shared_ptr<AudioRegion> region)
 	pos = region->position();
 
 	while (to_read) {
-		nframes64_t this_time;
+		framepos_t this_time;
 
 		this_time = min (to_read, chunk_size);
 
@@ -309,11 +309,11 @@ bool
 Editor::write_audio_range (AudioPlaylist& playlist, const ChanCount& count, list<AudioRange>& range)
 {
 	boost::shared_ptr<AudioFileSource> fs;
-	const nframes64_t chunk_size = 4096;
-	nframes64_t nframes;
+	const framepos_t chunk_size = 4096;
+	framepos_t nframes;
 	Sample buf[chunk_size];
 	gain_t gain_buffer[chunk_size];
-	nframes64_t pos;
+	framepos_t pos;
 	char s[PATH_MAX+1];
 	uint32_t cnt;
 	string path;
@@ -369,7 +369,7 @@ Editor::write_audio_range (AudioPlaylist& playlist, const ChanCount& count, list
 		pos = (*i).start;
 
 		while (nframes) {
-			nframes64_t this_time;
+			framepos_t this_time;
 
 			this_time = min (nframes, chunk_size);
 
@@ -401,7 +401,7 @@ Editor::write_audio_range (AudioPlaylist& playlist, const ChanCount& count, list
 
 			while (nframes) {
 
-				nframes64_t this_time = min (nframes, chunk_size);
+				framepos_t this_time = min (nframes, chunk_size);
 				memset (buf, 0, sizeof (Sample) * this_time);
 
 				for (uint32_t n=0; n < channels; ++n) {
diff --git a/gtk2_ardour/editor_imageframe.cc b/gtk2_ardour/editor_imageframe.cc
index bac689b48f..752e43a585 100644
--- a/gtk2_ardour/editor_imageframe.cc
+++ b/gtk2_ardour/editor_imageframe.cc
@@ -113,10 +113,10 @@ void
 Editor::scroll_timeaxis_to_imageframe_item(const TimeAxisViewItem* item)
 {
 	// GTK2FIX
-	//nframes64_t offset = static_cast<nframes64_t>(frames_per_unit * (edit_hscroll_slider_width/2)) ;
-	nframes64_t offset = 0;
+	//framepos_t offset = static_cast<framepos_t>(frames_per_unit * (edit_hscroll_slider_width/2)) ;
+	framepos_t offset = 0;
 
-	nframes64_t x_pos = 0 ;
+	framepos_t x_pos = 0 ;
 
 	if (item->get_position() < offset) {
 		x_pos = 0 ;
@@ -489,14 +489,14 @@ Editor::markerview_drag_motion_callback(ArdourCanvas::Item*, GdkEvent* event)
 	double cx, cy ;
 
   	MarkerView* mv = reinterpret_cast<MarkerView*>(drag_info.data) ;
-	nframes64_t pending_region_position ;
-	nframes64_t pointer_frame ;
+	framepos_t pending_region_position ;
+	framepos_t pointer_frame ;
 
 	pointer_frame = event_frame(event, &cx, &cy) ;
 
   	snap_to(pointer_frame) ;
 
-	if (pointer_frame > (nframes64_t) drag_info.pointer_frame_offset)
+	if (pointer_frame > (framepos_t) drag_info.pointer_frame_offset)
 	{
 		pending_region_position = pointer_frame - drag_info.pointer_frame_offset ;
 		snap_to(pending_region_position) ;
@@ -537,14 +537,14 @@ Editor::imageframe_drag_motion_callback(ArdourCanvas::Item*, GdkEvent* event)
 
 	ImageFrameView* ifv = reinterpret_cast<ImageFrameView*>(drag_info.data) ;
 
-	nframes64_t pending_region_position;
-	nframes64_t pointer_frame;
+	framepos_t pending_region_position;
+	framepos_t pointer_frame;
 
 	pointer_frame = event_frame(event, &cx, &cy) ;
 
 	snap_to(pointer_frame) ;
 
-	if (pointer_frame > (nframes64_t) drag_info.pointer_frame_offset)
+	if (pointer_frame > (framepos_t) drag_info.pointer_frame_offset)
 	{
 		pending_region_position = pointer_frame - drag_info.pointer_frame_offset ;
 		snap_to(pending_region_position) ;
@@ -572,7 +572,7 @@ Editor::imageframe_drag_motion_callback(ArdourCanvas::Item*, GdkEvent* event)
 void
 Editor::timeaxis_item_drag_finished_callback(ArdourCanvas::Item*, GdkEvent* event)
 {
-	nframes64_t where ;
+	framepos_t where ;
 	TimeAxisViewItem* tavi = reinterpret_cast<TimeAxisViewItem*>(drag_info.data) ;
 
 	bool item_x_movement = (drag_info.last_frame_position != tavi->get_position()) ;
@@ -670,9 +670,9 @@ Editor::imageframe_start_handle_trim_motion(ArdourCanvas::Item* item, GdkEvent*
 {
 	ImageFrameView* ifv = reinterpret_cast<ImageFrameView*> (drag_info.data) ;
 
-	nframes64_t start = 0 ;
-	nframes64_t end = 0 ;
-	nframes64_t pointer_frame = event_frame(event) ;
+	framepos_t start = 0 ;
+	framepos_t end = 0 ;
+	framepos_t pointer_frame = event_frame(event) ;
 
 	// chekc th eposition of the item is not locked
 	if(!ifv->get_position_locked()) {
@@ -689,7 +689,7 @@ Editor::imageframe_start_handle_trim_motion(ArdourCanvas::Item* item, GdkEvent*
 			}
 
 			// are we getting bigger or smaller?
-			nframes64_t new_dur_val = end - start ;
+			framepos_t new_dur_val = end - start ;
 
 			// start handle, so a smaller pointer frame increases our component size
 			if(pointer_frame <= drag_info.grab_frame)
@@ -747,10 +747,10 @@ Editor::imageframe_start_handle_end_trim(ArdourCanvas::Item* item, GdkEvent* eve
 	}
 	else
 	{
-		nframes64_t temp = ifv->get_position() + ifv->get_duration() ;
+		framepos_t temp = ifv->get_position() + ifv->get_duration() ;
 
-		ifv->set_position((nframes64_t) (temp - drag_info.cumulative_x_drag), this) ;
-		ifv->set_duration((nframes64_t) drag_info.cumulative_x_drag, this) ;
+		ifv->set_position((framepos_t) (temp - drag_info.cumulative_x_drag), this) ;
+		ifv->set_duration((framepos_t) drag_info.cumulative_x_drag, this) ;
 	}
 }
 
@@ -759,10 +759,10 @@ Editor::imageframe_end_handle_trim_motion(ArdourCanvas::Item* item, GdkEvent* ev
 {
 	ImageFrameView* ifv = reinterpret_cast<ImageFrameView *> (drag_info.data) ;
 
-	nframes64_t start = 0 ;
-	nframes64_t end = 0 ;
-	nframes64_t pointer_frame = event_frame(event) ;
-	nframes64_t new_dur_val = 0 ;
+	framepos_t start = 0 ;
+	framepos_t end = 0 ;
+	framepos_t pointer_frame = event_frame(event) ;
+	framepos_t new_dur_val = 0 ;
 
 	snap_to(pointer_frame) ;
 
@@ -824,7 +824,7 @@ Editor::imageframe_end_handle_end_trim (ArdourCanvas::Item* item, GdkEvent* even
 	}
 	else
 	{
-		nframes64_t new_duration = (nframes64_t)drag_info.cumulative_x_drag ;
+		framepos_t new_duration = (framepos_t)drag_info.cumulative_x_drag ;
 		if((new_duration <= ifv->get_max_duration()) && (new_duration >= ifv->get_min_duration()))
 		{
 			ifv->set_duration(new_duration, this) ;
@@ -884,9 +884,9 @@ Editor::markerview_start_handle_trim_motion(ArdourCanvas::Item* item, GdkEvent*
 {
 	MarkerView* mv = reinterpret_cast<MarkerView*> (drag_info.data) ;
 
-	nframes64_t start = 0 ;
-	nframes64_t end = 0 ;
-	nframes64_t pointer_frame = event_frame(event) ;
+	framepos_t start = 0 ;
+	framepos_t end = 0 ;
+	framepos_t pointer_frame = event_frame(event) ;
 
 	// chekc th eposition of the item is not locked
 	if(!mv->get_position_locked())
@@ -907,7 +907,7 @@ Editor::markerview_start_handle_trim_motion(ArdourCanvas::Item* item, GdkEvent*
 			}
 
 			// are we getting bigger or smaller?
-			nframes64_t new_dur_val = end - start ;
+			framepos_t new_dur_val = end - start ;
 
 			if(pointer_frame <= drag_info.grab_frame)
 			{
@@ -964,10 +964,10 @@ Editor::markerview_start_handle_end_trim(ArdourCanvas::Item* item, GdkEvent* eve
 	}
 	else
 	{
-		nframes64_t temp = mv->get_position() + mv->get_duration() ;
+		framepos_t temp = mv->get_position() + mv->get_duration() ;
 
-		mv->set_position((nframes64_t) (temp - drag_info.cumulative_x_drag), this) ;
-		mv->set_duration((nframes64_t) drag_info.cumulative_x_drag, this) ;
+		mv->set_position((framepos_t) (temp - drag_info.cumulative_x_drag), this) ;
+		mv->set_duration((framepos_t) drag_info.cumulative_x_drag, this) ;
 	}
 }
 
@@ -976,10 +976,10 @@ Editor::markerview_end_handle_trim_motion(ArdourCanvas::Item* item, GdkEvent* ev
 {
 	MarkerView* mv = reinterpret_cast<MarkerView*> (drag_info.data) ;
 
-	nframes64_t start = 0 ;
-	nframes64_t end = 0 ;
-	nframes64_t pointer_frame = event_frame(event) ;
-	nframes64_t new_dur_val = 0 ;
+	framepos_t start = 0 ;
+	framepos_t end = 0 ;
+	framepos_t pointer_frame = event_frame(event) ;
+	framepos_t new_dur_val = 0 ;
 
 	snap_to(pointer_frame) ;
 
@@ -1004,7 +1004,7 @@ Editor::markerview_end_handle_trim_motion(ArdourCanvas::Item* item, GdkEvent* ev
 		{
 			// we cant extend beyond the item we are marking
 			ImageFrameView* marked_item = mv->get_marked_item() ;
-			nframes64_t marked_end = marked_item->get_position() + marked_item->get_duration() ;
+			framepos_t marked_end = marked_item->get_position() + marked_item->get_duration() ;
 
 			if(mv->get_max_duration_active() && (new_dur_val > mv->get_max_duration()))
 			{
@@ -1058,7 +1058,7 @@ Editor::markerview_end_handle_end_trim (ArdourCanvas::Item* item, GdkEvent* even
 	}
 	else
 	{
-		nframes64_t new_duration = (nframes64_t)drag_info.cumulative_x_drag ;
+		framepos_t new_duration = (framepos_t)drag_info.cumulative_x_drag ;
 		mv->set_duration(new_duration, this) ;
 	}
 }
diff --git a/gtk2_ardour/editor_keys.cc b/gtk2_ardour/editor_keys.cc
index 0d46665782..2ef22c8273 100644
--- a/gtk2_ardour/editor_keys.cc
+++ b/gtk2_ardour/editor_keys.cc
@@ -43,7 +43,7 @@ Editor::keyboard_selection_finish (bool add)
 {
 	if (_session && have_pending_keyboard_selection) {
 
-		nframes64_t end;
+		framepos_t end;
 		bool ignored;
 
 		if (_session->transport_rolling()) {
@@ -73,7 +73,7 @@ Editor::keyboard_selection_begin ()
 			have_pending_keyboard_selection = true;
 		} else {
 			bool ignored;
-			nframes64_t where; // XXX fix me
+			framepos_t where; // XXX fix me
 
 			if (mouse_frame (where, ignored)) {
 				pending_keyboard_selection_start = where;
diff --git a/gtk2_ardour/editor_markers.cc b/gtk2_ardour/editor_markers.cc
index 8e486aa6cc..053080fb49 100644
--- a/gtk2_ardour/editor_markers.cc
+++ b/gtk2_ardour/editor_markers.cc
@@ -381,8 +381,8 @@ Editor::LocationMarkers::set_name (const string& str)
 }
 
 void
-Editor::LocationMarkers::set_position (nframes64_t startf,
-				       nframes64_t endf)
+Editor::LocationMarkers::set_position (framepos_t startf,
+				       framepos_t endf)
 {
 	start->set_position (startf);
 	if (end) { end->set_position (endf); }
@@ -396,7 +396,7 @@ Editor::LocationMarkers::set_color_rgba (uint32_t rgba)
 }
 
 void
-Editor::mouse_add_new_marker (nframes64_t where, bool is_cd, bool is_xrun)
+Editor::mouse_add_new_marker (framepos_t where, bool is_cd, bool is_xrun)
 {
 	string markername, markerprefix;
 	int flags = (is_cd ? Location::IsCDMarker|Location::IsMark : Location::IsMark);
@@ -866,8 +866,8 @@ Editor::marker_menu_range_to_next ()
 		return;
 	}
 
-	nframes64_t start;
-	nframes64_t end;
+	framepos_t start;
+	framepos_t end;
 	_session->locations()->marks_either_side (marker->position(), start, end);
 
 	if (end != max_framepos) {
diff --git a/gtk2_ardour/editor_mouse.cc b/gtk2_ardour/editor_mouse.cc
index 11c510716a..51064f87cc 100644
--- a/gtk2_ardour/editor_mouse.cc
+++ b/gtk2_ardour/editor_mouse.cc
@@ -84,7 +84,7 @@ using namespace Editing;
 using Gtkmm2ext::Keyboard;
 
 bool
-Editor::mouse_frame (nframes64_t& where, bool& in_track_canvas) const
+Editor::mouse_frame (framepos_t& where, bool& in_track_canvas) const
 {
 	int x, y;
 	double wx, wy;
@@ -117,7 +117,7 @@ Editor::mouse_frame (nframes64_t& where, bool& in_track_canvas) const
 	return true;
 }
 
-nframes64_t
+framepos_t
 Editor::event_frame (GdkEvent const * event, double* pcx, double* pcy) const
 {
 	double cx, cy;
@@ -1832,7 +1832,7 @@ Editor::left_automation_track ()
 }
 
 void
-Editor::scrub (nframes64_t frame, double current_x)
+Editor::scrub (framepos_t frame, double current_x)
 {
 	double delta;
 
@@ -2065,34 +2065,34 @@ Editor::region_view_item_click (AudioRegionView& rv, GdkEventButton* event)
 			speed = rtv->track()->speed();
 		}
 
-		nframes64_t where = get_preferred_edit_position();
+		framepos_t where = get_preferred_edit_position();
 
 		if (where >= 0) {
 
 			if (Keyboard::modifier_state_equals (event->state, Keyboard::ModifierMask (Keyboard::PrimaryModifier|Keyboard::SecondaryModifier))) {
 
-				align_region (rv.region(), SyncPoint, (nframes64_t) (where * speed));
+				align_region (rv.region(), SyncPoint, (framepos_t) (where * speed));
 
 			} else if (Keyboard::modifier_state_equals (event->state, Keyboard::ModifierMask (Keyboard::PrimaryModifier|Keyboard::TertiaryModifier))) {
 
-				align_region (rv.region(), End, (nframes64_t) (where * speed));
+				align_region (rv.region(), End, (framepos_t) (where * speed));
 
 			} else {
 
-				align_region (rv.region(), Start, (nframes64_t) (where * speed));
+				align_region (rv.region(), Start, (framepos_t) (where * speed));
 			}
 		}
 	}
 }
 
 void
-Editor::show_verbose_time_cursor (nframes64_t frame, double offset, double xpos, double ypos)
+Editor::show_verbose_time_cursor (framepos_t frame, double offset, double xpos, double ypos)
 {
 	char buf[128];
 	Timecode::Time timecode;
 	BBT_Time bbt;
 	int hours, mins;
-	nframes64_t frame_rate;
+	framepos_t frame_rate;
 	float secs;
 
 	if (_session == 0) {
@@ -2143,14 +2143,14 @@ Editor::show_verbose_time_cursor (nframes64_t frame, double offset, double xpos,
 }
 
 void
-Editor::show_verbose_duration_cursor (nframes64_t start, nframes64_t end, double offset, double xpos, double ypos)
+Editor::show_verbose_duration_cursor (framepos_t start, framepos_t end, double offset, double xpos, double ypos)
 {
 	char buf[128];
 	Timecode::Time timecode;
 	BBT_Time sbbt;
 	BBT_Time ebbt;
 	int hours, mins;
-	nframes64_t distance, frame_rate;
+	framepos_t distance, frame_rate;
 	float secs;
 	Meter meter_at_start(_session->tempo_map().meter_at(start));
 
@@ -2251,7 +2251,7 @@ Editor::cancel_selection ()
 
 
 void
-Editor::single_contents_trim (RegionView& rv, nframes64_t frame_delta, bool left_direction, bool swap_direction)
+Editor::single_contents_trim (RegionView& rv, framepos_t frame_delta, bool left_direction, bool swap_direction)
 {
 	boost::shared_ptr<Region> region (rv.region());
 
@@ -2259,7 +2259,7 @@ Editor::single_contents_trim (RegionView& rv, nframes64_t frame_delta, bool left
 		return;
 	}
 
-	nframes64_t new_bound;
+	framepos_t new_bound;
 
 	double speed = 1.0;
 	TimeAxisView* tvp = clicked_axisview;
@@ -2271,24 +2271,24 @@ Editor::single_contents_trim (RegionView& rv, nframes64_t frame_delta, bool left
 
 	if (left_direction) {
 		if (swap_direction) {
-			new_bound = (nframes64_t) (region->position()/speed) + frame_delta;
+			new_bound = (framepos_t) (region->position()/speed) + frame_delta;
 		} else {
-			new_bound = (nframes64_t) (region->position()/speed) - frame_delta;
+			new_bound = (framepos_t) (region->position()/speed) - frame_delta;
 		}
 	} else {
 		if (swap_direction) {
-			new_bound = (nframes64_t) (region->position()/speed) - frame_delta;
+			new_bound = (framepos_t) (region->position()/speed) - frame_delta;
 		} else {
-			new_bound = (nframes64_t) (region->position()/speed) + frame_delta;
+			new_bound = (framepos_t) (region->position()/speed) + frame_delta;
 		}
 	}
 
-	region->trim_start ((nframes64_t) (new_bound * speed), this);
+	region->trim_start ((framepos_t) (new_bound * speed), this);
 	rv.region_changed (PropertyChange (ARDOUR::Properties::start));
 }
 
 void
-Editor::single_start_trim (RegionView& rv, nframes64_t new_bound, bool no_overlap)
+Editor::single_start_trim (RegionView& rv, framepos_t new_bound, bool no_overlap)
 {
 	boost::shared_ptr<Region> region (rv.region());
 
@@ -2304,9 +2304,9 @@ Editor::single_start_trim (RegionView& rv, nframes64_t new_bound, bool no_overla
 		speed = tv->track()->speed();
 	}
 
-	nframes64_t pre_trim_first_frame = region->first_frame();
+	framepos_t pre_trim_first_frame = region->first_frame();
 
-	region->trim_front ((nframes64_t) (new_bound * speed), this);
+	region->trim_front ((framepos_t) (new_bound * speed), this);
 
 	if (no_overlap) {
 		//Get the next region on the left of this region and shrink/expand it.
@@ -2331,7 +2331,7 @@ Editor::single_start_trim (RegionView& rv, nframes64_t new_bound, bool no_overla
 }
 
 void
-Editor::single_end_trim (RegionView& rv, nframes64_t new_bound, bool no_overlap)
+Editor::single_end_trim (RegionView& rv, framepos_t new_bound, bool no_overlap)
 {
 	boost::shared_ptr<Region> region (rv.region());
 
@@ -2347,9 +2347,9 @@ Editor::single_end_trim (RegionView& rv, nframes64_t new_bound, bool no_overlap)
 		speed = tv->track()->speed();
 	}
 
-	nframes64_t pre_trim_last_frame = region->last_frame();
+	framepos_t pre_trim_last_frame = region->last_frame();
 
-	region->trim_end ((nframes64_t) (new_bound * speed), this);
+	region->trim_end ((framepos_t) (new_bound * speed), this);
 
 	if (no_overlap) {
 		//Get the next region on the right of this region and shrink/expand it.
@@ -2378,7 +2378,7 @@ Editor::single_end_trim (RegionView& rv, nframes64_t new_bound, bool no_overlap)
 
 
 void
-Editor::point_trim (GdkEvent* event, nframes64_t new_bound)
+Editor::point_trim (GdkEvent* event, framepos_t new_bound)
 {
 	RegionView* rv = clicked_regionview;
 
@@ -2479,7 +2479,7 @@ Editor::hide_marker (ArdourCanvas::Item* item, GdkEvent* /*event*/)
 
 
 void
-Editor::reposition_zoom_rect (nframes64_t start, nframes64_t end)
+Editor::reposition_zoom_rect (framepos_t start, framepos_t end)
 {
 	double x1 = frame_to_pixel (start);
 	double x2 = frame_to_pixel (end);
@@ -2518,7 +2518,7 @@ Editor::mouse_rename_region (ArdourCanvas::Item* /*item*/, GdkEvent* /*event*/)
 
 
 void
-Editor::mouse_brush_insert_region (RegionView* rv, nframes64_t pos)
+Editor::mouse_brush_insert_region (RegionView* rv, framepos_t pos)
 {
 	/* no brushing without a useful snap setting */
 
@@ -2554,7 +2554,7 @@ Editor::mouse_brush_insert_region (RegionView* rv, nframes64_t pos)
 
         playlist->clear_changes ();
 	boost::shared_ptr<Region> new_region (RegionFactory::create (rv->region()));
-        playlist->add_region (new_region, (nframes64_t) (pos * speed));
+        playlist->add_region (new_region, (framepos_t) (pos * speed));
 	_session->add_command (new StatefulDiffCommand (playlist));
 
 	// playlist is frozen, so we have to update manually XXX this is disgusting
diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc
index 5d678da798..ce9aafb3fb 100644
--- a/gtk2_ardour/editor_ops.cc
+++ b/gtk2_ardour/editor_ops.cc
@@ -113,7 +113,7 @@ Editor::redo (uint32_t n)
 }
 
 void
-Editor::split_regions_at (nframes64_t where, RegionSelection& regions)
+Editor::split_regions_at (framepos_t where, RegionSelection& regions)
 {
 	list <boost::shared_ptr<Playlist > > used_playlists;
 
@@ -193,7 +193,7 @@ Editor::select_region_for_operation (int /*dir*/, TimeAxisView **tv)
 {
 	RegionView* rv;
 	boost::shared_ptr<Region> region;
-	nframes64_t start = 0;
+	framepos_t start = 0;
 
 	if (selection->time.start () == selection->time.end_frame ()) {
 
@@ -236,7 +236,7 @@ Editor::extend_selection_to_end_of_region (bool next)
 {
 	TimeAxisView *tv;
 	boost::shared_ptr<Region> region;
-	nframes64_t start;
+	framepos_t start;
 
 	if ((region = select_region_for_operation (next ? 1 : 0, &tv)) == 0) {
 		return;
@@ -258,7 +258,7 @@ Editor::extend_selection_to_start_of_region (bool previous)
 {
 	TimeAxisView *tv;
 	boost::shared_ptr<Region> region;
-	nframes64_t end;
+	framepos_t end;
 
 	if ((region = select_region_for_operation (previous ? -1 : 0, &tv)) == 0) {
 		return;
@@ -303,8 +303,8 @@ Editor::nudge_backward_release (GdkEventButton* ev)
 void
 Editor::nudge_forward (bool next, bool force_playhead)
 {
-	nframes64_t distance;
-	nframes64_t next_distance;
+	framepos_t distance;
+	framepos_t next_distance;
 	RegionSelection rs;
 
 	get_regions_for_action (rs);
@@ -383,8 +383,8 @@ Editor::nudge_forward (bool next, bool force_playhead)
 void
 Editor::nudge_backward (bool next, bool force_playhead)
 {
-	nframes64_t distance;
-	nframes64_t next_distance;
+	framepos_t distance;
+	framepos_t next_distance;
 	RegionSelection rs;
 
 	get_regions_for_action (rs);
@@ -476,7 +476,7 @@ Editor::nudge_backward (bool next, bool force_playhead)
 void
 Editor::nudge_forward_capture_offset ()
 {
-	nframes64_t distance;
+	framepos_t distance;
 	RegionSelection rs;
 
 	get_regions_for_action (rs);
@@ -505,7 +505,7 @@ Editor::nudge_forward_capture_offset ()
 void
 Editor::nudge_backward_capture_offset ()
 {
-	nframes64_t distance;
+	framepos_t distance;
 	RegionSelection rs;
 
 	get_regions_for_action (rs);
@@ -798,8 +798,8 @@ Editor::get_region_boundary (framepos_t pos, int32_t dir, bool with_selection, b
 void
 Editor::cursor_to_region_boundary (bool with_selection, int32_t dir)
 {
-	nframes64_t pos = playhead_cursor->current_frame;
-	nframes64_t target;
+	framepos_t pos = playhead_cursor->current_frame;
+	framepos_t target;
 
 	if (!_session) {
 		return;
@@ -833,7 +833,7 @@ void
 Editor::cursor_to_region_point (EditorCursor* cursor, RegionPoint point, int32_t dir)
 {
 	boost::shared_ptr<Region> r;
-	nframes64_t pos = cursor->current_frame;
+	framepos_t pos = cursor->current_frame;
 
 	if (!_session) {
 		return;
@@ -912,7 +912,7 @@ Editor::cursor_to_previous_region_point (EditorCursor* cursor, RegionPoint point
 void
 Editor::cursor_to_selection_start (EditorCursor *cursor)
 {
-	nframes64_t pos = 0;
+	framepos_t pos = 0;
 	RegionSelection rs;
 
 	get_regions_for_action (rs);
@@ -944,7 +944,7 @@ Editor::cursor_to_selection_start (EditorCursor *cursor)
 void
 Editor::cursor_to_selection_end (EditorCursor *cursor)
 {
-	nframes64_t pos = 0;
+	framepos_t pos = 0;
 	RegionSelection rs;
 
 	get_regions_for_action (rs);
@@ -976,7 +976,7 @@ Editor::cursor_to_selection_end (EditorCursor *cursor)
 void
 Editor::selected_marker_to_region_boundary (bool with_selection, int32_t dir)
 {
-	nframes64_t target;
+	framepos_t target;
 	Location* loc;
 	bool ignored;
 
@@ -985,7 +985,7 @@ Editor::selected_marker_to_region_boundary (bool with_selection, int32_t dir)
 	}
 
 	if (selection->markers.empty()) {
-		nframes64_t mouse;
+		framepos_t mouse;
 		bool ignored;
 
 		if (!mouse_frame (mouse, ignored)) {
@@ -999,7 +999,7 @@ Editor::selected_marker_to_region_boundary (bool with_selection, int32_t dir)
 		return;
 	}
 
-	nframes64_t pos = loc->start();
+	framepos_t pos = loc->start();
 
 	// so we don't find the current region again..
 	if (dir > 0 || pos > 0) {
@@ -1029,7 +1029,7 @@ void
 Editor::selected_marker_to_region_point (RegionPoint point, int32_t dir)
 {
 	boost::shared_ptr<Region> r;
-	nframes64_t pos;
+	framepos_t pos;
 	Location* loc;
 	bool ignored;
 
@@ -1105,7 +1105,7 @@ Editor::selected_marker_to_previous_region_point (RegionPoint point)
 void
 Editor::selected_marker_to_selection_start ()
 {
-	nframes64_t pos = 0;
+	framepos_t pos = 0;
 	Location* loc;
 	bool ignored;
 
@@ -1144,7 +1144,7 @@ Editor::selected_marker_to_selection_start ()
 void
 Editor::selected_marker_to_selection_end ()
 {
-	nframes64_t pos = 0;
+	framepos_t pos = 0;
 	Location* loc;
 	bool ignored;
 
@@ -1216,8 +1216,8 @@ Editor::scroll_playhead (bool forward)
 void
 Editor::playhead_backward ()
 {
-	nframes64_t pos;
-	nframes64_t cnt;
+	framepos_t pos;
+	framepos_t cnt;
 	float prefix;
 	bool was_floating;
 
@@ -1225,15 +1225,15 @@ Editor::playhead_backward ()
 		cnt = 1;
 	} else {
 		if (was_floating) {
-			cnt = (nframes64_t) floor (prefix * _session->frame_rate ());
+			cnt = (framepos_t) floor (prefix * _session->frame_rate ());
 		} else {
-			cnt = (nframes64_t) prefix;
+			cnt = (framepos_t) prefix;
 		}
 	}
 
 	pos = playhead_cursor->current_frame;
 
-	if ((nframes64_t) pos < cnt) {
+	if ((framepos_t) pos < cnt) {
 		pos = 0;
 	} else {
 		pos -= cnt;
@@ -1250,8 +1250,8 @@ Editor::playhead_backward ()
 void
 Editor::playhead_forward ()
 {
-	nframes64_t pos;
-	nframes64_t cnt;
+	framepos_t pos;
+	framepos_t cnt;
 	bool was_floating;
 	float prefix;
 
@@ -1259,9 +1259,9 @@ Editor::playhead_forward ()
 		cnt = 1;
 	} else {
 		if (was_floating) {
-			cnt = (nframes64_t) floor (prefix * _session->frame_rate ());
+			cnt = (framepos_t) floor (prefix * _session->frame_rate ());
 		} else {
-			cnt = (nframes64_t) floor (prefix);
+			cnt = (framepos_t) floor (prefix);
 		}
 	}
 
@@ -1311,8 +1311,8 @@ Editor::cursor_align (bool playhead_to_edit)
 void
 Editor::edit_cursor_backward ()
 {
-	nframes64_t pos;
-	nframes64_t cnt;
+	framepos_t pos;
+	framepos_t cnt;
 	float prefix;
 	bool was_floating;
 
@@ -1320,9 +1320,9 @@ Editor::edit_cursor_backward ()
 		cnt = 1;
 	} else {
 		if (was_floating) {
-			cnt = (nframes64_t) floor (prefix * _session->frame_rate ());
+			cnt = (framepos_t) floor (prefix * _session->frame_rate ());
 		} else {
-			cnt = (nframes64_t) prefix;
+			cnt = (framepos_t) prefix;
 		}
 	}
 
@@ -1342,8 +1342,8 @@ Editor::edit_cursor_backward ()
 void
 Editor::edit_cursor_forward ()
 {
-	//nframes64_t pos;
-	nframes64_t cnt;
+	//framepos_t pos;
+	framepos_t cnt;
 	bool was_floating;
 	float prefix;
 
@@ -1351,9 +1351,9 @@ Editor::edit_cursor_forward ()
 		cnt = 1;
 	} else {
 		if (was_floating) {
-			cnt = (nframes64_t) floor (prefix * _session->frame_rate ());
+			cnt = (framepos_t) floor (prefix * _session->frame_rate ());
 		} else {
-			cnt = (nframes64_t) floor (prefix);
+			cnt = (framepos_t) floor (prefix);
 		}
 	}
 
@@ -1366,16 +1366,16 @@ Editor::goto_frame ()
 {
 	float prefix;
 	bool was_floating;
-	nframes64_t frame;
+	framepos_t frame;
 
 	if (get_prefix (prefix, was_floating)) {
 		return;
 	}
 
 	if (was_floating) {
-		frame = (nframes64_t) floor (prefix * _session->frame_rate());
+		frame = (framepos_t) floor (prefix * _session->frame_rate());
 	} else {
-		frame = (nframes64_t) floor (prefix);
+		frame = (framepos_t) floor (prefix);
 	}
 
 	_session->request_locate (frame);
@@ -1384,19 +1384,19 @@ Editor::goto_frame ()
 void
 Editor::scroll_backward (float pages)
 {
-	nframes64_t frame;
-	nframes64_t one_page = (nframes64_t) rint (_canvas_width * frames_per_unit);
+	framepos_t frame;
+	framepos_t one_page = (framepos_t) rint (_canvas_width * frames_per_unit);
 	bool was_floating;
 	float prefix;
-	nframes64_t cnt;
+	framepos_t cnt;
 
 	if (get_prefix (prefix, was_floating)) {
-		cnt = (nframes64_t) floor (pages * one_page);
+		cnt = (framepos_t) floor (pages * one_page);
 	} else {
 		if (was_floating) {
-			cnt = (nframes64_t) floor (prefix * _session->frame_rate());
+			cnt = (framepos_t) floor (prefix * _session->frame_rate());
 		} else {
-			cnt = (nframes64_t) floor (prefix * one_page);
+			cnt = (framepos_t) floor (prefix * one_page);
 		}
 	}
 
@@ -1412,19 +1412,19 @@ Editor::scroll_backward (float pages)
 void
 Editor::scroll_forward (float pages)
 {
-	nframes64_t frame;
-	nframes64_t one_page = (nframes64_t) rint (_canvas_width * frames_per_unit);
+	framepos_t frame;
+	framepos_t one_page = (framepos_t) rint (_canvas_width * frames_per_unit);
 	bool was_floating;
 	float prefix;
-	nframes64_t cnt;
+	framepos_t cnt;
 
 	if (get_prefix (prefix, was_floating)) {
-		cnt = (nframes64_t) floor (pages * one_page);
+		cnt = (framepos_t) floor (pages * one_page);
 	} else {
 		if (was_floating) {
-			cnt = (nframes64_t) floor (prefix * _session->frame_rate());
+			cnt = (framepos_t) floor (prefix * _session->frame_rate());
 		} else {
-			cnt = (nframes64_t) floor (prefix * one_page);
+			cnt = (framepos_t) floor (prefix * one_page);
 		}
 	}
 
@@ -1532,14 +1532,14 @@ Editor::temporal_zoom (gdouble fpu)
 {
 	if (!_session) return;
 
-	nframes64_t current_page = current_page_frames();
-	nframes64_t current_leftmost = leftmost_frame;
-	nframes64_t current_rightmost;
-	nframes64_t current_center;
-	nframes64_t new_page_size;
-	nframes64_t half_page_size;
-	nframes64_t leftmost_after_zoom = 0;
-	nframes64_t where;
+	framepos_t current_page = current_page_frames();
+	framepos_t current_leftmost = leftmost_frame;
+	framepos_t current_rightmost;
+	framepos_t current_center;
+	framepos_t new_page_size;
+	framepos_t half_page_size;
+	framepos_t leftmost_after_zoom = 0;
+	framepos_t where;
 	bool in_track_canvas;
 	double nfpu;
 	double l;
@@ -1552,7 +1552,7 @@ Editor::temporal_zoom (gdouble fpu)
 
 	nfpu = fpu;
 
-	new_page_size = (nframes64_t) floor (_canvas_width * nfpu);
+	new_page_size = (framepos_t) floor (_canvas_width * nfpu);
 	half_page_size = new_page_size / 2;
 
 	switch (zoom_focus) {
@@ -1587,7 +1587,7 @@ Editor::temporal_zoom (gdouble fpu)
 		} else if (l > max_framepos) {
 			leftmost_after_zoom = max_framepos - new_page_size;
 		} else {
-			leftmost_after_zoom = (nframes64_t) l;
+			leftmost_after_zoom = (framepos_t) l;
 		}
 		break;
 
@@ -1613,7 +1613,7 @@ Editor::temporal_zoom (gdouble fpu)
 			} else if (l > max_framepos) {
 				leftmost_after_zoom = max_framepos - new_page_size;
 			} else {
-				leftmost_after_zoom = (nframes64_t) l;
+				leftmost_after_zoom = (framepos_t) l;
 			}
 		}
 
@@ -1632,7 +1632,7 @@ Editor::temporal_zoom (gdouble fpu)
 			} else if (l > max_framepos) {
 				leftmost_after_zoom = max_framepos - new_page_size;
 			} else {
-				leftmost_after_zoom = (nframes64_t) l;
+				leftmost_after_zoom = (framepos_t) l;
 			}
 
 		} else {
@@ -1690,9 +1690,9 @@ Editor::temporal_zoom_region (bool both_axes)
 		return;
 	}
 
-	nframes64_t range = end - start;
+	framepos_t range = end - start;
 	double new_fpu = (double)range / (double)_canvas_width;
-	nframes64_t extra_samples = (nframes64_t) floor (one_centimeter_in_pixels * new_fpu);
+	framepos_t extra_samples = (framepos_t) floor (one_centimeter_in_pixels * new_fpu);
 
 	if (start > extra_samples) {
 		start -= extra_samples;
@@ -1759,8 +1759,8 @@ Editor::temporal_zoom_selection ()
 		return;
 	}
 
-	nframes64_t start = selection->time[clicked_selection].start;
-	nframes64_t end = selection->time[clicked_selection].end;
+	framepos_t start = selection->time[clicked_selection].start;
+	framepos_t end = selection->time[clicked_selection].end;
 
 	temporal_zoom_by_frame (start, end, "zoom to selection");
 }
@@ -1782,7 +1782,7 @@ Editor::temporal_zoom_session ()
 }
 
 void
-Editor::temporal_zoom_by_frame (nframes64_t start, nframes64_t end, const string & /*op*/)
+Editor::temporal_zoom_by_frame (framepos_t start, framepos_t end, const string & /*op*/)
 {
 	if (!_session) return;
 
@@ -1790,13 +1790,13 @@ Editor::temporal_zoom_by_frame (nframes64_t start, nframes64_t end, const string
 		return;
 	}
 
-	nframes64_t range = end - start;
+	framepos_t range = end - start;
 
 	double new_fpu = (double)range / (double)_canvas_width;
 
-	nframes64_t new_page = (nframes64_t) floor (_canvas_width * new_fpu);
-	nframes64_t middle = (nframes64_t) floor( (double)start + ((double)range / 2.0f ));
-	nframes64_t new_leftmost = (nframes64_t) floor( (double)middle - ((double)new_page/2.0f));
+	framepos_t new_page = (framepos_t) floor (_canvas_width * new_fpu);
+	framepos_t middle = (framepos_t) floor( (double)start + ((double)range / 2.0f ));
+	framepos_t new_leftmost = (framepos_t) floor( (double)middle - ((double)new_page/2.0f));
 
 	if (new_leftmost > middle) {
 		new_leftmost = 0;
@@ -1806,7 +1806,7 @@ Editor::temporal_zoom_by_frame (nframes64_t start, nframes64_t end, const string
 }
 
 void
-Editor::temporal_zoom_to_frame (bool coarser, nframes64_t frame)
+Editor::temporal_zoom_to_frame (bool coarser, framepos_t frame)
 {
 	if (!_session) {
 		return;
@@ -1828,7 +1828,7 @@ Editor::temporal_zoom_to_frame (bool coarser, nframes64_t frame)
 		return;
 	}
 
-	nframes64_t new_leftmost = frame - (nframes64_t)range_before;
+	framepos_t new_leftmost = frame - (framepos_t)range_before;
 
 	if (new_leftmost > frame) {
 		new_leftmost = 0;
@@ -1891,8 +1891,8 @@ Editor::add_location_from_selection ()
 		return;
 	}
 
-	nframes64_t start = selection->time[clicked_selection].start;
-	nframes64_t end = selection->time[clicked_selection].end;
+	framepos_t start = selection->time[clicked_selection].start;
+	framepos_t end = selection->time[clicked_selection].end;
 
 	_session->locations()->next_available_name(rangename,"selection");
 	Location *location = new Location (*_session, start, end, rangename, Location::IsRangeMarker);
@@ -1906,7 +1906,7 @@ Editor::add_location_from_selection ()
 }
 
 void
-Editor::add_location_mark (nframes64_t where)
+Editor::add_location_mark (framepos_t where)
 {
 	string markername;
 
@@ -2086,7 +2086,7 @@ Editor::jump_backward_to_mark ()
 void
 Editor::set_mark ()
 {
-	nframes64_t pos;
+	framepos_t pos;
 	float prefix;
 	bool was_floating;
 	string markername;
@@ -2095,9 +2095,9 @@ Editor::set_mark ()
 		pos = _session->audible_frame ();
 	} else {
 		if (was_floating) {
-			pos = (nframes64_t) floor (prefix * _session->frame_rate ());
+			pos = (framepos_t) floor (prefix * _session->frame_rate ());
 		} else {
-			pos = (nframes64_t) floor (prefix);
+			pos = (framepos_t) floor (prefix);
 		}
 	}
 
@@ -2183,7 +2183,7 @@ Editor::insert_region_list_drag (boost::shared_ptr<Region> region, int x, int y)
 {
 	double wx, wy;
 	double cx, cy;
-	nframes64_t where;
+	framepos_t where;
 	RouteTimeAxisView *rtv = 0;
 	boost::shared_ptr<Playlist> playlist;
 
@@ -2359,8 +2359,8 @@ Editor::play_from_edit_point ()
 void
 Editor::play_from_edit_point_and_return ()
 {
-	nframes64_t start_frame;
-	nframes64_t return_frame;
+	framepos_t start_frame;
+	framepos_t return_frame;
 
 	start_frame = get_preferred_edit_position (true);
 
@@ -2555,7 +2555,7 @@ Editor::audition_playlist_region_via_route (boost::shared_ptr<Region> region, Ro
 void
 Editor::play_edit_range ()
 {
-	nframes64_t start, end;
+	framepos_t start, end;
 
 	if (get_edit_op_range (start, end)) {
 		_session->request_bounded_roll (start, end);
@@ -2604,17 +2604,17 @@ Editor::region_from_selection ()
 		return;
 	}
 
-	nframes64_t start = selection->time[clicked_selection].start;
-	nframes64_t end = selection->time[clicked_selection].end;
+	framepos_t start = selection->time[clicked_selection].start;
+	framepos_t end = selection->time[clicked_selection].end;
 
 	TrackViewList tracks = get_tracks_for_range_action ();
 
-	nframes64_t selection_cnt = end - start + 1;
+	framepos_t selection_cnt = end - start + 1;
 
 	for (TrackSelection::iterator i = tracks.begin(); i != tracks.end(); ++i) {
 		boost::shared_ptr<Region> current;
 		boost::shared_ptr<Playlist> pl;
-		nframes64_t internal_start;
+		framepos_t internal_start;
 		string new_name;
 
 		if ((pl = (*i)->playlist()) == 0) {
@@ -2646,15 +2646,15 @@ Editor::create_region_from_selection (vector<boost::shared_ptr<Region> >& new_re
 		return;
 	}
 
-	nframes64_t start = selection->time[clicked_selection].start;
-	nframes64_t end = selection->time[clicked_selection].end;
+	framepos_t start = selection->time[clicked_selection].start;
+	framepos_t end = selection->time[clicked_selection].end;
 
 	sort_track_selection ();
 
 	for (TrackSelection::iterator i = selection->tracks.begin(); i != selection->tracks.end(); ++i) {
 		boost::shared_ptr<Region> current;
 		boost::shared_ptr<Playlist> playlist;
-		nframes64_t internal_start;
+		framepos_t internal_start;
 		string new_name;
 
 		if ((playlist = (*i)->playlist()) == 0) {
@@ -2792,8 +2792,8 @@ Editor::separate_regions_between (const TimeSelection& ts)
 
 						latest_regionviews.clear ();
 
-						playlist->partition ((nframes64_t)((*t).start * speed),
-								(nframes64_t)((*t).end * speed), false);
+						playlist->partition ((framepos_t)((*t).start * speed),
+								(framepos_t)((*t).end * speed), false);
 
 						c.disconnect ();
 
@@ -2856,8 +2856,8 @@ Editor::separate_region_from_selection ()
 
 	} else {
 
-		nframes64_t start;
-		nframes64_t end;
+		framepos_t start;
+		framepos_t end;
 
 		if (get_edit_op_range (start, end)) {
 
@@ -2991,8 +2991,8 @@ Editor::crop_region_to_selection ()
 
 	} else {
 
-		nframes64_t start;
-		nframes64_t end;
+		framepos_t start;
+		framepos_t end;
 
 		if (get_edit_op_range (start, end)) {
 			crop_region_to (start, end);
@@ -3002,7 +3002,7 @@ Editor::crop_region_to_selection ()
 }
 
 void
-Editor::crop_region_to (nframes64_t start, nframes64_t end)
+Editor::crop_region_to (framepos_t start, framepos_t end)
 {
 	vector<boost::shared_ptr<Playlist> > playlists;
 	boost::shared_ptr<Playlist> playlist;
@@ -3036,9 +3036,9 @@ Editor::crop_region_to (nframes64_t start, nframes64_t end)
 		return;
 	}
 
-	nframes64_t the_start;
-	nframes64_t the_end;
-	nframes64_t cnt;
+	framepos_t the_start;
+	framepos_t the_end;
+	framepos_t cnt;
 
 	begin_reversible_command (_("trim to selection"));
 
@@ -3056,7 +3056,7 @@ Editor::crop_region_to (nframes64_t start, nframes64_t end)
 		   if the selection extends beyond the region
 		*/
 
-		the_start = max (the_start, (nframes64_t) region->position());
+		the_start = max (the_start, (framepos_t) region->position());
 		if (max_framepos - the_start < region->length()) {
 			the_end = the_start + region->length() - 1;
 		} else {
@@ -3076,7 +3076,7 @@ Editor::crop_region_to (nframes64_t start, nframes64_t end)
 void
 Editor::region_fill_track ()
 {
-	nframes64_t end;
+	framepos_t end;
 	RegionSelection rs;
 
 	get_regions_for_action (rs);
@@ -3129,8 +3129,8 @@ Editor::region_fill_selection ()
 		return;
 	}
 
-	nframes64_t start = selection->time[clicked_selection].start;
-	nframes64_t end = selection->time[clicked_selection].end;
+	framepos_t start = selection->time[clicked_selection].start;
+	framepos_t end = selection->time[clicked_selection].end;
 
 	boost::shared_ptr<Playlist> playlist;
 
@@ -3138,7 +3138,7 @@ Editor::region_fill_selection ()
 		return;
 	}
 
-	nframes64_t selection_length = end - start;
+	framepos_t selection_length = end - start;
 	float times = (float)selection_length / region->length();
 
 	begin_reversible_command (_("fill selection"));
@@ -3160,14 +3160,14 @@ Editor::region_fill_selection ()
 void
 Editor::set_region_sync_from_edit_point ()
 {
-	nframes64_t where = get_preferred_edit_position ();
+	framepos_t where = get_preferred_edit_position ();
 	RegionSelection rs;
 	get_regions_for_action (rs);
 	set_sync_point (where, rs);
 }
 
 void
-Editor::set_sync_point (nframes64_t where, const RegionSelection& rs)
+Editor::set_sync_point (framepos_t where, const RegionSelection& rs)
 {
 	bool in_command = false;
 
@@ -3242,7 +3242,7 @@ Editor::align (RegionPoint what)
 	RegionSelection rs;
 
 	get_regions_for_action (rs);
-	nframes64_t where = get_preferred_edit_position();
+	framepos_t where = get_preferred_edit_position();
 
 	if (!rs.empty()) {
 		align_selection (what, where, rs);
@@ -3257,7 +3257,7 @@ Editor::align (RegionPoint what)
 void
 Editor::align_relative (RegionPoint what)
 {
-	nframes64_t where = get_preferred_edit_position();
+	framepos_t where = get_preferred_edit_position();
 	RegionSelection rs;
 
 	get_regions_for_action (rs);
@@ -3274,14 +3274,14 @@ struct RegionSortByTime {
 };
 
 void
-Editor::align_selection_relative (RegionPoint point, nframes64_t position, const RegionSelection& rs)
+Editor::align_selection_relative (RegionPoint point, framepos_t position, const RegionSelection& rs)
 {
 	if (rs.empty()) {
 		return;
 	}
 
-	nframes64_t distance = 0;
-	nframes64_t pos = 0;
+	framepos_t distance = 0;
+	framepos_t pos = 0;
 	int dir = 1;
 
 	list<RegionView*> sorted;
@@ -3358,7 +3358,7 @@ Editor::align_selection_relative (RegionPoint point, nframes64_t position, const
 }
 
 void
-Editor::align_selection (RegionPoint point, nframes64_t position, const RegionSelection& rs)
+Editor::align_selection (RegionPoint point, framepos_t position, const RegionSelection& rs)
 {
 	if (rs.empty()) {
 		return;
@@ -3374,7 +3374,7 @@ Editor::align_selection (RegionPoint point, nframes64_t position, const RegionSe
 }
 
 void
-Editor::align_region (boost::shared_ptr<Region> region, RegionPoint point, nframes64_t position)
+Editor::align_region (boost::shared_ptr<Region> region, RegionPoint point, framepos_t position)
 {
 	begin_reversible_command (_("align region"));
 	align_region_internal (region, point, position);
@@ -3382,7 +3382,7 @@ Editor::align_region (boost::shared_ptr<Region> region, RegionPoint point, nfram
 }
 
 void
-Editor::align_region_internal (boost::shared_ptr<Region> region, RegionPoint point, nframes64_t position)
+Editor::align_region_internal (boost::shared_ptr<Region> region, RegionPoint point, framepos_t position)
 {
 	region->clear_changes ();
 
@@ -3420,7 +3420,7 @@ Editor::trim_region_back ()
 void
 Editor::trim_region (bool front)
 {
-	nframes64_t where = get_preferred_edit_position();
+	framepos_t where = get_preferred_edit_position();
 	RegionSelection rs;
 
 	get_regions_for_action (rs);
@@ -3495,8 +3495,8 @@ Editor::trim_region_to_location (const Location& loc, const char* str)
 		}
 
 		float speed = 1.0;
-		nframes64_t start;
-		nframes64_t end;
+		framepos_t start;
+		framepos_t end;
 
 		if (tav->track() != 0) {
 			speed = tav->track()->speed();
@@ -3520,7 +3520,7 @@ Editor::trim_region_to_edit_point ()
 
 	get_regions_for_action (rs);
 
-	nframes64_t where = get_preferred_edit_position();
+	framepos_t where = get_preferred_edit_position();
 
 	begin_reversible_command (_("trim region start to edit point"));
 
@@ -3558,7 +3558,7 @@ Editor::trim_region_from_edit_point ()
 
 	get_regions_for_action (rs);
 
-	nframes64_t where = get_preferred_edit_position();
+	framepos_t where = get_preferred_edit_position();
 
 	begin_reversible_command (_("trim region end to edit point"));
 
@@ -3646,7 +3646,7 @@ Editor::trim_to_region(bool forward)
 			continue;
 		    }
 
-		    region->trim_end((nframes64_t) ( (next_region->first_frame() - 1) * speed), this);
+		    region->trim_end((framepos_t) ( (next_region->first_frame() - 1) * speed), this);
 		    arv->region_changed (PropertyChange (ARDOUR::Properties::length));
 		}
 		else {
@@ -3657,7 +3657,7 @@ Editor::trim_to_region(bool forward)
 			continue;
 		    }
 
-		    region->trim_front((nframes64_t) ((next_region->last_frame() + 1) * speed), this);
+		    region->trim_front((framepos_t) ((next_region->last_frame() + 1) * speed), this);
 
 		    arv->region_changed (ARDOUR::bounds_change);
 		}
@@ -3727,9 +3727,9 @@ Editor::bounce_range_selection (bool replace, bool enable_processing)
 
 	TrackSelection views = selection->tracks;
 
-	nframes64_t start = selection->time[clicked_selection].start;
-	nframes64_t end = selection->time[clicked_selection].end;
-	nframes64_t cnt = end - start + 1;
+	framepos_t start = selection->time[clicked_selection].start;
+	framepos_t end = selection->time[clicked_selection].end;
+	framepos_t cnt = end - start + 1;
 
 	begin_reversible_command (_("bounce range"));
 
@@ -3917,7 +3917,7 @@ Editor::cut_copy (CutCopyOp op)
 
 		case MouseRange:
 			if (selection->time.empty()) {
-				nframes64_t start, end;
+				framepos_t start, end;
 				if (!get_edit_op_range (start, end)) {
 					return;
 				}
@@ -4101,7 +4101,7 @@ Editor::cut_copy_regions (CutCopyOp op, RegionSelection& rs)
 
 	for (RegionSelection::iterator x = rs.begin(); x != rs.end(); ++x) {
 
-		first_position = min ((nframes64_t) (*x)->region()->position(), first_position);
+		first_position = min ((framepos_t) (*x)->region()->position(), first_position);
 
 		if (op == Cut || op == Clear) {
 			boost::shared_ptr<Playlist> pl = (*x)->region()->playlist();
@@ -4257,7 +4257,7 @@ Editor::paste (float times)
 void
 Editor::mouse_paste ()
 {
-	nframes64_t where;
+	framepos_t where;
 	bool ignored;
 
 	if (!mouse_frame (where, ignored)) {
@@ -4269,7 +4269,7 @@ Editor::mouse_paste ()
 }
 
 void
-Editor::paste_internal (nframes64_t position, float times)
+Editor::paste_internal (framepos_t position, float times)
 {
 	bool commit = false;
 
@@ -4461,9 +4461,9 @@ void
 Editor::nudge_track (bool use_edit, bool forwards)
 {
 	boost::shared_ptr<Playlist> playlist;
-	nframes64_t distance;
-	nframes64_t next_distance;
-	nframes64_t start;
+	framepos_t distance;
+	framepos_t next_distance;
+	framepos_t start;
 
 	if (use_edit) {
 		start = get_preferred_edit_position();
@@ -4954,7 +4954,7 @@ Editor::external_edit_region ()
 }
 
 void
-Editor::brush (nframes64_t pos)
+Editor::brush (framepos_t pos)
 {
 	RegionSelection sel;
 	RegionSelection rs;
@@ -5162,8 +5162,8 @@ Editor::set_fade_length (bool in)
 
 	RegionView* rv = rs.front ();
 
-	nframes64_t pos = get_preferred_edit_position();
-	nframes64_t len;
+	framepos_t pos = get_preferred_edit_position();
+	framepos_t len;
 	char const * cmd;
 
 	if (pos > rv->region()->last_frame() || pos < rv->region()->first_frame()) {
@@ -5482,7 +5482,7 @@ Editor::update_xfade_visibility ()
 void
 Editor::set_edit_point ()
 {
-	nframes64_t where;
+	framepos_t where;
 	bool ignored;
 
 	if (!mouse_frame (where, ignored)) {
@@ -5512,7 +5512,7 @@ Editor::set_playhead_cursor ()
 	if (entered_marker) {
 		_session->request_locate (entered_marker->position(), _session->transport_rolling());
 	} else {
-		nframes64_t where;
+		framepos_t where;
 		bool ignored;
 
 		if (!mouse_frame (where, ignored)) {
@@ -5541,7 +5541,7 @@ Editor::split ()
 
 	get_regions_for_action (rs, true);
 
-	nframes64_t where = get_preferred_edit_position();
+	framepos_t where = get_preferred_edit_position();
 
 	if (rs.empty()) {
 		return;
@@ -5675,8 +5675,8 @@ Editor::set_loop_from_selection (bool play)
 		return;
 	}
 
-	nframes64_t start = selection->time[clicked_selection].start;
-	nframes64_t end = selection->time[clicked_selection].end;
+	framepos_t start = selection->time[clicked_selection].start;
+	framepos_t end = selection->time[clicked_selection].end;
 
 	set_loop_range (start, end,  _("set loop range from selection"));
 
@@ -5693,8 +5693,8 @@ Editor::set_loop_from_edit_range (bool play)
 		return;
 	}
 
-	nframes64_t start;
-	nframes64_t end;
+	framepos_t start;
+	framepos_t end;
 
 	if (!get_edit_op_range (start, end)) {
 		return;
@@ -5746,8 +5746,8 @@ Editor::set_punch_from_selection ()
 		return;
 	}
 
-	nframes64_t start = selection->time[clicked_selection].start;
-	nframes64_t end = selection->time[clicked_selection].end;
+	framepos_t start = selection->time[clicked_selection].start;
+	framepos_t end = selection->time[clicked_selection].end;
 
 	set_punch_range (start, end,  _("set punch range from selection"));
 }
@@ -5759,8 +5759,8 @@ Editor::set_punch_from_edit_range ()
 		return;
 	}
 
-	nframes64_t start;
-	nframes64_t end;
+	framepos_t start;
+	framepos_t end;
 
 	if (!get_edit_op_range (start, end)) {
 		return;
@@ -5832,16 +5832,16 @@ Editor::use_region_as_bar ()
 void
 Editor::use_range_as_bar ()
 {
-	nframes64_t start, end;
+	framepos_t start, end;
 	if (get_edit_op_range (start, end)) {
 		define_one_bar (start, end);
 	}
 }
 
 void
-Editor::define_one_bar (nframes64_t start, nframes64_t end)
+Editor::define_one_bar (framepos_t start, framepos_t end)
 {
-	nframes64_t length = end - start;
+	framepos_t length = end - start;
 
 	const Meter& m (_session->tempo_map().meter_at (start));
 
@@ -6029,7 +6029,7 @@ Editor::split_region_at_points (boost::shared_ptr<Region> r, AnalysisFeatureList
 	pl->freeze ();
 	pl->remove_region (r);
 
-	nframes64_t pos = 0;
+	framepos_t pos = 0;
 
 	while (x != positions.end()) {
 	  
@@ -6042,12 +6042,12 @@ Editor::split_region_at_points (boost::shared_ptr<Region> r, AnalysisFeatureList
 		/* file start = original start + how far we from the initial position ?
 		 */
 
-		nframes64_t file_start = r->start() + pos;
+		framepos_t file_start = r->start() + pos;
 
 		/* length = next position - current position
 		 */
 
-		nframes64_t len = (*x) - pos;
+		framepos_t len = (*x) - pos;
 		
 		/* XXX we do we really want to allow even single-sample regions?
 		   shouldn't we have some kind of lower limit on region size?
@@ -6115,7 +6115,7 @@ Editor::place_transient()
 		return;
 	}
 	
-	nframes64_t where = get_preferred_edit_position();
+	framepos_t where = get_preferred_edit_position();
 
 	_session->begin_reversible_command (_("place transient"));
 	
@@ -6223,8 +6223,8 @@ Editor::close_region_gaps()
 		return;
 	}
 
-	nframes64_t crossfade_len  = spin_crossfade.get_value(); 
-	nframes64_t pull_back_frames = spin_pullback.get_value();
+	framepos_t crossfade_len  = spin_crossfade.get_value(); 
+	framepos_t pull_back_frames = spin_pullback.get_value();
 
 	crossfade_len = lrintf (crossfade_len * _session->frame_rate()/1000);
 	pull_back_frames = lrintf (pull_back_frames * _session->frame_rate()/1000);
@@ -6240,7 +6240,7 @@ Editor::close_region_gaps()
 	
 	for (RegionSelection::iterator r = rs.begin(); r != rs.end(); ++r) {
 
-		nframes64_t position = (*r)->region()->position();
+		framepos_t position = (*r)->region()->position();
 	  
 		if (idx == 0 || position < last_region->position()){
 			last_region = (*r)->region();
@@ -6268,7 +6268,7 @@ Editor::tab_to_transient (bool forward)
 		return;
 	}
 
-	nframes64_t pos = _session->audible_frame ();
+	framepos_t pos = _session->audible_frame ();
 
 	if (!selection->tracks.empty()) {
 
@@ -6281,7 +6281,7 @@ Editor::tab_to_transient (bool forward)
 				if (tr) {
 					boost::shared_ptr<Playlist> pl = tr->playlist ();
 					if (pl) {
-						nframes64_t result = pl->find_next_transient (pos, forward ? 1 : -1);
+						framepos_t result = pl->find_next_transient (pos, forward ? 1 : -1);
 
 						if (result >= 0) {
 							positions.push_back (result);
@@ -6353,7 +6353,7 @@ void
 Editor::playhead_backward_to_grid ()
 {
 	if (!_session) return;
-	nframes64_t pos = playhead_cursor->current_frame;
+	framepos_t pos = playhead_cursor->current_frame;
 	if (pos > 2) {
 		pos -= 2;
 		snap_to_internal (pos, -1, false);
@@ -6539,7 +6539,7 @@ Editor::do_insert_time ()
 }
 
 void
-Editor::insert_time (nframes64_t pos, nframes64_t frames, InsertTimeOption opt,
+Editor::insert_time (framepos_t pos, framecnt_t frames, InsertTimeOption opt,
 		     bool ignore_music_glue, bool markers_too, bool glued_markers_too, bool locked_markers_too, bool tempo_too)
 {
 	bool commit = false;
diff --git a/gtk2_ardour/editor_regions.cc b/gtk2_ardour/editor_regions.cc
index ae5fef49ea..f55cf4d1fd 100644
--- a/gtk2_ardour/editor_regions.cc
+++ b/gtk2_ardour/editor_regions.cc
@@ -1130,7 +1130,7 @@ EditorRegions::drag_data_received (const RefPtr<Gdk::DragContext>& context,
 	}
 
 	if (_editor->convert_drop_to_paths (paths, context, x, y, data, info, time) == 0) {
-		nframes64_t pos = 0;
+		framepos_t pos = 0;
 		if (Profile->get_sae() || Config->get_only_copy_imported_files()) {
 			_editor->do_import (paths, Editing::ImportDistinctFiles, Editing::ImportAsRegion, SrcBest, pos);
 		} else {
diff --git a/gtk2_ardour/editor_rulers.cc b/gtk2_ardour/editor_rulers.cc
index 6c789f25d9..f2ef742330 100644
--- a/gtk2_ardour/editor_rulers.cc
+++ b/gtk2_ardour/editor_rulers.cc
@@ -168,7 +168,7 @@ Editor::initialize_rulers ()
 bool
 Editor::ruler_scroll (GdkEventScroll* event)
 {
-	nframes64_t xdelta;
+	framepos_t xdelta;
 	int direction = event->direction;
 	bool handled = false;
 
@@ -274,7 +274,7 @@ Editor::ruler_button_release (GdkEventButton* ev)
 
 		stop_canvas_autoscroll();
 
-		nframes64_t where = leftmost_frame + pixel_to_frame (x);
+		framepos_t where = leftmost_frame + pixel_to_frame (x);
 		snap_to (where);
 		popup_ruler_menu (where);
 	}
@@ -317,7 +317,7 @@ Editor::ruler_mouse_motion (GdkEventMotion* ev)
 
 
 void
-Editor::popup_ruler_menu (nframes64_t where, ItemType t)
+Editor::popup_ruler_menu (framepos_t where, ItemType t)
 {
 	using namespace Menu_Helpers;
 
@@ -774,7 +774,7 @@ Editor::update_just_timecode ()
 		return;
 	}
 
-	nframes64_t rightmost_frame = leftmost_frame + current_page_frames();
+	framepos_t rightmost_frame = leftmost_frame + current_page_frames();
 
 	if (ruler_timecode_action->get_active()) {
 		gtk_custom_ruler_set_range (GTK_CUSTOM_RULER(_timecode_ruler), leftmost_frame, rightmost_frame,
@@ -801,7 +801,7 @@ Editor::compute_fixed_ruler_scale ()
 void
 Editor::update_fixed_rulers ()
 {
-	nframes64_t rightmost_frame;
+	framepos_t rightmost_frame;
 
 	if (_session == 0) {
 		return;
@@ -877,9 +877,9 @@ Editor::_metric_get_minsec (GtkCustomRulerMark **marks, gdouble lower, gdouble u
 void
 Editor::set_timecode_ruler_scale (gdouble lower, gdouble upper)
 {
-	nframes64_t range;
-	nframes64_t spacer;
-	nframes64_t fr;
+	framepos_t range;
+	framepos_t spacer;
+	framepos_t fr;
 
 	if (_session == 0) {
 		return;
@@ -887,13 +887,13 @@ Editor::set_timecode_ruler_scale (gdouble lower, gdouble upper)
 
 	fr = _session->frame_rate();
 
-	if (lower > (spacer = (nframes64_t)(128 * Editor::get_current_zoom ()))) {
+	if (lower > (spacer = (framepos_t)(128 * Editor::get_current_zoom ()))) {
 		lower = lower - spacer;
 	} else {
 		lower = 0;
 	}
 	upper = upper + spacer;
-	range = (nframes64_t) floor (upper - lower);
+	range = (framepos_t) floor (upper - lower);
 
 	if (range < (2 * _session->frames_per_timecode_frame())) { /* 0 - 2 frames */
 		timecode_ruler_scale = timecode_show_bits;
@@ -902,19 +902,19 @@ Editor::set_timecode_ruler_scale (gdouble lower, gdouble upper)
 	} else if (range <= (fr / 4)) { /* 2 frames - 0.250 second */
 		timecode_ruler_scale = timecode_show_frames;
 		timecode_mark_modulo = 1;
-		timecode_nmarks = 2 + (range / (nframes64_t)_session->frames_per_timecode_frame());
+		timecode_nmarks = 2 + (range / (framepos_t)_session->frames_per_timecode_frame());
 	} else if (range <= (fr / 2)) { /* 0.25-0.5 second */
 		timecode_ruler_scale = timecode_show_frames;
 		timecode_mark_modulo = 2;
-		timecode_nmarks = 2 + (range / (nframes64_t)_session->frames_per_timecode_frame());
+		timecode_nmarks = 2 + (range / (framepos_t)_session->frames_per_timecode_frame());
 	} else if (range <= fr) { /* 0.5-1 second */
 		timecode_ruler_scale = timecode_show_frames;
 		timecode_mark_modulo = 5;
-		timecode_nmarks = 2 + (range / (nframes64_t)_session->frames_per_timecode_frame());
+		timecode_nmarks = 2 + (range / (framepos_t)_session->frames_per_timecode_frame());
 	} else if (range <= 2 * fr) { /* 1-2 seconds */
 		timecode_ruler_scale = timecode_show_frames;
 		timecode_mark_modulo = 10;
-		timecode_nmarks = 2 + (range / (nframes64_t)_session->frames_per_timecode_frame());
+		timecode_nmarks = 2 + (range / (framepos_t)_session->frames_per_timecode_frame());
 	} else if (range <= 8 * fr) { /* 2-8 seconds */
 		timecode_ruler_scale = timecode_show_seconds;
 		timecode_mark_modulo = 1;
@@ -965,7 +965,7 @@ Editor::set_timecode_ruler_scale (gdouble lower, gdouble upper)
 		timecode_nmarks = 2 + 24;
 	} else {
 
-		/* not possible if nframes64_t is a 32 bit quantity */
+		/* not possible if framepos_t is a 32 bit quantity */
 
 		timecode_ruler_scale = timecode_show_hours;
 		timecode_mark_modulo = 4;
@@ -1133,7 +1133,7 @@ Editor::metric_get_timecode (GtkCustomRulerMark **marks, gdouble lower, gdouble
 
 
 void
-Editor::compute_bbt_ruler_scale (nframes64_t lower, nframes64_t upper)
+Editor::compute_bbt_ruler_scale (framepos_t lower, framepos_t upper)
 {
         if (_session == 0) {
                 return;
@@ -1267,15 +1267,15 @@ Editor::metric_get_bbt (GtkCustomRulerMark **marks, gdouble lower, gdouble /*upp
 
         char buf[64];
         gint  n = 0;
-	nframes64_t pos;
+	framepos_t pos;
 	BBT_Time next_beat;
-	nframes64_t next_beat_pos;
+	framepos_t next_beat_pos;
         uint32_t beats = 0;
 
 	uint32_t tick = 0;
 	uint32_t skip;
 	uint32_t t;
-	nframes64_t frame_skip;
+	framepos_t frame_skip;
 	double frame_skip_error;
 	double bbt_position_of_helper;
 	double accumulated_error;
@@ -1378,7 +1378,7 @@ Editor::metric_get_bbt (GtkCustomRulerMark **marks, gdouble lower, gdouble /*upp
 
 			next_beat_pos = _session->tempo_map().frame_time(next_beat);
 
-			frame_skip = (nframes64_t) floor (frame_skip_error = (_session->frame_rate() *  60) / (bbt_beat_subdivision * (*i).tempo->beats_per_minute()));
+			frame_skip = (framepos_t) floor (frame_skip_error = (_session->frame_rate() *  60) / (bbt_beat_subdivision * (*i).tempo->beats_per_minute()));
 			frame_skip_error -= frame_skip;
 			skip = (uint32_t) (Meter::ticks_per_beat / bbt_beat_subdivision);
 
@@ -1396,7 +1396,7 @@ Editor::metric_get_bbt (GtkCustomRulerMark **marks, gdouble lower, gdouble /*upp
 				snprintf (buf, sizeof(buf), " ");
 				(*marks)[n].label = g_strdup (buf);
 
-				/* Error compensation for float to nframes64_t*/
+				/* Error compensation for float to framepos_t*/
 				accumulated_error += frame_skip_error;
 				if (accumulated_error > 1) {
 					pos += 1;
@@ -1470,7 +1470,7 @@ Editor::metric_get_bbt (GtkCustomRulerMark **marks, gdouble lower, gdouble /*upp
 
 			next_beat_pos = _session->tempo_map().frame_time(next_beat);
 
-			frame_skip = (nframes64_t) floor (frame_skip_error = (_session->frame_rate() *  60) / (bbt_beat_subdivision * (*i).tempo->beats_per_minute()));
+			frame_skip = (framepos_t) floor (frame_skip_error = (_session->frame_rate() *  60) / (bbt_beat_subdivision * (*i).tempo->beats_per_minute()));
 			frame_skip_error -= frame_skip;
 			skip = (uint32_t) (Meter::ticks_per_beat / bbt_beat_subdivision);
 
@@ -1493,7 +1493,7 @@ Editor::metric_get_bbt (GtkCustomRulerMark **marks, gdouble lower, gdouble /*upp
 
 				(*marks)[n].label = g_strdup (buf);
 
-				/* Error compensation for float to nframes64_t*/
+				/* Error compensation for float to framepos_t*/
 				accumulated_error += frame_skip_error;
 				if (accumulated_error > 1) {
 				        pos += 1;
@@ -1567,7 +1567,7 @@ Editor::metric_get_bbt (GtkCustomRulerMark **marks, gdouble lower, gdouble /*upp
 
 			next_beat_pos = _session->tempo_map().frame_time(next_beat);
 
-			frame_skip = (nframes64_t) floor (frame_skip_error = (_session->frame_rate() *  60) / (bbt_beat_subdivision * (*i).tempo->beats_per_minute()));
+			frame_skip = (framepos_t) floor (frame_skip_error = (_session->frame_rate() *  60) / (bbt_beat_subdivision * (*i).tempo->beats_per_minute()));
 			frame_skip_error -= frame_skip;
 			skip = (uint32_t) (Meter::ticks_per_beat / bbt_beat_subdivision);
 
@@ -1590,7 +1590,7 @@ Editor::metric_get_bbt (GtkCustomRulerMark **marks, gdouble lower, gdouble /*upp
 
 				  (*marks)[n].label = g_strdup (buf);
 
-				  /* Error compensation for float to nframes64_t*/
+				  /* Error compensation for float to framepos_t*/
 				  accumulated_error += frame_skip_error;
 				  if (accumulated_error > 1) {
 					  pos += 1;
@@ -1731,10 +1731,10 @@ Editor::metric_get_bbt (GtkCustomRulerMark **marks, gdouble lower, gdouble /*upp
 gint
 Editor::metric_get_frames (GtkCustomRulerMark **marks, gdouble lower, gdouble upper, gint /*maxchars*/)
 {
-	nframes64_t mark_interval;
-	nframes64_t pos;
-	nframes64_t ilower = (nframes64_t) floor (lower);
-	nframes64_t iupper = (nframes64_t) floor (upper);
+	framepos_t mark_interval;
+	framepos_t pos;
+	framepos_t ilower = (framepos_t) floor (lower);
+	framepos_t iupper = (framepos_t) floor (upper);
 	gchar buf[16];
 	gint nmarks;
 	gint n;
@@ -1762,15 +1762,15 @@ Editor::metric_get_frames (GtkCustomRulerMark **marks, gdouble lower, gdouble up
 }
 
 static void
-sample_to_clock_parts ( nframes64_t sample,
-			nframes64_t sample_rate,
+sample_to_clock_parts ( framepos_t sample,
+			framepos_t sample_rate,
 			long *hrs_p,
 			long *mins_p,
 			long *secs_p,
 			long *millisecs_p)
 
 {
-	nframes64_t left;
+	framepos_t left;
 	long hrs;
 	long mins;
 	long secs;
@@ -1796,9 +1796,9 @@ sample_to_clock_parts ( nframes64_t sample,
 void
 Editor::set_minsec_ruler_scale (gdouble lower, gdouble upper)
 {
-	nframes64_t range;
-	nframes64_t fr;
-	nframes64_t spacer;
+	framepos_t range;
+	framepos_t fr;
+	framepos_t spacer;
 
 	if (_session == 0) {
 		return;
@@ -1807,13 +1807,13 @@ Editor::set_minsec_ruler_scale (gdouble lower, gdouble upper)
 	fr = _session->frame_rate();
 
 	/* to prevent 'flashing' */
-	if (lower > (spacer = (nframes64_t)(128 * Editor::get_current_zoom ()))) {
+	if (lower > (spacer = (framepos_t)(128 * Editor::get_current_zoom ()))) {
 		lower -= spacer;
 	} else {
 		lower = 0;
 	}
 	upper += spacer;
-	range = (nframes64_t) (upper - lower);
+	range = (framepos_t) (upper - lower);
 
 	if (range <  (fr / 50)) {
 		minsec_mark_interval =  fr / 1000; /* show 1/1000 seconds */
@@ -1885,7 +1885,7 @@ Editor::set_minsec_ruler_scale (gdouble lower, gdouble upper)
 		minsec_mark_modulo = 2;
         } else {
 
-                /* not possible if nframes64_t is a 32 bit quantity */
+                /* not possible if framepos_t is a 32 bit quantity */
 
                 minsec_mark_interval = 4 * 60 * 60 * fr; /* show 4 hrs */
         }
@@ -1895,8 +1895,8 @@ Editor::set_minsec_ruler_scale (gdouble lower, gdouble upper)
 gint
 Editor::metric_get_minsec (GtkCustomRulerMark **marks, gdouble lower, gdouble /*upper*/, gint /*maxchars*/)
 {
-	nframes64_t pos;
-	nframes64_t spacer;
+	framepos_t pos;
+	framepos_t spacer;
 	long hrs, mins, secs, millisecs;
 	gchar buf[16];
 	gint n;
@@ -1906,14 +1906,14 @@ Editor::metric_get_minsec (GtkCustomRulerMark **marks, gdouble lower, gdouble /*
 	}
 
 	/* to prevent 'flashing' */
-	if (lower > (spacer = (nframes64_t)(128 * Editor::get_current_zoom ()))) {
+	if (lower > (spacer = (framepos_t)(128 * Editor::get_current_zoom ()))) {
 		lower = lower - spacer;
 	} else {
 		lower = 0;
 	}
 
 	*marks = (GtkCustomRulerMark *) g_malloc (sizeof(GtkCustomRulerMark) * minsec_nmarks);
-	pos = ((((nframes64_t) floor(lower)) + (minsec_mark_interval/2))/minsec_mark_interval) * minsec_mark_interval;
+	pos = ((((framepos_t) floor(lower)) + (minsec_mark_interval/2))/minsec_mark_interval) * minsec_mark_interval;
 	switch (minsec_ruler_scale) {
 	case minsec_show_seconds:
 		for (n = 0; n < minsec_nmarks; pos += minsec_mark_interval, ++n) {
diff --git a/gtk2_ardour/editor_selection.cc b/gtk2_ardour/editor_selection.cc
index 19166750cc..d17d230cf8 100644
--- a/gtk2_ardour/editor_selection.cc
+++ b/gtk2_ardour/editor_selection.cc
@@ -1178,8 +1178,8 @@ Editor::select_all_selectables_using_time_selection ()
 		return;
 	}
 
-	nframes64_t start = selection->time[clicked_selection].start;
-	nframes64_t end = selection->time[clicked_selection].end;
+	framepos_t start = selection->time[clicked_selection].start;
+	framepos_t end = selection->time[clicked_selection].end;
 
 	if (end - start < 1)  {
 		return;
@@ -1271,8 +1271,8 @@ Editor::select_all_selectables_using_loop()
 void
 Editor::select_all_selectables_using_cursor (EditorCursor *cursor, bool after)
 {
-        nframes64_t start;
-	nframes64_t end;
+        framepos_t start;
+	framepos_t end;
 	list<Selectable *> touched;
 
 	if (after) {
@@ -1311,8 +1311,8 @@ Editor::select_all_selectables_using_cursor (EditorCursor *cursor, bool after)
 void
 Editor::select_all_selectables_using_edit (bool after)
 {
-        nframes64_t start;
-	nframes64_t end;
+        framepos_t start;
+	framepos_t end;
 	list<Selectable *> touched;
 
 	if (after) {
@@ -1351,8 +1351,8 @@ Editor::select_all_selectables_using_edit (bool after)
 void
 Editor::select_all_selectables_between (bool /*within*/)
 {
-        nframes64_t start;
-	nframes64_t end;
+        framepos_t start;
+	framepos_t end;
 	list<Selectable *> touched;
 
 	if (!get_edit_op_range (start, end)) {
@@ -1380,8 +1380,8 @@ Editor::select_all_selectables_between (bool /*within*/)
 void
 Editor::select_range_between ()
 {
-        nframes64_t start;
-	nframes64_t end;
+        framepos_t start;
+	framepos_t end;
 
         if (mouse_mode == MouseRange && !selection->time.empty()) {
                 selection->clear_time ();
@@ -1396,9 +1396,9 @@ Editor::select_range_between ()
 }
 
 bool
-Editor::get_edit_op_range (nframes64_t& start, nframes64_t& end) const
+Editor::get_edit_op_range (framepos_t& start, framepos_t& end) const
 {
-	nframes64_t m;
+	framepos_t m;
 	bool ignored;
 
 	/* in range mode, use any existing selection */
diff --git a/gtk2_ardour/editor_summary.cc b/gtk2_ardour/editor_summary.cc
index 69dd3772cb..b75f228c52 100644
--- a/gtk2_ardour/editor_summary.cc
+++ b/gtk2_ardour/editor_summary.cc
@@ -713,7 +713,7 @@ EditorSummary::set_editor_y (pair<double, double> const & y)
 }
 
 void
-EditorSummary::playhead_position_changed (nframes64_t p)
+EditorSummary::playhead_position_changed (framepos_t p)
 {
 	if (_session && int (p * _x_scale) != int (_last_playhead)) {
 		set_overlays_dirty ();
diff --git a/gtk2_ardour/editor_summary.h b/gtk2_ardour/editor_summary.h
index cd01bbd946..e9258a88fd 100644
--- a/gtk2_ardour/editor_summary.h
+++ b/gtk2_ardour/editor_summary.h
@@ -74,7 +74,7 @@ private:
 	void set_editor_x (std::pair<double, double> const &);
 	void set_editor_y (double);
 	void set_editor_y (std::pair<double, double> const &);
-	void playhead_position_changed (nframes64_t);
+	void playhead_position_changed (framepos_t);
 	double summary_y_to_editor (double) const;
 	double editor_y_to_summary (double) const;
 	Position get_position (double, double) const;
diff --git a/gtk2_ardour/editor_tempodisplay.cc b/gtk2_ardour/editor_tempodisplay.cc
index 65432c3754..ac6c572af4 100644
--- a/gtk2_ardour/editor_tempodisplay.cc
+++ b/gtk2_ardour/editor_tempodisplay.cc
@@ -197,7 +197,7 @@ Editor::draw_measures ()
 }
 
 void
-Editor::mouse_add_new_tempo_event (nframes64_t frame)
+Editor::mouse_add_new_tempo_event (framepos_t frame)
 {
 	if (_session == 0) {
 		return;
@@ -239,7 +239,7 @@ Editor::mouse_add_new_tempo_event (nframes64_t frame)
 }
 
 void
-Editor::mouse_add_new_meter_event (nframes64_t frame)
+Editor::mouse_add_new_meter_event (framepos_t frame)
 {
 	if (_session == 0) {
 		return;
diff --git a/gtk2_ardour/imageframe_view.cc b/gtk2_ardour/imageframe_view.cc
index 366c56e5e5..04dde574c6 100644
--- a/gtk2_ardour/imageframe_view.cc
+++ b/gtk2_ardour/imageframe_view.cc
@@ -169,9 +169,9 @@ ImageFrameView::~ImageFrameView()
  * @return true if the position change was a success, false otherwise
  */
 bool
-ImageFrameView::set_position(nframes64_t pos, void* src, double* delta)
+ImageFrameView::set_position(framepos_t pos, void* src, double* delta)
 {
-	nframes64_t old_pos = frame_position;
+	framepos_t old_pos = frame_position;
 
 	// do the standard stuff
 	bool ret = TimeAxisViewItem::set_position(pos, src, delta);
@@ -183,7 +183,7 @@ ImageFrameView::set_position(nframes64_t pos, void* src, double* delta)
 		{
 			// calculate the offset of the marker
 			MarkerView* mv = (MarkerView*)*i;
-			nframes64_t marker_old_pos = mv->get_position();
+			framepos_t marker_old_pos = mv->get_position();
 
 			mv->set_position(pos + (marker_old_pos - old_pos), src);
 		}
@@ -200,7 +200,7 @@ ImageFrameView::set_position(nframes64_t pos, void* src, double* delta)
  * @return true if the duration change was succesful, false otherwise
  */
 bool
-ImageFrameView::set_duration(nframes64_t dur, void* src)
+ImageFrameView::set_duration(framepos_t dur, void* src)
 {
 	/* do the standard stuff */
 	bool ret = TimeAxisViewItem::set_duration(dur, src);
diff --git a/gtk2_ardour/imageframe_view.h b/gtk2_ardour/imageframe_view.h
index 1ef2af980a..ac8a3b3bb0 100644
--- a/gtk2_ardour/imageframe_view.h
+++ b/gtk2_ardour/imageframe_view.h
@@ -90,7 +90,7 @@ class ImageFrameView : public TimeAxisViewItem
 		 * @param src the identity of the object that initiated the change
 		 * @return true if the position change was a success, false otherwise
 		 */
-		virtual bool set_position(nframes64_t pos, void* src, double* delta = 0) ;
+		virtual bool set_position(framepos_t pos, void* src, double* delta = 0) ;
 
 		/**
 		 * Sets the duration of this item
@@ -99,7 +99,7 @@ class ImageFrameView : public TimeAxisViewItem
 		 * @param src the identity of the object that initiated the change
 		 * @return true if the duration change was succesful, false otherwise
 		 */
-		virtual bool set_duration(nframes64_t dur, void* src) ;
+		virtual bool set_duration(framepos_t dur, void* src) ;
 
 		//---------------------------------------------------------------------------------------//
 		// Parent Component Methods
diff --git a/gtk2_ardour/insert_time_dialog.cc b/gtk2_ardour/insert_time_dialog.cc
index 869f01ed32..78be9c1826 100644
--- a/gtk2_ardour/insert_time_dialog.cc
+++ b/gtk2_ardour/insert_time_dialog.cc
@@ -35,7 +35,7 @@ InsertTimeDialog::InsertTimeDialog (PublicEditor& e)
 {
 	set_session (_editor.session ());
 	
-	nframes64_t const pos = _editor.get_preferred_edit_position ();
+	framepos_t const pos = _editor.get_preferred_edit_position ();
 
 	get_vbox()->set_border_width (12);
 	get_vbox()->set_spacing (4);
@@ -138,7 +138,7 @@ InsertTimeDialog::move_locked_markers () const
 	return _move_locked_markers.get_active ();
 }
 
-nframes64_t
+framepos_t
 InsertTimeDialog::distance () const
 {
 	return _clock.current_duration (_editor.get_preferred_edit_position ());
diff --git a/gtk2_ardour/insert_time_dialog.h b/gtk2_ardour/insert_time_dialog.h
index 450a8e9872..34630fa908 100644
--- a/gtk2_ardour/insert_time_dialog.h
+++ b/gtk2_ardour/insert_time_dialog.h
@@ -33,7 +33,7 @@ public:
 	bool move_glued_markers () const;
 	bool move_locked_markers () const;
 	bool move_tempos () const;
-	nframes64_t distance () const;
+	framepos_t distance () const;
 
 private:
 	void move_markers_toggled ();
diff --git a/gtk2_ardour/latency_gui.cc b/gtk2_ardour/latency_gui.cc
index 93b8be3ae7..87ca39326e 100644
--- a/gtk2_ardour/latency_gui.cc
+++ b/gtk2_ardour/latency_gui.cc
@@ -32,7 +32,7 @@ LatencyBarController::get_label (int&)
 	std::stringstream s;
 
 	if (nframes < (_latency_gui->sample_rate / 1000.0)) {
-		s << ((nframes64_t) rint (nframes)) << " samples";
+		s << ((framepos_t) rint (nframes)) << " samples";
 	} else {
 		s << std::fixed << std::setprecision (2) << (nframes / (_latency_gui->sample_rate / 1000.0)) << " msecs";
 	}
@@ -40,7 +40,7 @@ LatencyBarController::get_label (int&)
 	return s.str ();
 }
 
-LatencyGUI::LatencyGUI (Latent& l, nframes64_t sr, nframes64_t psz)
+LatencyGUI::LatencyGUI (Latent& l, framepos_t sr, framepos_t psz)
 	: _latent (l),
 	  initial_value (_latent.signal_latency()),
 	  sample_rate (sr),
@@ -95,7 +95,7 @@ LatencyGUI::LatencyGUI (Latent& l, nframes64_t sr, nframes64_t psz)
 void
 LatencyGUI::finish ()
 {
-	nframes64_t new_value = (nframes64_t) adjustment.get_value();
+	framepos_t new_value = (framepos_t) adjustment.get_value();
 	if (new_value != initial_value) {
 		_latent.set_user_latency (new_value);
 	}
@@ -140,7 +140,7 @@ LatencyGUI::change_latency_from_button (int dir)
 	}
 }
 
-LatencyDialog::LatencyDialog (const std::string& title, Latent& l, nframes64_t sr, nframes64_t psz)
+LatencyDialog::LatencyDialog (const std::string& title, Latent& l, framepos_t sr, framepos_t psz)
 	: ArdourDialog (title, false, true),
 	  lwidget (l, sr, psz)
 {
diff --git a/gtk2_ardour/latency_gui.h b/gtk2_ardour/latency_gui.h
index edf2ff29e5..96aa6090d7 100644
--- a/gtk2_ardour/latency_gui.h
+++ b/gtk2_ardour/latency_gui.h
@@ -38,7 +38,7 @@ private:
 class LatencyGUI : public Gtk::VBox
 {
   public:
-	LatencyGUI (ARDOUR::Latent&, nframes64_t sample_rate, nframes64_t period_size);
+	LatencyGUI (ARDOUR::Latent&, framepos_t sample_rate, framepos_t period_size);
 	~LatencyGUI() { }
 
 	void finish ();
@@ -47,9 +47,9 @@ class LatencyGUI : public Gtk::VBox
 
   private:
 	ARDOUR::Latent& _latent;
-	nframes64_t initial_value;
-	nframes64_t sample_rate;
-	nframes64_t period_size;
+	framepos_t initial_value;
+	framepos_t sample_rate;
+	framepos_t period_size;
 	boost::shared_ptr<PBD::IgnorableControllable> ignored;
 
 	Gtk::Adjustment adjustment;
@@ -72,7 +72,7 @@ class LatencyGUI : public Gtk::VBox
 class LatencyDialog : public ArdourDialog
 {
   public:
-	LatencyDialog (const std::string& title, ARDOUR::Latent&, nframes64_t sample_rate, nframes64_t period_size);
+	LatencyDialog (const std::string& title, ARDOUR::Latent&, framepos_t sample_rate, framepos_t period_size);
 	~LatencyDialog() {}
 
   private:
diff --git a/gtk2_ardour/marker.cc b/gtk2_ardour/marker.cc
index 866bed1640..46e184a1d4 100644
--- a/gtk2_ardour/marker.cc
+++ b/gtk2_ardour/marker.cc
@@ -365,7 +365,7 @@ Marker::set_name (const string& new_name)
 }
 
 void
-Marker::set_position (nframes64_t frame)
+Marker::set_position (framepos_t frame)
 {
 	double new_unit_position = editor.frame_to_unit (frame);
 	new_unit_position -= shift;
diff --git a/gtk2_ardour/marker.h b/gtk2_ardour/marker.h
index e9ff0501ed..623e624f9d 100644
--- a/gtk2_ardour/marker.h
+++ b/gtk2_ardour/marker.h
@@ -68,11 +68,11 @@ class Marker : public sigc::trackable
 	void hide_line ();
 	void set_line_vpos (double y_origin, double height);
 
-	void set_position (nframes64_t);
+	void set_position (framepos_t);
 	void set_name (const std::string&);
 	void set_color_rgba (uint32_t rgba);
 
-	nframes64_t position() const { return frame_position; }
+	framepos_t position() const { return frame_position; }
 
 	ArdourCanvas::Group * get_parent() { return _parent; }
 	void reparent (ArdourCanvas::Group & parent);
@@ -96,7 +96,7 @@ class Marker : public sigc::trackable
 	ArdourCanvas::Points *line_points;
 
 	double        unit_position;
-	nframes64_t   frame_position;
+	framepos_t   frame_position;
 	unsigned char shift; /* should be double, but its always small and integral */
 	Type          _type;
 	int           name_height;
diff --git a/gtk2_ardour/midi_automation_line.cc b/gtk2_ardour/midi_automation_line.cc
index b0d28ec8db..6599e8a966 100755
--- a/gtk2_ardour/midi_automation_line.cc
+++ b/gtk2_ardour/midi_automation_line.cc
@@ -29,7 +29,7 @@ MidiAutomationLine::MidiAutomationLine (
 	boost::shared_ptr<ARDOUR::AutomationList>               list,
 	boost::shared_ptr<ARDOUR::MidiRegion>                   region,
 	Evoral::Parameter                                       parameter,
-	const Evoral::TimeConverter<double, ARDOUR::sframes_t>* converter)
+	const Evoral::TimeConverter<double, ARDOUR::framepos_t>* converter)
   : AutomationLine (name, tav, group, list, converter)
   , _region (region)
   , _parameter (parameter)
diff --git a/gtk2_ardour/midi_automation_line.h b/gtk2_ardour/midi_automation_line.h
index c632ddf25d..fb9171824a 100755
--- a/gtk2_ardour/midi_automation_line.h
+++ b/gtk2_ardour/midi_automation_line.h
@@ -30,7 +30,7 @@ public:
 			    boost::shared_ptr<ARDOUR::AutomationList>,
 			    boost::shared_ptr<ARDOUR::MidiRegion>,
 			    Evoral::Parameter,
-			    const Evoral::TimeConverter<double, ARDOUR::sframes_t>* converter = 0);
+			    const Evoral::TimeConverter<double, ARDOUR::framepos_t>* converter = 0);
 
 	MementoCommandBinder<ARDOUR::AutomationList>* memento_command_binder ();
 
diff --git a/gtk2_ardour/midi_region_view.cc b/gtk2_ardour/midi_region_view.cc
index 9f2d859597..f5a0d98f20 100644
--- a/gtk2_ardour/midi_region_view.cc
+++ b/gtk2_ardour/midi_region_view.cc
@@ -328,7 +328,7 @@ bool
 MidiRegionView::button_release (GdkEventButton* ev)
 {
 	double event_x, event_y;
-	nframes64_t event_frame = 0;
+	framepos_t event_frame = 0;
 
         event_x = ev->x;
         event_y = ev->y;
@@ -398,7 +398,7 @@ bool
 MidiRegionView::motion (GdkEventMotion* ev)
 {
 	double event_x, event_y;
-	nframes64_t event_frame = 0;
+	framepos_t event_frame = 0;
 
         event_x = ev->x;
         event_y = ev->y;
@@ -665,7 +665,7 @@ MidiRegionView::create_note_at(double x, double y, double length, bool sh)
 	assert(note <= 127.0);
 
 	// Start of note in frames relative to region start
-	nframes64_t const start_frames = snap_frame_to_frame(trackview.editor().pixel_to_frame(x));
+	framepos_t const start_frames = snap_frame_to_frame(trackview.editor().pixel_to_frame(x));
 	assert(start_frames >= 0);
 
 	// Snap length
@@ -1289,7 +1289,7 @@ MidiRegionView::resolve_note(uint8_t note, double end_time)
 	}
 
 	if (_active_notes && _active_notes[note]) {
-		const nframes64_t end_time_frames = beats_to_frames(end_time);
+		const framepos_t end_time_frames = beats_to_frames(end_time);
 		_active_notes[note]->property_x2() = trackview.editor().frame_to_pixel(end_time_frames);
 		_active_notes[note]->property_outline_what() = (guint32) 0xF; // all edges
 		_active_notes[note] = 0;
@@ -1358,7 +1358,7 @@ MidiRegionView::play_midi_chord (vector<boost::shared_ptr<NoteType> > notes)
 bool
 MidiRegionView::note_in_region_range(const boost::shared_ptr<NoteType> note, bool& visible) const
 {
-	const nframes64_t note_start_frames = beats_to_frames(note->time());
+	const framepos_t note_start_frames = beats_to_frames(note->time());
 
 	bool outside = (note_start_frames - _region->start() >= _region->length()) ||
 		(note_start_frames < _region->start());
@@ -1374,10 +1374,10 @@ MidiRegionView::update_note (CanvasNote* ev)
 {
 	boost::shared_ptr<NoteType> note = ev->note();
 
-	const nframes64_t note_start_frames = beats_to_frames(note->time());
+	const framepos_t note_start_frames = beats_to_frames(note->time());
 
 	/* trim note display to not overlap the end of its region */
-	const nframes64_t note_end_frames = min (beats_to_frames (note->end_time()), _region->start() + _region->length());
+	const framepos_t note_end_frames = min (beats_to_frames (note->end_time()), _region->start() + _region->length());
 
 	const double x = trackview.editor().frame_to_pixel(note_start_frames - _region->start());
 	const double y1 = midi_stream_view()->note_to_y(note->note());
@@ -1418,7 +1418,7 @@ MidiRegionView::update_hit (CanvasHit* ev)
 {
 	boost::shared_ptr<NoteType> note = ev->note();
 
-	const nframes64_t note_start_frames = beats_to_frames(note->time());
+	const framepos_t note_start_frames = beats_to_frames(note->time());
 	const double x = trackview.editor().frame_to_pixel(note_start_frames - _region->start());
 	const double diamond_size = midi_stream_view()->note_height() / 2.0;
 	const double y = midi_stream_view()->note_to_y(note->note()) + ((diamond_size-2) / 4.0);
@@ -1499,8 +1499,8 @@ MidiRegionView::step_add_note (uint8_t channel, uint8_t number, uint8_t velocity
 
 	/* potentially extend region to hold new note */
 
-	nframes64_t end_frame = _region->position() + beats_to_frames (new_note->end_time());
-	nframes64_t region_end = _region->position() + _region->length() - 1;
+	framepos_t end_frame = _region->position() + beats_to_frames (new_note->end_time());
+	framepos_t region_end = _region->position() + _region->length() - 1;
 
 	if (end_frame > region_end) {
 		_region->set_length (end_frame - _region->position(), this);
@@ -2090,22 +2090,22 @@ MidiRegionView::note_dropped(CanvasNoteEvent *, frameoffset_t dt, int8_t dnote)
 	}
 }
 
-nframes64_t
+framepos_t
 MidiRegionView::snap_pixel_to_frame(double x)
 {
 	PublicEditor& editor = trackview.editor();
 	// x is region relative, convert it to global absolute frames
-	nframes64_t frame = editor.pixel_to_frame(x) + _region->position();
+	framepos_t frame = editor.pixel_to_frame(x) + _region->position();
 	editor.snap_to(frame);
 	return frame - _region->position(); // convert back to region relative
 }
 
-nframes64_t
-MidiRegionView::snap_frame_to_frame(nframes64_t x)
+framepos_t
+MidiRegionView::snap_frame_to_frame(framepos_t x)
 {
 	PublicEditor& editor = trackview.editor();
 	// x is region relative, convert it to global absolute frames
-	nframes64_t frame = x + _region->position();
+	framepos_t frame = x + _region->position();
 	editor.snap_to(frame);
 	return frame - _region->position(); // convert back to region relative
 }
@@ -2119,25 +2119,25 @@ MidiRegionView::snap_to_pixel(double x)
 double
 MidiRegionView::get_position_pixels()
 {
-	nframes64_t region_frame = get_position();
+	framepos_t region_frame = get_position();
 	return trackview.editor().frame_to_pixel(region_frame);
 }
 
 double
 MidiRegionView::get_end_position_pixels()
 {
-	nframes64_t frame = get_position() + get_duration ();
+	framepos_t frame = get_position() + get_duration ();
 	return trackview.editor().frame_to_pixel(frame);
 }
 
-nframes64_t
+framepos_t
 MidiRegionView::beats_to_frames(double beats) const
 {
 	return _time_converter.to(beats);
 }
 
 double
-MidiRegionView::frames_to_beats(nframes64_t frames) const
+MidiRegionView::frames_to_beats(framepos_t frames) const
 {
 	return _time_converter.from(frames);
 }
@@ -2596,9 +2596,9 @@ MidiRegionView::nudge_notes (bool forward)
 	   into a vector and sort before using the first one.
 	*/
 
-	nframes64_t ref_point = _region->position() + beats_to_frames ((*(_selection.begin()))->note()->time());
-	nframes64_t unused;
-	nframes64_t distance;
+	framepos_t ref_point = _region->position() + beats_to_frames ((*(_selection.begin()))->note()->time());
+	framepos_t unused;
+	framepos_t distance;
 
 	if (trackview.editor().snap_mode() == Editing::SnapOff) {
 		
@@ -2784,7 +2784,7 @@ MidiRegionView::selection_as_cut_buffer () const
 }
 
 void
-MidiRegionView::paste (nframes64_t pos, float times, const MidiCutBuffer& mcb)
+MidiRegionView::paste (framepos_t pos, float times, const MidiCutBuffer& mcb)
 {
 	if (mcb.empty()) {
 		return;
@@ -2822,8 +2822,8 @@ MidiRegionView::paste (nframes64_t pos, float times, const MidiCutBuffer& mcb)
 
 	/* if we pasted past the current end of the region, extend the region */
 
-	nframes64_t end_frame = _region->position() + beats_to_frames (end_point);
-	nframes64_t region_end = _region->position() + _region->length() - 1;
+	framepos_t end_frame = _region->position() + beats_to_frames (end_point);
+	framepos_t region_end = _region->position() + _region->length() - 1;
 
 	if (end_frame > region_end) {
 
@@ -2859,7 +2859,7 @@ MidiRegionView::time_sort_events ()
 void
 MidiRegionView::goto_next_note ()
 {
-	// nframes64_t pos = -1;
+	// framepos_t pos = -1;
 	bool use_next = false;
 
 	if (_events.back()->selected()) {
@@ -2888,7 +2888,7 @@ MidiRegionView::goto_next_note ()
 void
 MidiRegionView::goto_previous_note ()
 {
-	// nframes64_t pos = -1;
+	// framepos_t pos = -1;
 	bool use_next = false;
 
 	if (_events.front()->selected()) {
@@ -2941,7 +2941,7 @@ MidiRegionView::update_ghost_note (double x, double y)
 	_last_ghost_y = y;
 	
 	group->w2i (x, y);
-	nframes64_t f = trackview.editor().pixel_to_frame (x) + _region->position ();
+	framepos_t f = trackview.editor().pixel_to_frame (x) + _region->position ();
 	trackview.editor().snap_to (f);
 	f -= _region->position ();
 
diff --git a/gtk2_ardour/midi_region_view.h b/gtk2_ardour/midi_region_view.h
index baf67928c8..4e4e9544c5 100644
--- a/gtk2_ardour/midi_region_view.h
+++ b/gtk2_ardour/midi_region_view.h
@@ -118,7 +118,7 @@ class MidiRegionView : public RegionView
 	void resolve_note(uint8_t note_num, double end_time);
 
 	void cut_copy_clear (Editing::CutCopyOp);
-	void paste (nframes64_t pos, float times, const MidiCutBuffer&);
+	void paste (framepos_t pos, float times, const MidiCutBuffer&);
 
 	struct PCEvent {
 		PCEvent(double a_time, uint8_t a_value, uint8_t a_channel)
@@ -253,21 +253,21 @@ class MidiRegionView : public RegionView
 
 	/** Snap a region relative pixel coordinate to frame units.
 	 * @param x a pixel coordinate relative to region start
-	 * @return the snapped nframes64_t coordinate relative to region start
+	 * @return the snapped framepos_t coordinate relative to region start
 	 */
-	nframes64_t snap_pixel_to_frame(double x);
+	framepos_t snap_pixel_to_frame(double x);
 
 	/** Snap a region relative frame coordinate to frame units.
 	 * @param x a pixel coordinate relative to region start
-	 * @return the snapped nframes64_t coordinate relative to region start
+	 * @return the snapped framepos_t coordinate relative to region start
 	 */
-	nframes64_t snap_frame_to_frame(nframes64_t x);
+	framepos_t snap_frame_to_frame(framepos_t x);
 
 	/** Convert a timestamp in beats to frames (both relative to region start) */
-	nframes64_t beats_to_frames(double beats) const;
+	framepos_t beats_to_frames(double beats) const;
 
 	/** Convert a timestamp in frames to beats (both relative to region start) */
-	double frames_to_beats(nframes64_t) const;
+	double frames_to_beats(framepos_t) const;
 
 	void goto_previous_note ();
 	void goto_next_note ();
diff --git a/gtk2_ardour/public_editor.h b/gtk2_ardour/public_editor.h
index a393b11e4c..9c7750adca 100644
--- a/gtk2_ardour/public_editor.h
+++ b/gtk2_ardour/public_editor.h
@@ -81,6 +81,9 @@ class ImageFrameTimeAxis;
 class MarkerView;
 class DragManager;
 
+using ARDOUR::framepos_t;
+using ARDOUR::framecnt_t;
+
 /// Representation of the interface of the Editor class
 
 /** This class contains just the public interface of the Editor class,
@@ -128,7 +131,7 @@ class PublicEditor : public Gtk::Window, public PBD::StatefulDestructible {
 	virtual void set_snap_threshold (double t) = 0;
 
 	/** Snap a value according to the current snap setting. */
-	virtual void snap_to (nframes64_t& first, int32_t direction = 0, bool for_mark = false) = 0;
+	virtual void snap_to (framepos_t& first, int32_t direction = 0, bool for_mark = false) = 0;
 
 	/** Undo some transactions.
 	 * @param n Number of transactions to undo.
@@ -185,15 +188,15 @@ class PublicEditor : public Gtk::Window, public PBD::StatefulDestructible {
 	virtual void separate_region_from_selection () = 0;
 
 	virtual void transition_to_rolling (bool fwd) = 0;
-	virtual nframes64_t unit_to_frame (double unit) const = 0;
-	// XXX remove me when libardour goes nframes64_t
+	virtual framepos_t unit_to_frame (double unit) const = 0;
+	// XXX remove me when libardour goes framepos_t
 	double frame_to_unit (nframes_t frame) const {
-		return frame_to_unit ((nframes64_t) frame);
+		return frame_to_unit ((framepos_t) frame);
 	}
-	virtual double frame_to_unit (nframes64_t frame) const = 0;
+	virtual double frame_to_unit (framepos_t frame) const = 0;
 	virtual double frame_to_unit (double frame) const = 0;
-	virtual nframes64_t pixel_to_frame (double pixel) const = 0;
-	virtual gulong frame_to_pixel (nframes64_t frame) const = 0;
+	virtual framepos_t pixel_to_frame (double pixel) const = 0;
+	virtual gulong frame_to_pixel (framepos_t frame) const = 0;
 	virtual Selection& get_selection () const = 0;
 	virtual Selection& get_cut_buffer () const = 0;
 	virtual bool extend_selection_to_track (TimeAxisView&) = 0;
@@ -245,25 +248,25 @@ class PublicEditor : public Gtk::Window, public PBD::StatefulDestructible {
 	virtual bool dragging_playhead () const = 0;
 	virtual void ensure_float (Gtk::Window&) = 0;
 	virtual void show_window () = 0;
-	virtual nframes64_t leftmost_position() const = 0;
-	virtual nframes64_t current_page_frames() const = 0;
+	virtual framepos_t leftmost_position() const = 0;
+	virtual framecnt_t current_page_frames() const = 0;
 	virtual void temporal_zoom_step (bool coarser) = 0;
 	virtual void scroll_tracks_down_line () = 0;
 	virtual void scroll_tracks_up_line () = 0;
 	virtual void prepare_for_cleanup () = 0;
 	virtual void finish_cleanup () = 0;
-	virtual void reset_x_origin (nframes64_t frame) = 0;
+	virtual void reset_x_origin (framepos_t frame) = 0;
 	virtual void remove_last_capture () = 0;
 	virtual void maximise_editing_space () = 0;
 	virtual void restore_editing_space () = 0;
-	virtual nframes64_t get_preferred_edit_position (bool ignore_playhead = false) = 0;
+	virtual framepos_t get_preferred_edit_position (bool ignore_playhead = false) = 0;
 	virtual void toggle_meter_updating() = 0;
 	virtual void split_region_at_points (boost::shared_ptr<ARDOUR::Region>, ARDOUR::AnalysisFeatureList&, bool can_ferret) = 0;
-	virtual void mouse_add_new_marker (nframes64_t where, bool is_cd=false, bool is_xrun=false) = 0;
+	virtual void mouse_add_new_marker (framepos_t where, bool is_cd=false, bool is_xrun=false) = 0;
 	virtual void foreach_time_axis_view (sigc::slot<void,TimeAxisView&>) = 0;
 	virtual void add_to_idle_resize (TimeAxisView*, int32_t) = 0;
-	virtual nframes64_t get_nudge_distance (nframes64_t pos, nframes64_t& next) = 0;
-	virtual Evoral::MusicalTime get_grid_type_as_beats (bool& success, nframes64_t position) = 0;
+	virtual framecnt_t get_nudge_distance (framepos_t pos, framecnt_t& next) = 0;
+	virtual Evoral::MusicalTime get_grid_type_as_beats (bool& success, framepos_t position) = 0;
 
 #ifdef WITH_CMT
 	virtual void connect_to_image_compositor()  = 0;
@@ -281,7 +284,7 @@ class PublicEditor : public Gtk::Window, public PBD::StatefulDestructible {
 	sigc::signal<void> ZoomChanged;
 	sigc::signal<void> Resized;
 	sigc::signal<void> Realized;
-	sigc::signal<void,nframes64_t> UpdateAllTransportClocks;
+	sigc::signal<void,framepos_t> UpdateAllTransportClocks;
 
         static sigc::signal<void> DropDownKeys;
         
@@ -353,7 +356,7 @@ class PublicEditor : public Gtk::Window, public PBD::StatefulDestructible {
 	virtual void show_verbose_canvas_cursor_with (const std::string& txt) = 0;
 	virtual void hide_verbose_canvas_cursor() = 0;
 
-	virtual void center_screen (nframes64_t) = 0;
+	virtual void center_screen (framepos_t) = 0;
 
 	virtual TrackViewList axis_views_from_routes (boost::shared_ptr<ARDOUR::RouteList>) const = 0;
 	virtual TrackViewList const & get_track_views () = 0;
diff --git a/gtk2_ardour/region_layering_order_editor.h b/gtk2_ardour/region_layering_order_editor.h
index 10bcd989b7..32d0971e5c 100644
--- a/gtk2_ardour/region_layering_order_editor.h
+++ b/gtk2_ardour/region_layering_order_editor.h
@@ -32,7 +32,7 @@ class RegionLayeringOrderEditor : public ArdourDialog
 
   private:
 	boost::shared_ptr<ARDOUR::Playlist> playlist;
-	nframes64_t position;
+	framepos_t position;
 	bool in_row_change;
 	uint32_t regions_at_position;
 	
diff --git a/gtk2_ardour/region_view.cc b/gtk2_ardour/region_view.cc
index e4911a43da..c3518ca61a 100644
--- a/gtk2_ardour/region_view.cc
+++ b/gtk2_ardour/region_view.cc
@@ -324,7 +324,7 @@ RegionView::lower_to_bottom ()
 }
 
 bool
-RegionView::set_position (nframes64_t pos, void* /*src*/, double* ignored)
+RegionView::set_position (framepos_t pos, void* /*src*/, double* ignored)
 {
 	double delta;
 	bool ret;
@@ -360,7 +360,7 @@ RegionView::set_samples_per_unit (gdouble spu)
 }
 
 bool
-RegionView::set_duration (nframes64_t frames, void *src)
+RegionView::set_duration (framecnt_t frames, void *src)
 {
 	if (!TimeAxisViewItem::set_duration (frames, src)) {
 		return false;
diff --git a/gtk2_ardour/region_view.h b/gtk2_ardour/region_view.h
index 71c7e5383a..c65b81bc7b 100644
--- a/gtk2_ardour/region_view.h
+++ b/gtk2_ardour/region_view.h
@@ -63,14 +63,14 @@ class RegionView : public TimeAxisViewItem
 
 	virtual void set_height (double);
 	virtual void set_samples_per_unit (double);
-	virtual bool set_duration (nframes64_t, void*);
+	virtual bool set_duration (framecnt_t, void*);
 
 	void move (double xdelta, double ydelta);
 
 	void raise_to_top ();
 	void lower_to_bottom ();
 
-	bool set_position(nframes64_t pos, void* src, double* delta = 0);
+	bool set_position(framepos_t pos, void* src, double* delta = 0);
 	void fake_set_opaque (bool yn);
 
 	virtual void show_region_editor ();
diff --git a/gtk2_ardour/rhythm_ferret.cc b/gtk2_ardour/rhythm_ferret.cc
index 956a012697..fbfcab6c49 100644
--- a/gtk2_ardour/rhythm_ferret.cc
+++ b/gtk2_ardour/rhythm_ferret.cc
@@ -212,7 +212,7 @@ RhythmFerret::run_analysis ()
 }
 
 int
-RhythmFerret::run_percussion_onset_analysis (boost::shared_ptr<Readable> readable, nframes64_t /*offset*/, AnalysisFeatureList& results)
+RhythmFerret::run_percussion_onset_analysis (boost::shared_ptr<Readable> readable, framepos_t /*offset*/, AnalysisFeatureList& results)
 {
 	TransientDetector t (_session->frame_rate());
 
@@ -265,7 +265,7 @@ RhythmFerret::get_note_onset_function ()
 }
 
 int
-RhythmFerret::run_note_onset_analysis (boost::shared_ptr<Readable> readable, nframes64_t /*offset*/, AnalysisFeatureList& results)
+RhythmFerret::run_note_onset_analysis (boost::shared_ptr<Readable> readable, framepos_t /*offset*/, AnalysisFeatureList& results)
 {
 	try {
 		OnsetDetector t (_session->frame_rate());
diff --git a/gtk2_ardour/rhythm_ferret.h b/gtk2_ardour/rhythm_ferret.h
index 043b9fe8a7..1d84645056 100644
--- a/gtk2_ardour/rhythm_ferret.h
+++ b/gtk2_ardour/rhythm_ferret.h
@@ -85,8 +85,8 @@ class RhythmFerret : public ArdourDialog {
 	int get_note_onset_function ();
 
 	void run_analysis ();
-	int run_percussion_onset_analysis (boost::shared_ptr<ARDOUR::Readable> region, nframes64_t offset, ARDOUR::AnalysisFeatureList& results);
-	int run_note_onset_analysis (boost::shared_ptr<ARDOUR::Readable> region, nframes64_t offset, ARDOUR::AnalysisFeatureList& results);
+	int run_percussion_onset_analysis (boost::shared_ptr<ARDOUR::Readable> region, ARDOUR::frameoffset_t offset, ARDOUR::AnalysisFeatureList& results);
+	int run_note_onset_analysis (boost::shared_ptr<ARDOUR::Readable> region, ARDOUR::frameoffset_t offset, ARDOUR::AnalysisFeatureList& results);
 
 	void do_action ();
 	void do_split_action ();
diff --git a/gtk2_ardour/route_time_axis.cc b/gtk2_ardour/route_time_axis.cc
index abc8101195..d4b67800bb 100644
--- a/gtk2_ardour/route_time_axis.cc
+++ b/gtk2_ardour/route_time_axis.cc
@@ -1296,8 +1296,8 @@ RouteTimeAxisView::find_next_region (nframes_t pos, RegionPoint point, int32_t d
 	return boost::shared_ptr<Region> ();
 }
 
-nframes64_t
-RouteTimeAxisView::find_next_region_boundary (nframes64_t pos, int32_t dir)
+framepos_t
+RouteTimeAxisView::find_next_region_boundary (framepos_t pos, int32_t dir)
 {
 	boost::shared_ptr<Playlist> pl = playlist ();
 
diff --git a/gtk2_ardour/route_time_axis.h b/gtk2_ardour/route_time_axis.h
index 90cc4aa48c..7dd61ac72c 100644
--- a/gtk2_ardour/route_time_axis.h
+++ b/gtk2_ardour/route_time_axis.h
@@ -89,7 +89,7 @@ public:
 	LayerDisplay layer_display () const;
 
 	boost::shared_ptr<ARDOUR::Region> find_next_region (nframes_t pos, ARDOUR::RegionPoint, int32_t dir);
-	nframes64_t find_next_region_boundary (nframes64_t pos, int32_t dir);
+	framepos_t find_next_region_boundary (framepos_t pos, int32_t dir);
 
 	/* Editing operations */
 	void cut_copy_clear (Selection&, Editing::CutCopyOp);
diff --git a/gtk2_ardour/sfdb_ui.cc b/gtk2_ardour/sfdb_ui.cc
index a48fcd2767..a9bec00123 100644
--- a/gtk2_ardour/sfdb_ui.cc
+++ b/gtk2_ardour/sfdb_ui.cc
@@ -1099,7 +1099,7 @@ bool
 SoundFileOmega::check_info (const vector<string>& paths, bool& same_size, bool& src_needed, bool& multichannel)
 {
 	SoundFileInfo info;
-	nframes64_t sz = 0;
+	framepos_t sz = 0;
 	bool err = false;
 	string errmsg;
 
diff --git a/gtk2_ardour/tempo_lines.cc b/gtk2_ardour/tempo_lines.cc
index aa8b48fc2b..3fafe9bcd8 100644
--- a/gtk2_ardour/tempo_lines.cc
+++ b/gtk2_ardour/tempo_lines.cc
@@ -102,12 +102,12 @@ TempoLines::draw (ARDOUR::TempoMap::BBTPointList& points, double frames_per_unit
 		return;
 	}
 
-	xpos = rint(((nframes64_t)(*i).frame) / (double)frames_per_unit);
+	xpos = rint(((framepos_t)(*i).frame) / (double)frames_per_unit);
 	const double needed_right = xpos;
 
 	i = points.begin();
 
-	xpos = rint(((nframes64_t)(*i).frame) / (double)frames_per_unit);
+	xpos = rint(((framepos_t)(*i).frame) / (double)frames_per_unit);
 	const double needed_left = xpos;
 
 	Lines::iterator left = _lines.lower_bound(xpos); // first line >= xpos
@@ -145,7 +145,7 @@ TempoLines::draw (ARDOUR::TempoMap::BBTPointList& points, double frames_per_unit
 				}
 			}
 
-			xpos = rint(((nframes64_t)(*i).frame) / (double)frames_per_unit);
+			xpos = rint(((framepos_t)(*i).frame) / (double)frames_per_unit);
 
 			if (inserted_last_time && !_lines.empty()) {
 				li = _lines.lower_bound(xpos); // first line >= xpos
diff --git a/gtk2_ardour/time_axis_view_item.cc b/gtk2_ardour/time_axis_view_item.cc
index 118f4033a6..a79b1033a9 100644
--- a/gtk2_ardour/time_axis_view_item.cc
+++ b/gtk2_ardour/time_axis_view_item.cc
@@ -94,7 +94,7 @@ TimeAxisViewItem::set_constant_heights ()
  */
 TimeAxisViewItem::TimeAxisViewItem(
 	const string & it_name, ArdourCanvas::Group& parent, TimeAxisView& tv, double spu, Gdk::Color const & base_color,
-	nframes64_t start, nframes64_t duration, bool recording, bool automation, Visibility vis
+	framepos_t start, framecnt_t duration, bool recording, bool automation, Visibility vis
 	)
 	: trackview (tv)
 	, _height (1.0)
@@ -136,7 +136,7 @@ TimeAxisViewItem::TimeAxisViewItem (const TimeAxisViewItem& other)
 
 void
 TimeAxisViewItem::init (
-	const string& it_name, double spu, Gdk::Color const & base_color, nframes64_t start, nframes64_t duration, Visibility vis, bool wide, bool high)
+	const string& it_name, double spu, Gdk::Color const & base_color, framepos_t start, framepos_t duration, Visibility vis, bool wide, bool high)
 {
 	item_name = it_name;
 	samples_per_unit = spu;
@@ -241,7 +241,7 @@ TimeAxisViewItem::~TimeAxisViewItem()
  */
 
 bool
-TimeAxisViewItem::set_position(nframes64_t pos, void* src, double* delta)
+TimeAxisViewItem::set_position(framepos_t pos, void* src, double* delta)
 {
 	if (position_locked) {
 		return false;
@@ -277,7 +277,7 @@ TimeAxisViewItem::set_position(nframes64_t pos, void* src, double* delta)
 }
 
 /** @return position of this item on the timeline */
-nframes64_t
+framepos_t
 TimeAxisViewItem::get_position() const
 {
 	return frame_position;
@@ -292,7 +292,7 @@ TimeAxisViewItem::get_position() const
  */
 
 bool
-TimeAxisViewItem::set_duration (nframes64_t dur, void* src)
+TimeAxisViewItem::set_duration (framepos_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)
@@ -313,7 +313,7 @@ TimeAxisViewItem::set_duration (nframes64_t dur, void* src)
 }
 
 /** @return duration of this item */
-nframes64_t
+framepos_t
 TimeAxisViewItem::get_duration() const
 {
 	return item_duration;
@@ -326,14 +326,14 @@ TimeAxisViewItem::get_duration() const
  * @param src the identity of the object that initiated the change
  */
 void
-TimeAxisViewItem::set_max_duration(nframes64_t dur, void* src)
+TimeAxisViewItem::set_max_duration(framecnt_t dur, void* src)
 {
 	max_item_duration = dur;
 	MaxDurationChanged(max_item_duration, src); /* EMIT_SIGNAL */
 }
 
 /** @return the maximum duration that this item may have */
-nframes64_t
+framecnt_t
 TimeAxisViewItem::get_max_duration() const
 {
 	return max_item_duration;
@@ -346,14 +346,14 @@ TimeAxisViewItem::get_max_duration() const
  * @param src the identity of the object that initiated the change
  */
 void
-TimeAxisViewItem::set_min_duration(nframes64_t dur, void* src)
+TimeAxisViewItem::set_min_duration(framecnt_t dur, void* src)
 {
 	min_item_duration = dur;
 	MinDurationChanged(max_item_duration, src); /* EMIT_SIGNAL */
 }
 
 /** @return the minimum duration that this item mey have */
-nframes64_t
+framecnt_t
 TimeAxisViewItem::get_min_duration() const
 {
 	return min_item_duration;
diff --git a/gtk2_ardour/time_axis_view_item.h b/gtk2_ardour/time_axis_view_item.h
index d2930255af..d51bacc7cb 100644
--- a/gtk2_ardour/time_axis_view_item.h
+++ b/gtk2_ardour/time_axis_view_item.h
@@ -32,6 +32,9 @@
 
 class TimeAxisView;
 
+using ARDOUR::framepos_t;
+using ARDOUR::framecnt_t;
+
 /**
  * Base class for items that may appear upon a TimeAxisView.
  */
@@ -41,14 +44,14 @@ class TimeAxisViewItem : public Selectable, public PBD::ScopedConnectionList
    public:
 	virtual ~TimeAxisViewItem();
 
-	virtual bool set_position(nframes64_t, void*, double* delta = 0);
-	nframes64_t get_position() const;
-	virtual bool set_duration(nframes64_t, void*);
-	nframes64_t get_duration() const;
-	virtual void set_max_duration(nframes64_t, void*);
-	nframes64_t get_max_duration() const;
-	virtual void set_min_duration(nframes64_t, void*);
-	nframes64_t get_min_duration() const;
+	virtual bool set_position(framepos_t, void*, double* delta = 0);
+	framepos_t get_position() const;
+	virtual bool set_duration(framecnt_t, void*);
+	framecnt_t get_duration() const;
+	virtual void set_max_duration(framecnt_t, void*);
+	framecnt_t get_max_duration() const;
+	virtual void set_min_duration(framecnt_t, void*);
+	framecnt_t get_min_duration() const;
 	virtual void set_position_locked(bool, void*);
 	bool get_position_locked() const;
 	void set_max_duration_active(bool, void*);
@@ -112,19 +115,19 @@ class TimeAxisViewItem : public Selectable, public PBD::ScopedConnectionList
 	sigc::signal<void,std::string,std::string,void*> NameChanged;
 	
 	/** Emiited when the position of this item changes */
-	sigc::signal<void,nframes64_t,void*> PositionChanged;
+	sigc::signal<void,framepos_t,void*> PositionChanged;
 	
 	/** Emitted when the position lock of this item is changed */
 	sigc::signal<void,bool,void*> PositionLockChanged;
 	
 	/** Emitted when the duration of this item changes */
-	sigc::signal<void,nframes64_t,void*> DurationChanged;
+	sigc::signal<void,framecnt_t,void*> DurationChanged;
 	
 	/** Emitted when the maximum item duration is changed */
-	sigc::signal<void,nframes64_t,void*> MaxDurationChanged;
+	sigc::signal<void,framecnt_t,void*> MaxDurationChanged;
 	
 	/** Emitted when the mionimum item duration is changed */
-	sigc::signal<void,nframes64_t,void*> MinDurationChanged;
+	sigc::signal<void,framecnt_t,void*> MinDurationChanged;
 	
 	enum Visibility {
 		ShowFrame = 0x1,
@@ -137,13 +140,13 @@ class TimeAxisViewItem : public Selectable, public PBD::ScopedConnectionList
 		FullWidthNameHighlight = 0x80
 	};
 	
-protected:
+  protected:
 	TimeAxisViewItem(const std::string &, ArdourCanvas::Group&, TimeAxisView&, double, Gdk::Color const &,
-			 nframes64_t, nframes64_t, bool recording = false, bool automation = false, Visibility v = Visibility (0));
+			 framepos_t, framepos_t, bool recording = false, bool automation = false, Visibility v = Visibility (0));
 	
 	TimeAxisViewItem (const TimeAxisViewItem&);
 	
-	void init (const std::string&, double, Gdk::Color const &, nframes64_t, nframes64_t, Visibility, bool, bool);
+	void init (const std::string&, double, Gdk::Color const &, framepos_t, framepos_t, Visibility, bool, bool);
 
 	virtual void compute_colors (Gdk::Color const &);
 	virtual void set_colors();
@@ -163,16 +166,16 @@ protected:
 	bool position_locked;
 	
 	/** position of this item on the timeline */
-	nframes64_t frame_position;
+	framepos_t frame_position;
 
 	/** duration of this item upon the timeline */
-	nframes64_t item_duration;
-	
+	framecnt_t item_duration;
+        
 	/** maximum duration that this item can have */
-	nframes64_t max_item_duration;
+	framecnt_t max_item_duration;
 	
 	/** minimum duration that this item can have */
-	nframes64_t min_item_duration;
+	framecnt_t min_item_duration;
 	
 	/** indicates whether the max duration constraint is active */
 	bool max_duration_active;