X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_export_audio.cc;h=776832143628bf879b570275f82bcc2c2c88fdb6;hb=cc15fb071f3c327f17bbe1b0613974d5060b7f90;hp=629abc8b563ab6e08d954869b05f7ca6ffd094d8;hpb=d6ef740e9002c7112bc47cb2d9d8d4b8609aa089;p=ardour.git

diff --git a/gtk2_ardour/editor_export_audio.cc b/gtk2_ardour/editor_export_audio.cc
index 629abc8b56..7768321436 100644
--- a/gtk2_ardour/editor_export_audio.cc
+++ b/gtk2_ardour/editor_export_audio.cc
@@ -73,7 +73,7 @@ Editor::export_selection ()
 }
 
 void
-Editor::export_range (nframes_t start, nframes_t end)
+Editor::export_range (nframes64_t start, nframes64_t end)
 {
 	if (session) {
 		if (export_dialog == 0) {
@@ -96,9 +96,7 @@ Editor::export_region ()
 	ExportDialog* dialog = new ExportRegionDialog (*this, clicked_regionview->region());
 		
 	dialog->connect_to_session (session);
-	dialog->set_range (
-		clicked_regionview->region()->first_frame(), 
-		clicked_regionview->region()->last_frame());
+	dialog->set_range (clicked_regionview->region()->first_frame(), clicked_regionview->region()->last_frame());
 	dialog->start_export();
 }
 
@@ -151,7 +149,12 @@ Editor::bounce_region_selection ()
 		itt.cancel = false;
 		itt.progress = 0.0f;
 
-		track->bounce_range (region->position(), region->position() + region->length(), itt);
+		boost::shared_ptr<Region> r = track->bounce_range (region->position(), region->position() + region->length(), itt);
+		cerr << "Result of bounce of "
+		     << region->name() << " len = " << region->length()
+		     << " was "
+		     << r->name() << " len = " << r->length()
+		     << endl;
 	}
 }
 
@@ -159,11 +162,11 @@ bool
 Editor::write_region (string path, boost::shared_ptr<AudioRegion> region)
 {
 	boost::shared_ptr<AudioFileSource> fs;
-	const nframes_t chunk_size = 4096;
-	nframes_t to_read;
+	const nframes64_t chunk_size = 4096;
+	nframes64_t to_read;
 	Sample buf[chunk_size];
 	gain_t gain_buffer[chunk_size];
-	nframes_t pos;
+	nframes64_t pos;
 	char s[PATH_MAX+1];
 	uint32_t cnt;
 	vector<boost::shared_ptr<AudioFileSource> > sources;
@@ -226,7 +229,7 @@ Editor::write_region (string path, boost::shared_ptr<AudioRegion> region)
 	pos = region->position();
 
 	while (to_read) {
-		nframes_t this_time;
+		nframes64_t this_time;
 
 		this_time = min (to_read, chunk_size);
 
@@ -304,11 +307,11 @@ bool
 Editor::write_audio_range (AudioPlaylist& playlist, uint32_t channels, list<AudioRange>& range)
 {
 	boost::shared_ptr<AudioFileSource> fs;
-	const nframes_t chunk_size = 4096;
-	nframes_t nframes;
+	const nframes64_t chunk_size = 4096;
+	nframes64_t nframes;
 	Sample buf[chunk_size];
 	gain_t gain_buffer[chunk_size];
-	nframes_t pos;
+	nframes64_t pos;
 	char s[PATH_MAX+1];
 	uint32_t cnt;
 	string path;
@@ -357,7 +360,7 @@ Editor::write_audio_range (AudioPlaylist& playlist, uint32_t channels, list<Audi
 		pos = (*i).start;
 		
 		while (nframes) {
-			nframes_t this_time;
+			nframes64_t this_time;
 			
 			this_time = min (nframes, chunk_size);
 
@@ -389,7 +392,7 @@ Editor::write_audio_range (AudioPlaylist& playlist, uint32_t channels, list<Audi
 
 			while (nframes) {
 
-				nframes_t this_time = min (nframes, chunk_size);
+				nframes64_t this_time = min (nframes, chunk_size);
 				memset (buf, 0, sizeof (Sample) * this_time);
 
 				for (uint32_t n=0; n < channels; ++n) {