*/
-#include <ardour/export_channel_configuration.h>
+#include "ardour/export_channel_configuration.h"
-#include <ardour/export_handler.h>
-#include <ardour/export_filename.h>
-#include <ardour/export_processor.h>
-#include <ardour/export_timespan.h>
+#include "ardour/export_handler.h"
+#include "ardour/export_filename.h"
+#include "ardour/export_processor.h"
+#include "ardour/export_timespan.h"
-#include <ardour/audio_port.h>
-#include <ardour/export_failed.h>
-#include <ardour/midi_port.h>
-#include <ardour/session.h>
-#include <ardour/audioengine.h>
+#include "ardour/audio_port.h"
+#include "ardour/export_failed.h"
+#include "ardour/midi_port.h"
+#include "ardour/session.h"
+#include "ardour/audioengine.h"
-#include <pbd/convert.h>
-#include <pbd/pthread_utils.h>
+#include "pbd/convert.h"
+#include "pbd/pthread_utils.h"
-namespace ARDOUR
-{
-
-/* ExportChannel */
+using namespace PBD;
-void
-ExportChannel::read_ports (float * data, nframes_t frames) const
+namespace ARDOUR
{
- memset (data, 0, frames * sizeof (float));
-
- for (iterator it = begin(); it != end(); ++it) {
- if (*it != 0) {
- Sample* port_buffer = (*it)->get_audio_buffer().data();
-
- for (uint32_t i = 0; i < frames; ++i) {
- data[i] += (float) port_buffer[i];
- }
- }
- }
-}
/* ExportChannelConfiguration */
-ExportChannelConfiguration::ExportChannelConfiguration (ExportStatus & status, Session & session) :
+ExportChannelConfiguration::ExportChannelConfiguration (Session & session) :
session (session),
writer_thread (*this),
- status (status),
+ status (session.get_export_status ()),
files_written (false),
split (false)
{
{
XMLNode * root = new XMLNode ("ExportChannelConfiguration");
XMLNode * channel;
- XMLNode * port_node;
root->add_property ("split", get_split() ? "true" : "false");
root->add_property ("channels", to_string (get_n_chans(), std::dec));
if (!channel) { continue; }
channel->add_property ("number", to_string (i, std::dec));
-
- for (ExportChannel::const_iterator p_it = (*c_it)->begin(); p_it != (*c_it)->end(); ++p_it) {
- if ((port_node = channel->add_child ("Port"))) {
- port_node->add_property ("name", (*p_it)->name());
- }
- }
+ (*c_it)->get_state (channel);
++i;
}
XMLNodeList channels = root.children ("Channel");
for (XMLNodeList::iterator it = channels.begin(); it != channels.end(); ++it) {
- boost::shared_ptr<ExportChannel> channel (new ExportChannel ());
-
- XMLNodeList ports = (*it)->children ("Port");
- for (XMLNodeList::iterator p_it = ports.begin(); p_it != ports.end(); ++p_it) {
- if ((prop = (*p_it)->property ("name"))) {
- channel->add_port (dynamic_cast<AudioPort *> (session.engine().get_port_by_name (prop->value())));
- }
- }
-
+ ExportChannelPtr channel (new PortExportChannel ());
+ channel->set_state (*it, session);
register_channel (channel);
}
}
bool
-ExportChannelConfiguration::all_channels_have_ports ()
+ExportChannelConfiguration::all_channels_have_ports () const
{
- for (ChannelList::iterator it = channels.begin(); it != channels.end(); ++it) {
+ for (ChannelList::const_iterator it = channels.begin(); it != channels.end(); ++it) {
if ((*it)->empty ()) { return false; }
}
files_written = true;
if (!timespan) {
- throw ExportFailed (_("Export failed due to a programming error"), _("No timespan registered to channel configuration when requesting files to be written"));
+ throw ExportFailed (X_("Programming error: No timespan registered to channel configuration when requesting files to be written"));
}
/* Take a local copy of the processor to be used in the thread that is created below */
uint32_t channel;
do {
- if (status.aborted()) { break; }
+ if (status->aborted()) { break; }
channel = 0;
for (ChannelList::iterator it = channels.begin(); it != channels.end(); ++it) {
/* Get channel data */
- frames_read = timespan->get_data (channel_buffer, frames, **it);
+ frames_read = timespan->get_data (channel_buffer, frames, *it);
/* Interleave into file buffer */
}
progress += frames_read;
- status.progress = (float) progress / timespan_length;
+ status->progress = (float) progress / timespan_length;
} while (processor->process (file_buffer, frames_read) > 0);
void *
ExportChannelConfiguration::_write_files (void *arg)
{
-
- PBD::ThreadCreated (pthread_self(), "Export post-processing");
+ notify_gui_about_thread_creation (pthread_self(), "Export post-processing");
// cc can be trated like 'this'
WriterThread & cc (*((WriterThread *) arg));
- for (FileConfigList::iterator it = cc->file_configs.begin(); it != cc->file_configs.end(); ++it) {
- if (cc->status.aborted()) {
- break;
+ try {
+ for (FileConfigList::iterator it = cc->file_configs.begin(); it != cc->file_configs.end(); ++it) {
+ if (cc->status->aborted()) {
+ break;
+ }
+ cc->processor->prepare (it->first, it->second, cc->channels.size(), cc->split, cc->timespan->get_start());
+ cc->write_file (); // Writes tempfile
+ cc->processor->prepare_post_processors ();
+ cc->processor->write_files();
}
- cc->processor->prepare (it->first, it->second, cc->channels.size(), cc->split, cc->timespan->get_start());
- cc->write_file (); // Writes tempfile
- cc->processor->prepare_post_processors ();
- cc->processor->write_files();
+ } catch (ExportFailed & e) {
+ cc->status->abort (true);
}
cc.running = false;
timespan = new_timespan;
for (ChannelList::iterator it = channels.begin(); it != channels.end(); ++it) {
- timespan->register_channel (**it);
+ timespan->register_channel (*it);
}
}