X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fexport_channel.cc;h=f94ee1325792e787dd6eba39c6f0bb690c732e8a;hb=db6706429643d80e68a050daa015d17f36d5321b;hp=58110ea5a95b7dc1bea3c67fe4c781ea5bb9a5d8;hpb=e0aaed6d65f160c328cb8b56d7c6552ee15d65e2;p=ardour.git

diff --git a/libs/ardour/export_channel.cc b/libs/ardour/export_channel.cc
index 58110ea5a9..f94ee13257 100644
--- a/libs/ardour/export_channel.cc
+++ b/libs/ardour/export_channel.cc
@@ -45,8 +45,8 @@ PortExportChannel::read (Sample * data, nframes_t frames) const
 
 	for (PortSet::const_iterator it = ports.begin(); it != ports.end(); ++it) {
 		if (*it != 0) {
-			Sample* port_buffer = (*it)->get_audio_buffer(frames, 0).data();
-			
+			Sample* port_buffer = (*it)->get_audio_buffer(frames).data();
+
 			for (uint32_t i = 0; i < frames; ++i) {
 				data[i] += (float) port_buffer[i];
 			}
@@ -95,11 +95,11 @@ RegionExportChannelFactory::RegionExportChannelFactory (Session * session, Audio
 		break;
 	  case Fades:
 		n_channels = region.n_channels();
-		
+
 		mixdown_buffer = new Sample [frames_per_cycle];
 		gain_buffer = new Sample [frames_per_cycle];
 		memset (gain_buffer, 1.0, sizeof (Sample) * frames_per_cycle);
-		
+
 		break;
 	  case Processed:
 		n_channels = track.n_outputs().n_audio();
@@ -107,11 +107,11 @@ RegionExportChannelFactory::RegionExportChannelFactory (Session * session, Audio
 	  default:
 		throw ExportFailed ("Unhandled type in ExportChannelFactory constructor");
 	}
-	
-	session->ProcessExport.connect (sigc::hide (sigc::mem_fun (*this, &RegionExportChannelFactory::new_cycle_started)));
-	
-	buffers.set_count (ChanCount (DataType::AUDIO, n_channels));
+
+	session->ProcessExport.connect_same_thread (export_connection, boost::bind (&RegionExportChannelFactory::new_cycle_started, this, _1));
+
 	buffers.ensure_buffers (DataType::AUDIO, n_channels, frames_per_cycle);
+	buffers.set_count (ChanCount (DataType::AUDIO, n_channels));
 }
 
 RegionExportChannelFactory::~RegionExportChannelFactory ()
@@ -132,12 +132,12 @@ RegionExportChannelFactory::read (uint32_t channel, Sample * data, nframes_t fra
 {
 	assert (channel < n_channels);
 	assert (frames_to_read <= frames_per_cycle);
-	
+
 	if (!buffers_up_to_date) {
 		update_buffers(frames_to_read);
 		buffers_up_to_date = true;
 	}
-	
+
 	memcpy (data, buffers.get_audio (channel).data(), frames_to_read * sizeof (Sample));
 }
 
@@ -165,6 +165,6 @@ RegionExportChannelFactory::update_buffers (nframes_t frames)
 	  default:
 		throw ExportFailed ("Unhandled type in ExportChannelFactory::update_buffers");
 	}
-	
+
 	position += frames;
 }