Merged with trunk R992.

[ardour.git] / gtk2_ardour / export_range_markers_dialog.cc

diff --git a/gtk2_ardour/export_range_markers_dialog.cc b/gtk2_ardour/export_range_markers_dialog.cc
index e43eb20cd1963cd23032e91b77ea8a18e02f72b2..c91e1c101a25514e0fe6f3156942ed27904eea95 100644 (file)
--- a/gtk2_ardour/export_range_markers_dialog.cc
+++ b/gtk2_ardour/export_range_markers_dialog.cc
@@ -166,7 +166,7 @@ ExportRangeMarkersDialog::init_progress_computing(Locations::LocationList& locat
        // flush vector
        range_markers_durations_aggregated.resize(0);
        
-       jack_nframes_t duration_before_current_location = 0;
+       nframes_t duration_before_current_location = 0;
        Locations::LocationList::iterator locationIter;
                
        for (locationIter = locations.begin(); locationIter != locations.end(); ++locationIter) {
@@ -176,7 +176,7 @@ ExportRangeMarkersDialog::init_progress_computing(Locations::LocationList& locat
                        range_markers_durations_aggregated.push_back(
                                duration_before_current_location);
                        
-                       jack_nframes_t duration = 
+                       nframes_t duration = 
                                currentLocation->end() - currentLocation->start();
                        
                        range_markers_durations.push_back(duration);