X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fexport_channel_configuration.cc;h=77b56272d69ea1a4df986583ce012b1eb00528d0;hb=7204702c3ffbd3a1c6747511104d9c6af1b9c93d;hp=a2a289737cd90f179318c08562a3d25b7ae7badc;hpb=98389f7da420ee205f6827b7df4db3ea0802f751;p=ardour.git

diff --git a/libs/ardour/export_channel_configuration.cc b/libs/ardour/export_channel_configuration.cc
index a2a289737c..77b56272d6 100644
--- a/libs/ardour/export_channel_configuration.cc
+++ b/libs/ardour/export_channel_configuration.cc
@@ -18,58 +18,56 @@
 
 */
 
-#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 "pbd/convert.h"
+#include "pbd/enumwriter.h"
+#include "pbd/pthread_utils.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>
+using namespace PBD;
 
 namespace ARDOUR
 {
 
 /* ExportChannelConfiguration */
 
-ExportChannelConfiguration::ExportChannelConfiguration (Session & session) :
-  session (session),
-  writer_thread (*this),
-  status (session.get_export_status ()),
-  files_written (false),
-  split (false)
+ExportChannelConfiguration::ExportChannelConfiguration (Session & session)
+  : session (session)
+  , split (false)
+  , region_type (RegionExportChannelFactory::None)
 {
 
 }
 
-
 XMLNode &
 ExportChannelConfiguration::get_state ()
 {
 	XMLNode * root = new XMLNode ("ExportChannelConfiguration");
 	XMLNode * channel;
-	
+
 	root->add_property ("split", get_split() ? "true" : "false");
 	root->add_property ("channels", to_string (get_n_chans(), std::dec));
-	
+
+	switch (region_type) {
+	case RegionExportChannelFactory::None:
+		// Do nothing
+		break;
+	default:
+		root->add_property ("region-processing", enum_2_string (region_type));
+		break;
+	}
+
 	uint32_t i = 1;
 	for (ExportChannelConfiguration::ChannelList::const_iterator c_it = channels.begin(); c_it != channels.end(); ++c_it) {
 		channel = root->add_child ("Channel");
 		if (!channel) { continue; }
-		
+
 		channel->add_property ("number", to_string (i, std::dec));
 		(*c_it)->get_state (channel);
-		
+
 		++i;
 	}
-	
+
 	return *root;
 }
 
@@ -77,11 +75,16 @@ int
 ExportChannelConfiguration::set_state (const XMLNode & root)
 {
 	XMLProperty const * prop;
-	
+
 	if ((prop = root.property ("split"))) {
 		set_split (!prop->value().compare ("true"));
 	}
 
+	if ((prop = root.property ("region-processing"))) {
+		set_region_processing_type ((RegionExportChannelFactory::Type)
+			string_2_enum (prop->value(), RegionExportChannelFactory::Type));
+	}
+
 	XMLNodeList channels = root.children ("Channel");
 	for (XMLNodeList::iterator it = channels.begin(); it != channels.end(); ++it) {
 		ExportChannelPtr channel (new PortExportChannel ());
@@ -98,126 +101,26 @@ ExportChannelConfiguration::all_channels_have_ports () const
 	for (ChannelList::const_iterator it = channels.begin(); it != channels.end(); ++it) {
 		if ((*it)->empty ()) { return false; }
 	}
-	
-	return true;
-}
 
-bool
-ExportChannelConfiguration::write_files (boost::shared_ptr<ExportProcessor> new_processor)
-{
-	if (files_written || writer_thread.running) {
-		return false;
-	}
-	
-	files_written = true;
-
-	if (!timespan) {
-		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 */
-	
-	processor.reset (new_processor->copy());
-	
-	/* Create new thread for post processing */
-	
-	pthread_create (&writer_thread.thread, 0, _write_files, &writer_thread);
-	writer_thread.running = true;
-	pthread_detach (writer_thread.thread);
-	
 	return true;
 }
 
 void
-ExportChannelConfiguration::write_file ()
-{
-	timespan->rewind ();
-	nframes_t progress = 0;
-	nframes_t timespan_length = timespan->get_length();
-
-	nframes_t frames = 2048; // TODO good block size ?
-	nframes_t frames_read = 0;
-	
-	float * channel_buffer = new float [frames];
-	float * file_buffer = new float [channels.size() * frames];
-	uint32_t channel_count = channels.size();
-	uint32_t channel;
-	
-	do {
-		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);
-			
-			/* Interleave into file buffer */
-			
-			for (uint32_t i = 0; i < frames_read; ++i) {
-				file_buffer[channel + (channel_count * i)] = channel_buffer[i];
-			}
-			
-			++channel;
-		}
-		
-		progress += frames_read;
-		status->progress = (float) progress / timespan_length;
-		
-	} while (processor->process (file_buffer, frames_read) > 0);
-	
-	delete [] channel_buffer;
-	delete [] file_buffer;
-}
-
-void *
-ExportChannelConfiguration::_write_files (void *arg)
+ExportChannelConfiguration::configurations_for_files (std::list<boost::shared_ptr<ExportChannelConfiguration> > & configs)
 {
+	configs.clear ();
 
-	PBD::ThreadCreated (pthread_self(), "Export post-processing");
-	
-	// cc can be trated like 'this'
-	WriterThread & cc (*((WriterThread *) arg));
-	
-	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();
-		}
-	} catch (ExportFailed & e) {
-		cc->status->abort (true);
+	if (!split) {
+		configs.push_back (shared_from_this ());
+		return;
 	}
-	
-	cc.running = false;
-	cc->files_written = true;
-	cc->FilesWritten();
-	
-	return 0; // avoid compiler warnings
-}
 
-void
-ExportChannelConfiguration::register_with_timespan (TimespanPtr new_timespan)
-{
-	timespan = new_timespan;
-	
-	for (ChannelList::iterator it = channels.begin(); it != channels.end(); ++it) {
-		timespan->register_channel (*it);
+	for (ChannelList::const_iterator it = channels.begin (); it != channels.end (); ++it) {
+		boost::shared_ptr<ExportChannelConfiguration> config (new ExportChannelConfiguration (session));
+		config->set_name (_name);
+		config->register_channel (*it);
+		configs.push_back (config);
 	}
 }
 
-void
-ExportChannelConfiguration::unregister_all ()
-{
-	timespan.reset();
-	processor.reset();
-	file_configs.clear();
-	files_written = false;
-}
-
 } // namespace ARDOUR