*/
+
+#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 <evoral/SMFReader.hpp>
-
-#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_source.h>
-#include <ardour/tempo.h>
+#include "pbd/basename.h"
+#include "pbd/convert.h"
+
+#include "evoral/SMF.hpp"
+
+#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_source.h"
+#include "ardour/tempo.h"
#ifdef HAVE_COREAUDIO
#ifdef USE_COREAUDIO_FOR_FILE_IO
-#include <ardour/caimportable.h>
+#include "ardour/caimportable.h"
#endif
#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)
{
const DataType type = ((*i).rfind(".mid") != string::npos)
? DataType::MIDI : DataType::AUDIO;
- source = SourceFactory::createWritable (
- type,
- sess,
- i->c_str(),
+ source = SourceFactory::createWritable (type, sess,
+ i->c_str(), true,
false, // destructive
- samplerate
- );
+ samplerate);
}
catch (const failed_constructor& err)
{
}
static void
-write_audio_data_to_new_files (ImportableSource* source, Session::import_status& status,
+write_audio_data_to_new_files (ImportableSource* source, Session::ImportStatus& status,
vector<boost::shared_ptr<Source> >& newfiles)
{
const nframes_t nframes = ResampledImportableSource::blocksize;
}
static void
-write_midi_data_to_new_files (Evoral::SMFReader* source, Session::import_status& status,
- vector<boost::shared_ptr<Source> >& newfiles)
+write_midi_data_to_new_files (Evoral::SMF* source, Session::ImportStatus& status,
+ vector<boost::shared_ptr<Source> >& newfiles)
{
- Evoral::Event ev(0, 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);
uint32_t size = 0;
while (!status.cancel) {
+ size = buf_size;
- if (source->read_event(4, ev.buffer(), &size, &delta_t) < 0)
- break;
+ 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;
+ }
+
+ 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));
-
- smfs->update_length(0, (nframes_t) ceil ((t / (double)source->ppqn()) * frames_per_beat));
+ const nframes64_t pos = 0;
+ const double length_beats = ceil(t / (double)source->ppqn());
+ BeatsFramesConverter converter(smfs->session(), pos);
+ smfs->update_length(pos, converter.to(length_beats));
smfs->end_write();
- 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;
++p, ++cnt)
{
boost::shared_ptr<ImportableSource> source;
- std::auto_ptr<Evoral::SMFReader> smf_reader;
+ std::auto_ptr<Evoral::SMF> smf_reader;
const DataType type = ((*p).rfind(".mid") != string::npos) ?
DataType::MIDI : DataType::AUDIO;
} else {
try {
- smf_reader = std::auto_ptr<Evoral::SMFReader>(new Evoral::SMFReader(*p));
+ smf_reader = std::auto_ptr<Evoral::SMF>(new Evoral::SMF());
+ smf_reader->open(*p);
channels = smf_reader->num_tracks();
- } catch (const Evoral::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;
}
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);
}
}
projects / ardour.git / blobdiff