Allow listening to channels being exported (w/ realtime export)

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

diff --git a/libs/ardour/export_channel.cc b/libs/ardour/export_channel.cc
index 296bfc9022493ada07e2d2a03e41de1fc9c8e59c..5435d63c5294e18d8cd1f0b9f340f098be2ab8f9 100644 (file)
--- a/libs/ardour/export_channel.cc
+++ b/libs/ardour/export_channel.cc
@@ -30,7 +30,7 @@
 
 #include "pbd/error.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
 
@@ -63,7 +63,9 @@ PortExportChannel::read (Sample const *& data, framecnt_t frames) const
 
        if (ports.size() == 1) {
                boost::shared_ptr<AudioPort> p = ports.begin()->lock ();
-               data = p->get_audio_buffer(frames).data();
+               AudioBuffer& ab (p->get_audio_buffer(frames)); // unsets AudioBuffer::_written
+               data = ab.data();
+               ab.set_written (true);
                return;
        }
 
@@ -72,7 +74,9 @@ PortExportChannel::read (Sample const *& data, framecnt_t frames) const
        for (PortSet::const_iterator it = ports.begin(); it != ports.end(); ++it) {
                boost::shared_ptr<AudioPort> p = it->lock ();
                if (p) {
-                       Sample* port_buffer = p->get_audio_buffer(frames).data();
+                       AudioBuffer& ab (p->get_audio_buffer(frames)); // unsets AudioBuffer::_written
+                       Sample* port_buffer = ab.data();
+                       ab.set_written (true);
 
                        for (uint32_t i = 0; i < frames; ++i) {
                                buffer[i] += (float) port_buffer[i];
@@ -90,7 +94,7 @@ PortExportChannel::get_state (XMLNode * node) const
        for (PortSet::const_iterator it = ports.begin(); it != ports.end(); ++it) {
                boost::shared_ptr<Port> p = it->lock ();
                if (p && (port_node = node->add_child ("Port"))) {
-                       port_node->add_property ("name", p->name());
+                       port_node->set_property ("name", p->name());
                }
        }
 }
@@ -98,11 +102,10 @@ PortExportChannel::get_state (XMLNode * node) const
 void
 PortExportChannel::set_state (XMLNode * node, Session & session)
 {
-       XMLProperty * prop;
        XMLNodeList xml_ports = node->children ("Port");
        for (XMLNodeList::iterator it = xml_ports.begin(); it != xml_ports.end(); ++it) {
-               if ((prop = (*it)->property ("name"))) {
-                       std::string const & name = prop->value();
+               std::string name;
+               if ((*it)->get_property ("name", name)) {
                        boost::shared_ptr<AudioPort> port = boost::dynamic_pointer_cast<AudioPort> (session.engine().get_port_by_name (name));
                        if (port) {
                                ports.insert (port);
@@ -113,7 +116,7 @@ PortExportChannel::set_state (XMLNode * node, Session & session)
        }
 }
 
-RegionExportChannelFactory::RegionExportChannelFactory (Session * session, AudioRegion const & region, AudioTrack & track, Type type) 
+RegionExportChannelFactory::RegionExportChannelFactory (Session * session, AudioRegion const & region, AudioTrack & track, Type type)
        : region (region)
        , track (track)
        , type (type)
@@ -187,11 +190,12 @@ RegionExportChannelFactory::update_buffers (framecnt_t frames)
                assert (mixdown_buffer && gain_buffer);
                for (size_t channel = 0; channel < n_channels; ++channel) {
                        memset (mixdown_buffer.get(), 0, sizeof (Sample) * frames);
+                       buffers.get_audio (channel).silence(frames);
                        region.read_at (buffers.get_audio (channel).data(), mixdown_buffer.get(), gain_buffer.get(), position, frames, channel);
                }
                break;
        case Processed:
-               track.export_stuff (buffers, position, frames, track.main_outs(), true, true);
+               track.export_stuff (buffers, position, frames, track.main_outs(), true, true, false);
                break;
        default:
                throw ExportFailed ("Unhandled type in ExportChannelFactory::update_buffers");
@@ -242,7 +246,7 @@ RouteExportChannel::read (Sample const *& data, framecnt_t frames) const
 #ifndef NDEBUG
        (void) frames;
 #else
-       assert (frames <= (framecnt_t) buffer.size());
+       assert (frames <= (framecnt_t) buffer.capacity());
 #endif
        data = buffer.data();
 }