X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_export_audio.cc;h=8159b784bc5e3f79dd1ba640b0d2df4eeaae449f;hb=5981b7f1b8bc85444d66ab0ffac2dee412dd21ea;hp=f2cc8e3d048cb6fdb1342d5c524b104e18349373;hpb=29447f48eb93ce304769e4dc17050e25068697b9;p=ardour.git

diff --git a/gtk2_ardour/editor_export_audio.cc b/gtk2_ardour/editor_export_audio.cc
index f2cc8e3d04..8159b784bc 100644
--- a/gtk2_ardour/editor_export_audio.cc
+++ b/gtk2_ardour/editor_export_audio.cc
@@ -27,8 +27,6 @@
 
 #include "pbd/gstdio_compat.h"
 
-#include "gtkmm2ext/choice.h"
-
 #include "pbd/pthread_utils.h"
 
 #include "ardour/audio_track.h"
@@ -215,11 +213,11 @@ bool
 Editor::write_region (string path, boost::shared_ptr<AudioRegion> region)
 {
 	boost::shared_ptr<AudioFileSource> fs;
-	const framepos_t chunk_size = 4096;
-	framepos_t to_read;
+	const samplepos_t chunk_size = 4096;
+	samplepos_t to_read;
 	Sample buf[chunk_size];
 	gain_t gain_buffer[chunk_size];
-	framepos_t pos;
+	samplepos_t pos;
 	char s[PATH_MAX+1];
 	uint32_t cnt;
 	vector<boost::shared_ptr<AudioFileSource> > sources;
@@ -268,7 +266,7 @@ Editor::write_region (string path, boost::shared_ptr<AudioRegion> region)
 				fs = boost::dynamic_pointer_cast<AudioFileSource> (
 					SourceFactory::createWritable (DataType::AUDIO, *_session,
 					                               path, true,
-					                               false, _session->frame_rate()));
+					                               false, _session->sample_rate()));
 			}
 
 			catch (failed_constructor& err) {
@@ -287,7 +285,7 @@ Editor::write_region (string path, boost::shared_ptr<AudioRegion> region)
 	pos = region->position();
 
 	while (to_read) {
-		framepos_t this_time;
+		samplepos_t this_time;
 
 		this_time = min (to_read, chunk_size);
 
@@ -365,11 +363,11 @@ bool
 Editor::write_audio_range (AudioPlaylist& playlist, const ChanCount& count, list<AudioRange>& range)
 {
 	boost::shared_ptr<AudioFileSource> fs;
-	const framepos_t chunk_size = 4096;
-	framepos_t nframes;
+	const samplepos_t chunk_size = 4096;
+	samplepos_t nframes;
 	Sample buf[chunk_size];
 	gain_t gain_buffer[chunk_size];
-	framepos_t pos;
+	samplepos_t pos;
 	char s[PATH_MAX+1];
 	uint32_t cnt;
 	string path;
@@ -407,7 +405,7 @@ Editor::write_audio_range (AudioPlaylist& playlist, const ChanCount& count, list
 			fs = boost::dynamic_pointer_cast<AudioFileSource> (
 				SourceFactory::createWritable (DataType::AUDIO, *_session,
 				                               path, true,
-				                               false, _session->frame_rate()));
+				                               false, _session->sample_rate()));
 		}
 
 		catch (failed_constructor& err) {
@@ -425,7 +423,7 @@ Editor::write_audio_range (AudioPlaylist& playlist, const ChanCount& count, list
 		pos = (*i).start;
 
 		while (nframes) {
-			framepos_t this_time;
+			samplepos_t this_time;
 
 			this_time = min (nframes, chunk_size);
 
@@ -457,7 +455,7 @@ Editor::write_audio_range (AudioPlaylist& playlist, const ChanCount& count, list
 
 			while (nframes) {
 
-				framepos_t this_time = min (nframes, chunk_size);
+				samplepos_t this_time = min (nframes, chunk_size);
 				memset (buf, 0, sizeof (Sample) * this_time);
 
 				for (uint32_t n=0; n < channels; ++n) {