/*
- Copyright (C) 2000 Paul Davis
+ Copyright (C) 2000 Paul Davis
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
*/
+
+#ifdef WAF_BUILD
+#include "libardour-config.h"
+#endif
+
#include <cstdio>
#include <cstdlib>
#include <string>
#include <unistd.h>
#include <sys/stat.h>
#include <time.h>
+#include <stdint.h>
#include <sndfile.h>
#include <samplerate.h>
#include <boost/scoped_array.hpp>
#include <boost/shared_array.hpp>
-#include <pbd/basename.h>
-#include <pbd/convert.h>
-
-#include <ardour/ardour.h>
-#include <ardour/session.h>
-#include <ardour/session_directory.h>
-#include <ardour/audio_diskstream.h>
-#include <ardour/audioengine.h>
-#include <ardour/sndfilesource.h>
-#include <ardour/sndfile_helpers.h>
-#include <ardour/audioregion.h>
-#include <ardour/region_factory.h>
-#include <ardour/source_factory.h>
-#include <ardour/resampled_source.h>
-#include <ardour/sndfileimportable.h>
-#include <ardour/analyser.h>
-#include <ardour/smf_reader.h>
-#include <ardour/smf_source.h>
-#include <ardour/tempo.h>
+#include "pbd/basename.h"
+#include "pbd/convert.h"
+
+#include "evoral/SMF.hpp"
+
+#include "ardour/analyser.h"
+#include "ardour/ardour.h"
+#include "ardour/audio_diskstream.h"
+#include "ardour/audioengine.h"
+#include "ardour/audioregion.h"
+#include "ardour/import_status.h"
+#include "ardour/region_factory.h"
+#include "ardour/resampled_source.h"
+#include "ardour/session.h"
+#include "ardour/session_directory.h"
+#include "ardour/smf_source.h"
+#include "ardour/sndfile_helpers.h"
+#include "ardour/sndfileimportable.h"
+#include "ardour/sndfilesource.h"
+#include "ardour/source_factory.h"
+#include "ardour/tempo.h"
#ifdef HAVE_COREAUDIO
-#include <ardour/caimportable.h>
+#include "ardour/caimportable.h"
#endif
#include "i18n.h"
+using namespace std;
using namespace ARDOUR;
using namespace PBD;
-
static boost::shared_ptr<ImportableSource>
open_importable_source (const string& path, nframes_t samplerate, ARDOUR::SrcQuality quality)
{
-#ifdef HAVE_COREAUDIO
+ /* try libsndfile first, because it can get BWF info from .wav, which ExtAudioFile cannot.
+ We don't necessarily need that information in an ImportableSource, but it keeps the
+ logic the same as in SourceFactory::create()
+ */
- /* see if we can use CoreAudio to handle the IO */
-
try {
- boost::shared_ptr<CAImportableSource> source(new CAImportableSource(path));
+ boost::shared_ptr<SndFileImportableSource> source(new SndFileImportableSource(path));
if (source->samplerate() == samplerate) {
return source;
}
/* rewrap as a resampled source */
-
+
return boost::shared_ptr<ImportableSource>(new ResampledImportableSource(source, samplerate, quality));
}
catch (...) {
- /* fall back to SndFile */
-
-#endif
-
- try {
- boost::shared_ptr<SndFileImportableSource> source(new SndFileImportableSource(path));
-
- if (source->samplerate() == samplerate) {
- return source;
- }
+#ifdef HAVE_COREAUDIO
- /* rewrap as a resampled source */
-
- return boost::shared_ptr<ImportableSource>(new ResampledImportableSource(source, samplerate, quality));
- }
+ /* libsndfile failed, see if we can use CoreAudio to handle the IO */
+
+ CAImportableSource* src = new CAImportableSource(path);
+ boost::shared_ptr<CAImportableSource> source (src);
- catch (...) {
- throw; // rethrow
+ if (source->samplerate() == samplerate) {
+ return source;
}
-#ifdef HAVE_COREAUDIO
- }
+ /* rewrap as a resampled source */
+
+ return boost::shared_ptr<ImportableSource>(new ResampledImportableSource(source, samplerate, quality));
+
+#else
+ throw; // rethrow
#endif
+
+ }
}
static std::string
-get_non_existent_filename (DataType type, const bool allow_replacing, const std::string destdir, const std::string& basename, uint channel, uint channels)
+get_non_existent_filename (DataType type, const bool allow_replacing, const std::string& destdir, const std::string& basename, uint channel, uint channels)
{
char buf[PATH_MAX+1];
bool goodfile = false;
} else {
snprintf (buf, sizeof(buf), "%s.%s", base.c_str(), ext);
}
-
+
string tempname = destdir + "/" + buf;
if (!allow_replacing && Glib::file_test (tempname, Glib::FILE_TEST_EXISTS)) {
? sdir.midi_path().to_string() : sdir.sound_path().to_string();
filepath += '/';
- filepath += get_non_existent_filename (type, allow_replacing, filepath, basename, n, channels);
+ filepath += get_non_existent_filename (type, allow_replacing, filepath, basename, n, channels);
new_paths.push_back (filepath);
}
}
static bool
-map_existing_mono_sources (const vector<string>& new_paths, Session& sess,
- uint samplerate, vector<boost::shared_ptr<Source> >& newfiles, Session *session)
+map_existing_mono_sources (const vector<string>& new_paths, Session& /*sess*/,
+ uint /*samplerate*/, vector<boost::shared_ptr<Source> >& newfiles, Session *session)
{
for (vector<string>::const_iterator i = new_paths.begin();
i != new_paths.end(); ++i)
static bool
create_mono_sources_for_writing (const vector<string>& new_paths, Session& sess,
- uint samplerate, vector<boost::shared_ptr<Source> >& newfiles)
+ uint samplerate, vector<boost::shared_ptr<Source> >& newfiles,
+ framepos_t timeline_position)
{
- for (vector<string>::const_iterator i = new_paths.begin();
- i != new_paths.end(); ++i)
+ for (vector<string>::const_iterator i = new_paths.begin(); i != new_paths.end(); ++i)
{
boost::shared_ptr<Source> source;
{
const DataType type = ((*i).rfind(".mid") != string::npos)
? DataType::MIDI : DataType::AUDIO;
-
- source = SourceFactory::createWritable (
- type,
- sess,
+
+
+ source = SourceFactory::createWritable (type, sess,
i->c_str(),
false, // destructive
- samplerate
- );
+ samplerate);
}
catch (const failed_constructor& err)
{
}
newfiles.push_back(boost::dynamic_pointer_cast<Source>(source));
+
+ /* for audio files, reset the timeline position so that any BWF-ish
+ information in the original files we are importing from is maintained.
+ */
+
+ boost::shared_ptr<AudioFileSource> afs;
+ if ((afs = boost::dynamic_pointer_cast<AudioFileSource>(source)) != 0) {
+ afs->set_timeline_position(timeline_position);
+ }
}
return true;
}
uint total_files)
{
if (file_samplerate != session_samplerate) {
- return string_compose (_("converting %1\n(resample from %2KHz to %3KHz)\n(%4 of %5)"),
+ return string_compose (_("resampling %1 from %2kHz to %3kHz\n(%4 of %5)"),
Glib::path_get_basename (path),
file_samplerate/1000.0f,
session_samplerate/1000.0f,
current_file, total_files);
}
- return string_compose (_("converting %1\n(%2 of %3)"),
- Glib::path_get_basename (path),
- current_file, total_files);
+ return string_compose (_("copying %1\n(%2 of %3)"),
+ Glib::path_get_basename (path),
+ current_file, total_files);
}
static void
-write_audio_data_to_new_files (ImportableSource* source, Session::import_status& status,
+write_audio_data_to_new_files (ImportableSource* source, ImportStatus& status,
vector<boost::shared_ptr<Source> >& newfiles)
{
const nframes_t nframes = ResampledImportableSource::blocksize;
for (uint n = 0; n < channels; ++n) {
channel_data.push_back(boost::shared_array<Sample>(new Sample[nframes]));
}
-
+
uint read_count = 0;
status.progress = 0.0f;
}
static void
-write_midi_data_to_new_files (SMFReader* source, Session::import_status& status,
- vector<boost::shared_ptr<Source> >& newfiles)
+write_midi_data_to_new_files (Evoral::SMF* source, ImportStatus& status,
+ vector<boost::shared_ptr<Source> >& newfiles)
{
- MIDI::Event ev(0.0, 4, NULL, true);
+ uint32_t buf_size = 4;
+ uint8_t* buf = (uint8_t*)malloc(buf_size);
status.progress = 0.0f;
try {
for (unsigned i = 1; i <= source->num_tracks(); ++i) {
-
boost::shared_ptr<SMFSource> smfs = boost::dynamic_pointer_cast<SMFSource>(newfiles[i-1]);
-
+ smfs->drop_model();
+
source->seek_to_track(i);
-
+
uint64_t t = 0;
uint32_t delta_t = 0;
uint32_t size = 0;
-
+ bool first = true;
+
while (!status.cancel) {
+ size = buf_size;
- if (source->read_event(4, ev.buffer(), &size, &delta_t) < 0)
+ int ret = source->read_event(&delta_t, &size, &buf);
+ if (size > buf_size)
+ buf_size = size;
+
+ if (ret < 0) { // EOT
break;
+ }
t += delta_t;
- ev.time() = (double)t / (double)source->ppqn();
- ev.size() = size;
- smfs->append_event_unlocked(Beats, ev);
+ if (ret == 0) { // Meta
+ continue;
+ }
+
+ if (first) {
+ smfs->mark_streaming_write_started ();
+ first = false;
+ }
+
+ smfs->append_event_unlocked_beats(Evoral::Event<double>(0,
+ (double)t / (double)source->ppqn(),
+ size,
+ buf));
+
if (status.progress < 0.99)
status.progress += 0.01;
}
-
- nframes_t timeline_position = 0; // FIXME: ?
- // FIXME: kluuuuudge: assumes tempo never changes after start
- const double frames_per_beat = smfs->session().tempo_map().tempo_at(
- timeline_position).frames_per_beat(
- smfs->session().engine().frame_rate(),
- smfs->session().tempo_map().meter_at(timeline_position));
+ const nframes64_t pos = 0;
+ const double length_beats = ceil(t / (double)source->ppqn());
+ BeatsFramesConverter converter(smfs->session().tempo_map(), pos);
+ smfs->update_length(pos, converter.to(length_beats));
+ smfs->mark_streaming_write_completed ();
- smfs->update_length(0, (nframes_t) ceil ((t / (double)source->ppqn()) * frames_per_beat));
-
- smfs->flush_header();
- smfs->flush_footer();
-
- if (status.cancel)
+ if (status.cancel) {
break;
+ }
}
} catch (...) {
- error << "Corrupt MIDI file " << source->filename() << endl;
+ error << "Corrupt MIDI file " << source->file_path() << endl;
}
}
}
// This function is still unable to cleanly update an existing source, even though
-// it is possible to set the import_status flag accordingly. The functinality
+// it is possible to set the ImportStatus flag accordingly. The functinality
// is disabled at the GUI until the Source implementations are able to provide
// the necessary API.
void
-Session::import_audiofiles (import_status& status)
+Session::import_audiofiles (ImportStatus& status)
{
uint32_t cnt = 1;
typedef vector<boost::shared_ptr<Source> > Sources;
uint channels = 0;
status.sources.clear ();
-
+
for (vector<Glib::ustring>::iterator p = status.paths.begin();
p != status.paths.end() && !status.cancel;
++p, ++cnt)
{
boost::shared_ptr<ImportableSource> source;
- std::auto_ptr<SMFReader> smf_reader;
- const DataType type = ((*p).rfind(".mid") != string::npos) ?
+ std::auto_ptr<Evoral::SMF> smf_reader;
+ const DataType type = ((*p).rfind(".mid") != string::npos) ?
DataType::MIDI : DataType::AUDIO;
-
+
if (type == DataType::AUDIO) {
try {
source = open_importable_source (*p, frame_rate(), status.quality);
} else {
try {
- smf_reader = std::auto_ptr<SMFReader>(new SMFReader(*p));
+ smf_reader = std::auto_ptr<Evoral::SMF>(new Evoral::SMF());
+ smf_reader->open(*p);
channels = smf_reader->num_tracks();
- } catch (const SMFReader::UnsupportedTime& err) {
- error << _("Import: unsupported MIDI time stamp format") << endmsg;
- status.done = status.cancel = true;
- return;
} catch (...) {
- error << _("Import: error reading MIDI file") << endmsg;
+ error << _("Import: error opening MIDI file") << endmsg;
status.done = status.cancel = true;
return;
}
get_best_session_directory_for_new_source (),
channels);
Sources newfiles;
+ framepos_t natural_position = source ? source->natural_position() : 0;
if (status.replace_existing_source) {
- fatal << "THIS IS NOT IMPLEMENTED YET, IT SHOULD NEVER GET CALLED!!! DYING!" << endl;
+ fatal << "THIS IS NOT IMPLEMENTED YET, IT SHOULD NEVER GET CALLED!!! DYING!" << endmsg;
status.cancel = !map_existing_mono_sources (new_paths, *this, frame_rate(), newfiles, this);
} else {
- status.cancel = !create_mono_sources_for_writing (new_paths, *this, frame_rate(), newfiles);
+ status.cancel = !create_mono_sources_for_writing (new_paths, *this, frame_rate(), newfiles, natural_position);
}
// copy on cancel/failure so that any files that were created will be removed below
std::copy (newfiles.begin(), newfiles.end(), std::back_inserter(all_new_sources));
- if (status.cancel) break;
+ if (status.cancel) {
+ break;
+ }
for (Sources::iterator i = newfiles.begin(); i != newfiles.end(); ++i) {
if ((afs = boost::dynamic_pointer_cast<AudioFileSource>(*i)) != 0) {
if (source) { // audio
status.doing_what = compose_status_message (*p, source->samplerate(),
- frame_rate(), cnt, status.paths.size());
+ frame_rate(), cnt, status.total);
write_audio_data_to_new_files (source.get(), status, newfiles);
} else if (smf_reader.get()) { // midi
- status.doing_what = string_compose(_("loading MIDI file %1"), *p);
+ status.doing_what = string_compose(_("Loading MIDI file %1"), *p);
write_midi_data_to_new_files (smf_reader.get(), status, newfiles);
}
}
for (Sources::iterator x = all_new_sources.begin(); x != all_new_sources.end(); ) {
if ((afs = boost::dynamic_pointer_cast<AudioFileSource>(*x)) != 0) {
- afs->update_header(0, *now, xnow);
+ afs->update_header((*x)->natural_position(), *now, xnow);
afs->done_with_peakfile_writes ();
-
+
/* now that there is data there, requeue the file for analysis */
-
+
if (Config->get_auto_analyse_audio()) {
Analyser::queue_source_for_analysis (boost::static_pointer_cast<Source>(*x), false);
}
}
-
+
/* don't create tracks for empty MIDI sources (channels) */
if ((smfs = boost::dynamic_pointer_cast<SMFSource>(*x)) != 0 && smfs->is_empty()) {
save_state (_name);
- std::copy (all_new_sources.begin(), all_new_sources.end(),
- std::back_inserter(status.sources));
+ std::copy (all_new_sources.begin(), all_new_sources.end(), std::back_inserter(status.sources));
} else {
// this can throw...but it seems very unlikely
std::for_each (all_new_sources.begin(), all_new_sources.end(), remove_file_source);
projects / ardour.git / blobdiff