X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fimport.cc;h=e05d162a568a6880f188dd36c67b7a51af944039;hb=9bdb9836b52cbbef47a1076f0d84ceb41100b58d;hp=a29cc1817b54a914d019af03732db2e57f7d74b0;hpb=997e4b1f9cd7ccfc704b7c035051da7f60d831e7;p=ardour.git diff --git a/libs/ardour/import.cc b/libs/ardour/import.cc index a29cc1817b..e05d162a56 100644 --- a/libs/ardour/import.cc +++ b/libs/ardour/import.cc @@ -1,5 +1,5 @@ /* - 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 @@ -17,6 +17,11 @@ */ + +#ifdef WAF_BUILD +#include "libardour-config.h" +#endif + #include #include #include @@ -25,6 +30,7 @@ #include #include #include +#include #include #include @@ -34,84 +40,84 @@ #include #include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#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 +#include "ardour/caimportable.h" #endif #include "i18n.h" +using namespace std; using namespace ARDOUR; using namespace PBD; - static boost::shared_ptr 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 source(new CAImportableSource(path)); + boost::shared_ptr source(new SndFileImportableSource(path)); if (source->samplerate() == samplerate) { return source; } /* rewrap as a resampled source */ - + return boost::shared_ptr(new ResampledImportableSource(source, samplerate, quality)); } catch (...) { - /* fall back to SndFile */ - -#endif - - try { - boost::shared_ptr source(new SndFileImportableSource(path)); - - if (source->samplerate() == samplerate) { - return source; - } +#ifdef HAVE_COREAUDIO - /* rewrap as a resampled source */ - - return boost::shared_ptr(new ResampledImportableSource(source, samplerate, quality)); - } + /* libsndfile failed, see if we can use CoreAudio to handle the IO */ - catch (...) { - throw; // rethrow + CAImportableSource* src = new CAImportableSource(path); + boost::shared_ptr source (src); + + if (source->samplerate() == samplerate) { + return source; } -#ifdef HAVE_COREAUDIO - } + /* rewrap as a resampled source */ + + return boost::shared_ptr(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; @@ -131,7 +137,7 @@ get_non_existent_filename (DataType type, const bool allow_replacing, const std: } 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)) { @@ -170,10 +176,7 @@ get_paths_for_new_sources (const bool allow_replacing, const string& import_file ? sdir.midi_path().to_string() : sdir.sound_path().to_string(); filepath += '/'; - filepath += get_non_existent_filename (type, allow_replacing, filepath, basename, n, channels); - - cout << "NEW SOURCE PATH: " << filepath << endl; - + filepath += get_non_existent_filename (type, allow_replacing, filepath, basename, n, channels); new_paths.push_back (filepath); } @@ -181,8 +184,8 @@ get_paths_for_new_sources (const bool allow_replacing, const string& import_file } static bool -map_existing_mono_sources (const vector& new_paths, Session& sess, - uint samplerate, vector >& newfiles, Session *session) +map_existing_mono_sources (const vector& new_paths, Session& /*sess*/, + uint /*samplerate*/, vector >& newfiles, Session *session) { for (vector::const_iterator i = new_paths.begin(); i != new_paths.end(); ++i) @@ -201,10 +204,10 @@ map_existing_mono_sources (const vector& new_paths, Session& sess, static bool create_mono_sources_for_writing (const vector& new_paths, Session& sess, - uint samplerate, vector >& newfiles) + uint samplerate, vector >& newfiles, + framepos_t timeline_position) { - for (vector::const_iterator i = new_paths.begin(); - i != new_paths.end(); ++i) + for (vector::const_iterator i = new_paths.begin(); i != new_paths.end(); ++i) { boost::shared_ptr source; @@ -212,14 +215,12 @@ create_mono_sources_for_writing (const vector& new_paths, Session& sess, { 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) { @@ -228,6 +229,15 @@ create_mono_sources_for_writing (const vector& new_paths, Session& sess, } newfiles.push_back(boost::dynamic_pointer_cast(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 afs; + if ((afs = boost::dynamic_pointer_cast(source)) != 0) { + afs->set_timeline_position(timeline_position); + } } return true; } @@ -240,20 +250,20 @@ compose_status_message (const string& path, 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 >& newfiles) { const nframes_t nframes = ResampledImportableSource::blocksize; @@ -266,7 +276,7 @@ write_audio_data_to_new_files (ImportableSource* source, Session::import_status& for (uint n = 0; n < channels; ++n) { channel_data.push_back(boost::shared_array(new Sample[nframes])); } - + uint read_count = 0; status.progress = 0.0f; @@ -305,58 +315,71 @@ write_audio_data_to_new_files (ImportableSource* source, Session::import_status& } static void -write_midi_data_to_new_files (SMFReader* source, Session::import_status& status, - vector >& newfiles) +write_midi_data_to_new_files (Evoral::SMF* source, ImportStatus& status, + vector >& newfiles) { - MidiEvent 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 smfs = boost::dynamic_pointer_cast(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; + + int ret = source->read_event(&delta_t, &size, &buf); + if (size > buf_size) + buf_size = size; - if (source->read_event(4, ev.buffer(), &size, &delta_t) < 0) + 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(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) floor ((t * 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; } } @@ -367,30 +390,30 @@ remove_file_source (boost::shared_ptr source) } // 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 > Sources; Sources all_new_sources; boost::shared_ptr afs; + boost::shared_ptr smfs; uint channels = 0; status.sources.clear (); - + for (vector::iterator p = status.paths.begin(); p != status.paths.end() && !status.cancel; ++p, ++cnt) { - boost::shared_ptr source; - std::auto_ptr smf_reader; - const DataType type = ((*p).rfind(".mid") != string::npos) ? + std::auto_ptr 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); @@ -403,14 +426,11 @@ Session::import_audiofiles (import_status& status) } else { try { - smf_reader = std::auto_ptr(new SMFReader(*p)); + smf_reader = std::auto_ptr(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; } @@ -420,18 +440,21 @@ Session::import_audiofiles (import_status& status) 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(*i)) != 0) { @@ -441,10 +464,10 @@ Session::import_audiofiles (import_status& status) 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); } } @@ -458,26 +481,32 @@ Session::import_audiofiles (import_status& status) /* flush the final length(s) to the header(s) */ - for (Sources::iterator x = all_new_sources.begin(); x != all_new_sources.end(); ++x) - { - cout << "NEW SOURCE: " << (*x)->path() << endl; - + for (Sources::iterator x = all_new_sources.begin(); x != all_new_sources.end(); ) { if ((afs = boost::dynamic_pointer_cast(*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(*x), false); + } + } + + /* don't create tracks for empty MIDI sources (channels) */ + + if ((smfs = boost::dynamic_pointer_cast(*x)) != 0 && smfs->is_empty()) { + x = all_new_sources.erase(x); + } else { + ++x; } - - /* now that there is data there, requeue the file for analysis */ - - Analyser::queue_source_for_analysis (boost::static_pointer_cast(*x), false); } /* save state so that we don't lose these new Sources */ 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);