*/
-#include <ardour/export_handler.h>
+#include "ardour/export_handler.h"
-#include <pbd/convert.h>
-#include <pbd/filesystem.h>
+#include <glibmm.h>
-#include <ardour/ardour.h>
-#include <ardour/configuration.h>
-#include <ardour/export_timespan.h>
-#include <ardour/export_channel_configuration.h>
-#include <ardour/export_status.h>
-#include <ardour/export_format_specification.h>
-#include <ardour/export_filename.h>
-#include <ardour/export_processor.h>
-#include <ardour/export_failed.h>
+#include "pbd/convert.h"
+#include "pbd/filesystem.h"
+#include "ardour/ardour.h"
+#include "ardour/configuration.h"
+#include "ardour/export_timespan.h"
+#include "ardour/export_channel_configuration.h"
+#include "ardour/export_status.h"
+#include "ardour/export_format_specification.h"
+#include "ardour/export_filename.h"
+#include "ardour/export_processor.h"
+#include "ardour/export_failed.h"
+
+using namespace std;
using namespace PBD;
-using std::ofstream;
namespace ARDOUR
{
ExportElementFactory::ExportElementFactory (Session & session) :
session (session)
{
- XMLProperty * prop;
- XMLNode * instant_node = ARDOUR::Config->instant_xml ("ExportFormatSpecification");
- if (instant_node && (prop = instant_node->property ("id-counter"))) {
- ExportFormatSpecification::init_counter (atoi (prop->value()));
- }
+
}
ExportElementFactory::~ExportElementFactory ()
{
- XMLNode * instant_node = new XMLNode ("ExportFormatSpecification");
- instant_node->add_property ("id-counter", to_string (ExportFormatSpecification::counter(), std::dec));
- ARDOUR::Config->add_instant_xml (*instant_node);
+
}
ExportElementFactory::TimespanPtr
ExportElementFactory::add_timespan ()
{
- return TimespanPtr (new ExportTimespan (session.export_status, session.frame_rate()));
+ return TimespanPtr (new ExportTimespan (session.get_export_status(), session.frame_rate()));
}
ExportElementFactory::ChannelConfigPtr
ExportElementFactory::add_channel_config ()
{
- return ChannelConfigPtr (new ExportChannelConfiguration (session.export_status));
+ return ChannelConfigPtr (new ExportChannelConfiguration (session));
}
ExportElementFactory::FormatPtr
ExportHandler::ExportHandler (Session & session) :
ExportElementFactory (session),
session (session),
+ export_status (session.get_export_status ()),
realtime (false)
{
processor.reset (new ExportProcessor (session));
ExportHandler::~ExportHandler ()
{
- if (session.export_status.aborted()) {
+ if (export_status->aborted()) {
for (std::list<Glib::ustring>::iterator it = files_written.begin(); it != files_written.end(); ++it) {
sys::remove (sys::path (*it));
}
* 1. Session is prepared in do_export
* 2. start_timespan is called, which then registers all necessary channel configs to a timespan
* 3. The timespan reads each unique channel into a tempfile and calls Session::stop_export when the end is reached
- * 4. stop_export emits ExportFinished after stopping the transport, this ends up calling finish_timespan
+ * 4. stop_export emits ExportReadFinished after stopping the transport, this ends up calling finish_timespan
* 5. finish_timespan registers all the relevant formats and filenames to relevant channel configurations
* 6. finish_timespan does a manual call to timespan_thread_finished, which gets the next channel configuration
* for the current timespan, calling write_files for it
{
/* Count timespans */
- ExportStatus & status = session.export_status;
- status.init();
+ export_status->init();
std::set<TimespanPtr> timespan_set;
for (ConfigMap::iterator it = config_map.begin(); it != config_map.end(); ++it) {
timespan_set.insert (it->first);
}
- status.total_timespans = timespan_set.size();
+ export_status->total_timespans = timespan_set.size();
/* Start export */
realtime = rt;
- session.ExportFinished.connect (sigc::mem_fun (*this, &ExportHandler::finish_timespan));
- session.pre_export ();
+ session.ExportReadFinished.connect (sigc::mem_fun (*this, &ExportHandler::finish_timespan));
start_timespan ();
}
ExportHandler::export_cd_marker_file (TimespanPtr timespan, FormatPtr file_format, std::string filename, CDMarkerFormat format)
{
string filepath;
+ string basename = Glib::path_get_basename(filename);
+
+ size_t ext_pos = basename.rfind('.');
+ if (ext_pos != string::npos) {
+ basename = basename.substr(0, ext_pos); /* strip file extension, if there is one */
+ }
+
void (ExportHandler::*header_func) (CDMarkerStatus &);
void (ExportHandler::*track_func) (CDMarkerStatus &);
void (ExportHandler::*index_func) (CDMarkerStatus &);
switch (format) {
case CDMarkerTOC:
- filepath = filename + ".toc";
+ filepath = Glib::build_filename(Glib::path_get_dirname(filename), basename + ".toc");
header_func = &ExportHandler::write_toc_header;
track_func = &ExportHandler::write_track_info_toc;
index_func = &ExportHandler::write_index_info_toc;
break;
case CDMarkerCUE:
- filepath = filename + ".cue";
+ filepath = Glib::build_filename(Glib::path_get_dirname(filename), basename + ".cue");
header_func = &ExportHandler::write_cue_header;
track_func = &ExportHandler::write_track_info_cue;
index_func = &ExportHandler::write_index_info_cue;
status.out << "REM Cue file generated by Ardour" << endl;
status.out << "TITLE \"" << title << "\"" << endl;
- // TODO
+ /* The cue sheet syntax has originally five file types:
+ WAVE : 44.1 kHz, 16 Bit (little endian)
+ AIFF : 44.1 kHz, 16 Bit (big endian)
+ BINARY : 44.1 kHz, 16 Bit (little endian)
+ MOTOROLA : 44.1 kHz, 16 Bit (big endian)
+ MP3
+
+ We want to use cue sheets not only as CD images but also as general playlyist
+ format, thus for WAVE and AIFF we don't care if it's really 44.1 kHz/16 Bit, the
+ soundfile's header shows it anyway. But for the raw formats, i.e. BINARY
+ and MOTOROLA we do care, because no header would tell us about a different format.
+
+ For all other formats we just make up our own file type. MP3 is not supported
+ at the moment.
+ */
+
+ status.out << "FILE \"" << Glib::path_get_basename(status.filename) << "\" ";
if (!status.format->format_name().compare ("WAV")) {
- status.out << "FILE " << status.filename << " WAVE" << endl;
+ status.out << "WAVE";
+ } else if (status.format->format_name() == ExportFormatBase::F_RAW &&
+ status.format->sample_format() == ExportFormatBase::SF_16 &&
+ status.format->sample_rate() == ExportFormatBase::SR_44_1) {
+ // Format is RAW 16bit 44.1kHz
+ if (status.format->endianness() == ExportFormatBase::E_Little) {
+ status.out << "BINARY";
+ } else {
+ status.out << "MOTOROLA";
+ }
} else {
- status.out << "FILE " << status.filename << ' ' << status.format->format_name() << endl;
+ // AIFF should return "AIFF"
+ status.out << status.format->format_name();
}
+ status.out << endl;
}
void
{
gchar buf[18];
- status.out << endl << "TRACK " << status.track_number << " AUDIO" << endl;
- status.out << "FLAGS " ;
+ snprintf (buf, sizeof(buf), " TRACK %02d AUDIO", status.track_number);
+ status.out << buf << endl;
+ status.out << " FLAGS" ;
if (status.marker->cd_info.find("scms") != status.marker->cd_info.end()) {
- status.out << "SCMS ";
+ status.out << " SCMS ";
} else {
- status.out << "DCP ";
+ status.out << " DCP ";
}
if (status.marker->cd_info.find("preemph") != status.marker->cd_info.end()) {
- status.out << "PRE";
+ status.out << " PRE";
}
status.out << endl;
if (status.marker->cd_info.find("isrc") != status.marker->cd_info.end()) {
- status.out << "ISRC " << status.marker->cd_info["isrc"] << endl;
+ status.out << " ISRC " << status.marker->cd_info["isrc"] << endl;
}
if (status.marker->name() != "") {
- status.out << "TITLE \"" << status.marker->name() << "\"" << endl;
+ status.out << " TITLE \"" << status.marker->name() << "\"" << endl;
}
if (status.marker->cd_info.find("performer") != status.marker->cd_info.end()) {
- status.out << "PERFORMER \"" << status.marker->cd_info["performer"] << "\"" << endl;
+ status.out << " PERFORMER \"" << status.marker->cd_info["performer"] << "\"" << endl;
}
if (status.marker->cd_info.find("string_composer") != status.marker->cd_info.end()) {
- status.out << "SONGWRITER \"" << status.marker->cd_info["string_composer"] << "\"" << endl;
+ status.out << " SONGWRITER \"" << status.marker->cd_info["string_composer"] << "\"" << endl;
}
- frames_to_cd_frames_string (buf, status.track_position);
- status.out << "INDEX 00" << buf << endl;
+ if (status.track_position != status.track_start_frame) {
+ frames_to_cd_frames_string (buf, status.track_position);
+ status.out << " INDEX 00" << buf << endl;
+ }
frames_to_cd_frames_string (buf, status.track_start_frame);
- status.out << "INDEX 01" << buf << endl;
+ status.out << " INDEX 01" << buf << endl;
status.index_number = 2;
status.track_number++;
{
gchar buf[18];
- snprintf (buf, sizeof(buf), "INDEX %02d", cue_indexnum);
+ snprintf (buf, sizeof(buf), " INDEX %02d", cue_indexnum);
status.out << buf;
frames_to_cd_frames_string (buf, status.index_position);
status.out << buf << endl;
void
ExportHandler::start_timespan ()
{
- session.export_status.timespan++;
+ export_status->timespan++;
if (config_map.empty()) {
- session.finalize_audio_export();
+ export_status->finish ();
return;
}
/* Register formats and filenames to relevant channel configs */
- session.export_status.total_formats = 0;
- session.export_status.format = 0;
+ export_status->total_formats = 0;
+ export_status->format = 0;
for (ConfigMap::iterator it = timespan_bounds.first; it != timespan_bounds.second; ++it) {
- session.export_status.total_formats++;
+ export_status->total_formats++;
/* Setup filename */
projects / ardour.git / blobdiff