switch Evoral::Sequence debugging to use DEBUG_TRACE(); Sequence uses multiset<....

[ardour.git] / libs / ardour / export_channel.cc

diff --git a/libs/ardour/export_channel.cc b/libs/ardour/export_channel.cc
index 865c8fbf3b50353cdc049a405200d2be45af2170..f94ee1325792e787dd6eba39c6f0bb690c732e8a 100644 (file)
--- a/libs/ardour/export_channel.cc
+++ b/libs/ardour/export_channel.cc
@@ -18,10 +18,13 @@
 
 */
 
-#include <ardour/export_channel.h>
-
-#include <ardour/export_failed.h>
-#include <ardour/audioengine.h>
+#include "ardour/audio_buffer.h"
+#include "ardour/audio_port.h"
+#include "ardour/audio_track.h"
+#include "ardour/audioengine.h"
+#include "ardour/export_channel.h"
+#include "ardour/export_failed.h"
+#include "ardour/session.h"
 
 using namespace ARDOUR;
 
@@ -42,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];
                        }
@@ -92,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();
@@ -104,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 ()
@@ -129,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));
 }
 
@@ -162,6 +165,6 @@ RegionExportChannelFactory::update_buffers (nframes_t frames)
          default:
                throw ExportFailed ("Unhandled type in ExportChannelFactory::update_buffers");
        }
-       
+
        position += frames;
 }