Time unit translation for AutomationLine (correctly display MIDI controller data).
[ardour.git] / libs / ardour / import.cc
index b10f76424be5fa67ea7959622c835e4d1004798c..f983352d58d999c9c99cf84bfd19c15b9eaf3d9e 100644 (file)
@@ -15,7 +15,6 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id$
 */
 
 #include <cstdio>
 
 #include <glibmm.h>
 
+#include <boost/scoped_array.hpp>
+#include <boost/shared_array.hpp>
+
 #include <pbd/basename.h>
+#include <pbd/convert.h>
+
+#include <evoral/SMF.hpp>
 
 #include <ardour/ardour.h>
-#include <ardour/types.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>
+#endif
+#endif
 
 #include "i18n.h"
 
 using namespace ARDOUR;
 using namespace PBD;
 
-#define BLOCKSIZE 4096U
 
-int
-Session::import_audiofile (import_status& status)
+static boost::shared_ptr<ImportableSource>
+open_importable_source (const string& path, nframes_t samplerate, ARDOUR::SrcQuality quality)
 {
-       SNDFILE *in;
-       vector<boost::shared_ptr<AudioFileSource> > newfiles;
-       SourceList sources;
-       SF_INFO info;
-       float *data = 0;
-       Sample **channel_data = 0;
-       long nfiles = 0;
-       long n;
-       string basepath;
-       string sounds_dir;
-       jack_nframes_t so_far;
-       char buf[PATH_MAX+1];
-       int ret = -1;
-       vector<string> new_paths;
-       struct tm* now;
-       string tmp_convert_file;
-       
-       status.new_regions.clear ();
+#ifdef HAVE_COREAUDIO
+#ifdef USE_COREAUDIO_FOR_FILE_IO
 
-       if ((in = sf_open (status.pathname.c_str(), SFM_READ, &info)) == 0) {
-               error << string_compose(_("Import: cannot open input sound file \"%1\""), status.pathname) << endmsg;
-               return -1;
-       } else {
-               if ((uint32_t) info.samplerate != frame_rate()) {
-                       sf_close(in);
-                       status.doing_what = _("resampling audio");
-                       // resample to session frame_rate
-                       if (sample_rate_convert(status, status.pathname, tmp_convert_file)) {
-                               if ((in = sf_open (tmp_convert_file.c_str(), SFM_READ, &info)) == 0) {
-                                       error << string_compose(_("Import: cannot open converted sound file \"%1\""), tmp_convert_file) << endmsg;
-                                       return -1;
-                               }
-                       } else if (!status.cancel){
-                               // error
-                               error << string_compose(_("Import: error while resampling sound file \"%1\""), status.pathname) << endmsg;
-                               return -1;
-                       } else {
-                               // canceled
-                               goto out;
-                       }
+       /* see if we can use CoreAudio to handle the IO */
+       
+       try { 
+               CAImportableSource* src = new CAImportableSource(path);
+               boost::shared_ptr<CAImportableSource> source (src);
+               
+               if (source->samplerate() == samplerate) {
+                       return source;
                }
-       }
+               
+               /* rewrap as a resampled source */
 
-       for (n = 0; n < info.channels; ++n) {
-               newfiles.push_back (boost::shared_ptr<AudioFileSource>());
+               return boost::shared_ptr<ImportableSource>(new ResampledImportableSource(source, samplerate, quality));
        }
 
-       sounds_dir = discover_best_sound_dir ();
-       basepath = PBD::basename_nosuffix (status.pathname);
+       catch (...) {
+
+               /* fall back to SndFile */
+#endif 
+#endif
+
+               try { 
+                       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 (...) {
+                       throw; // rethrow
+               }
+               
+#ifdef HAVE_COREAUDIO          
+#ifdef USE_COREAUDIO_FOR_FILE_IO
+       }
+#endif
+#endif
+}
 
-       for (n = 0; n < info.channels; ++n) {
+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)
+{
+       char buf[PATH_MAX+1];
+       bool goodfile = false;
+       string base(basename);
+       const char* ext = (type == DataType::AUDIO) ? "wav" : "mid";
 
-               bool goodfile = false;
+       do {
 
-               do {
-                       if (info.channels == 2) {
-                               if (n == 0) {
-                                       snprintf (buf, sizeof(buf), "%s%s-L.wav", sounds_dir.c_str(), basepath.c_str());
-                               } else {
-                                       snprintf (buf, sizeof(buf), "%s%s-R.wav", sounds_dir.c_str(), basepath.c_str());
-                               }
-                       } else if (info.channels > 1) {
-                               snprintf (buf, sizeof(buf), "%s%s-c%lu.wav", sounds_dir.c_str(), basepath.c_str(), n+1);
+               if (type == DataType::AUDIO && channels == 2) {
+                       if (channel == 0) {
+                               snprintf (buf, sizeof(buf), "%s-L.wav", base.c_str());
                        } else {
-                               snprintf (buf, sizeof(buf), "%s%s.wav", sounds_dir.c_str(), basepath.c_str());
+                               snprintf (buf, sizeof(buf), "%s-R.wav", base.c_str());
                        }
+               } else if (channels > 1) {
+                       snprintf (buf, sizeof(buf), "%s-c%d.%s", base.c_str(), channel, ext);
+               } else {
+                       snprintf (buf, sizeof(buf), "%s.%s", base.c_str(), ext);
+               }
+               
 
-                       if (::access (buf, F_OK) == 0) {
+               string tempname = destdir + "/" + buf;
+               if (!allow_replacing && Glib::file_test (tempname, Glib::FILE_TEST_EXISTS)) {
 
-                               /* if the file already exists, we must come up with
-                                *  a new name for it.  for now we just keep appending
-                                *  _ to basepath
-                                */
-                               
-                               basepath += "_";
+                       /* if the file already exists, we must come up with
+                        *  a new name for it.  for now we just keep appending
+                        *  _ to basename
+                        */
 
-                       } else {
+                       base += "_";
 
-                               goodfile = true;
-                       }
+               } else {
 
-               } while ( !goodfile);
+                       goodfile = true;
+               }
 
-               try { 
-                       newfiles[n] = boost::dynamic_pointer_cast<AudioFileSource> (
-                               SourceFactory::createWritable (DataType::AUDIO, *this, buf, false, frame_rate()));
+       } while ( !goodfile);
+
+       return buf;
+}
+
+static vector<string>
+get_paths_for_new_sources (const bool allow_replacing, const string& import_file_path, const string& session_dir, uint channels)
+{
+       vector<string> new_paths;
+       const string basename = basename_nosuffix (import_file_path);
+
+       SessionDirectory sdir(session_dir);
+
+       for (uint n = 0; n < channels; ++n) {
+
+               const DataType type = (import_file_path.rfind(".mid") != string::npos)
+                               ? DataType::MIDI : DataType::AUDIO;
+
+               std::string filepath = (type == DataType::MIDI)
+                               ? sdir.midi_path().to_string() : sdir.sound_path().to_string();
+
+               filepath += '/';
+               filepath += get_non_existent_filename (type, allow_replacing, filepath, basename, n, channels); 
+               new_paths.push_back (filepath);
+       }
+
+       return new_paths;
+}
+
+static bool
+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)
+       {
+               boost::shared_ptr<Source> source = session->source_by_path_and_channel(*i, 0);
+
+               if (source == 0) {
+                       error << string_compose(_("Could not find a source for %1 even though we are updating this file!"), (*i)) << endl;
+                       return false;
                }
 
-               catch (failed_constructor& err) {
-                       error << string_compose(_("Session::import_audiofile: cannot open new file source for channel %1"), n+1) << endmsg;
-                       goto out;
+               newfiles.push_back(boost::dynamic_pointer_cast<Source>(source));
+       }
+       return true;
+}
+
+static bool
+create_mono_sources_for_writing (const vector<string>& new_paths, Session& sess,
+               uint samplerate, vector<boost::shared_ptr<Source> >& newfiles)
+{
+       for (vector<string>::const_iterator i = new_paths.begin();
+                       i != new_paths.end(); ++i)
+       {
+               boost::shared_ptr<Source> source;
+
+               try
+               {
+                       const DataType type = ((*i).rfind(".mid") != string::npos)
+                               ? DataType::MIDI : DataType::AUDIO;
+                               
+                       source = SourceFactory::createWritable (
+                                       type,
+                                       sess,
+                                       i->c_str(),
+                                       false, // destructive
+                                       samplerate
+                                       );
+               }
+               catch (const failed_constructor& err)
+               {
+                       error << string_compose (_("Unable to create file %1 during import"), *i) << endmsg;
+                       return false;
                }
 
-               new_paths.push_back (buf);
-               nfiles++;
+               newfiles.push_back(boost::dynamic_pointer_cast<Source>(source));
        }
-       
-       
-       data = new float[BLOCKSIZE * info.channels];
-       channel_data = new Sample * [ info.channels ];
-       
-       for (n = 0; n < info.channels; ++n) {
-               channel_data[n] = new Sample[BLOCKSIZE];
+       return true;
+}
+
+static Glib::ustring
+compose_status_message (const string& path,
+                       uint file_samplerate,
+                       uint session_samplerate,
+                       uint current_file,
+                       uint total_files)
+{
+       if (file_samplerate != session_samplerate) {
+               return string_compose (_("converting %1\n(resample 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);
        }
 
-       so_far = 0;
+       return  string_compose (_("converting %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::ImportStatus& status,
+                              vector<boost::shared_ptr<Source> >& newfiles)
+{
+       const nframes_t nframes = ResampledImportableSource::blocksize;
+       boost::shared_ptr<AudioFileSource> afs;
+       uint channels = source->channels();
+
+       boost::scoped_array<float> data(new float[nframes * channels]);
+       vector<boost::shared_array<Sample> > channel_data;
 
-       status.doing_what = _("converting audio");
-       status.progress = 0.0;
+       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;
 
        while (!status.cancel) {
 
-               long nread;
-               long x;
-               long chn;
+               nframes_t nread, nfread;
+               uint x;
+               uint chn;
 
-               if ((nread = sf_readf_float (in, data, BLOCKSIZE)) == 0) {
+               if ((nread = source->read (data.get(), nframes)) == 0) {
                        break;
                }
+               nfread = nread / channels;
 
                /* de-interleave */
-                               
-               for (chn = 0; chn < info.channels; ++chn) {
-                       for (x = chn, n = 0; n < nread; x += info.channels, ++n) {
+
+               for (chn = 0; chn < channels; ++chn) {
+
+                       nframes_t n;
+                       for (x = chn, n = 0; n < nfread; x += channels, ++n) {
                                channel_data[chn][n] = (Sample) data[x];
                        }
                }
 
                /* flush to disk */
 
-               for (chn = 0; chn < info.channels; ++chn) {
-                       newfiles[chn]->write (channel_data[chn], nread);
+               for (chn = 0; chn < channels; ++chn) {
+                       if ((afs = boost::dynamic_pointer_cast<AudioFileSource>(newfiles[chn])) != 0) {
+                               afs->write (channel_data[chn].get(), nfread);
+                       }
                }
 
-               so_far += nread;
-               status.progress = so_far / (float) (info.frames * info.channels);
-       }
-
-       if (status.multichan) {
-               status.doing_what = _("building region");
-       } else {
-               status.doing_what = _("building regions");
-       }
-
-       status.freeze = true;
-
-       time_t xnow;
-       time (&xnow);
-       now = localtime (&xnow);
-
-       if (status.cancel) {
-               goto out;
+               read_count += nread;
+               status.progress = read_count / (source->ratio () * source->length() * channels);
        }
+}
 
-       if (status.multichan) {
-               /* all sources are used in a single multichannel region */
-               for (n = 0; n < nfiles && !status.cancel; ++n) {
-                       /* flush the final length to the header */
-                       newfiles[n]->update_header(0, *now, xnow);
-                       sources.push_back(newfiles[n]);
-               }
-
-               boost::shared_ptr<AudioRegion> r (boost::dynamic_pointer_cast<AudioRegion> (RegionFactory::create (sources, 0, newfiles[0]->length(), region_name_from_path (Glib::path_get_basename (basepath)),
-                                                                                                                  0, AudioRegion::Flag (AudioRegion::DefaultFlags | AudioRegion::WholeFile))));
-               
-               status.new_regions.push_back (r);
-
-       } else {
-               for (n = 0; n < nfiles && !status.cancel; ++n) {
+static void
+write_midi_data_to_new_files (Evoral::SMF* source, Session::ImportStatus& status,
+               vector<boost::shared_ptr<Source> >& newfiles)
+{
+       uint32_t buf_size = 4;
+       uint8_t* buf      = (uint8_t*)malloc(buf_size);
 
-                       /* flush the final length to the header */
+       status.progress = 0.0f;
 
-                       newfiles[n]->update_header(0, *now, xnow);
+       try {
 
-                       /* The sources had zero-length when created, which means that the Session
-                          did not bother to create whole-file AudioRegions for them. Do it now.
-                       */
+       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();
                
-                       status.new_regions.push_back (boost::dynamic_pointer_cast<AudioRegion> 
-                                                     (RegionFactory::create (boost::static_pointer_cast<Source> (newfiles[n]), 0, newfiles[n]->length(), 
-                                                                             region_name_from_path (Glib::path_get_basename (newfiles[n]->name())),
-                                                                             0, AudioRegion::Flag (AudioRegion::DefaultFlags | AudioRegion::WholeFile | AudioRegion::Import))));
-               }
-       }
+               source->seek_to_track(i);
        
-       /* save state so that we don't lose these new Sources */
+               uint64_t t       = 0;
+               uint32_t delta_t = 0;
+               uint32_t size    = 0;
+               
+               while (!status.cancel) {
+                       size = buf_size;
 
-       if (!status.cancel) {
-               save_state (_name);
-       }
+                       int ret = source->read_event(&delta_t, &size, &buf);
+                       if (size > buf_size)
+                               buf_size = size;
+
+                       if (ret < 0) { // EOT
+                               break;
+                       }
+                       
+                       t += delta_t;
 
-       ret = 0;
+                       if (ret == 0) { // Meta
+                               continue;
+                       }
 
-  out:
+                       smfs->append_event_unlocked_beats(Evoral::Event<double>(0,
+                                       (double)t / (double)source->ppqn(),
+                                       size,
+                                       buf));
 
-       if (data) {
-               delete [] data;
-       }
-       
-       if (channel_data) {
-               for (n = 0; n < info.channels; ++n) {
-                       delete [] channel_data[n];
+                       if (status.progress < 0.99)
+                               status.progress += 0.01;
                }
-               delete [] channel_data;
-       }
 
-       if (status.cancel) {
-               status.new_regions.clear ();
+               const double length_beats = ceil(t / (double)source->ppqn());
+               smfs->update_length(0, smfs->time_converter().to(length_beats));
+               smfs->end_write();
 
-               for (vector<string>::iterator i = new_paths.begin(); i != new_paths.end(); ++i) {
-                       unlink ((*i).c_str());
+               if (status.cancel) {
+                       break;
                }
        }
 
-       if (tmp_convert_file.length()) {
-               unlink(tmp_convert_file.c_str());
+       } catch (...) {
+               error << "Corrupt MIDI file " << source->path() << endl;
        }
-       
-       sf_close (in);
-       status.done = true;
-       return ret;
 }
 
-string
-Session::build_tmp_convert_name(string infile)
+static void
+remove_file_source (boost::shared_ptr<Source> source)
 {
-       string tmp_name(_path + "/." + Glib::path_get_basename (infile.c_str()) + "XXXXXX");
-       char* tmp = new char[tmp_name.length() + 1];
-       tmp_name.copy(tmp, string::npos);
-       tmp[tmp_name.length()] = 0;
-       mkstemp(tmp);
-       string outfile = tmp;
-       delete [] tmp;
-       
-       return outfile;
+       ::unlink (source->path().c_str());
 }
 
-bool
-Session::sample_rate_convert (import_status& status, string infile, string& outfile)
-{      
-       float input [BLOCKSIZE] ;
-       float output [BLOCKSIZE] ;
-
-       SF_INFO         sf_info;
-       SRC_STATE*      src_state ;
-       SRC_DATA        src_data ;
-       int                     err ;
-       sf_count_t      output_count = 0 ;
-       sf_count_t  input_count = 0;
-
-       SNDFILE* in = sf_open(infile.c_str(), SFM_READ, &sf_info);
-       if (!in) {
-               error << string_compose(_("Import/SRC: could not open input file: %1"), outfile) << endmsg;
-               return false;
-       }
-       sf_count_t total_input_frames = sf_info.frames;
-       
-       outfile = build_tmp_convert_name(infile);
-       SNDFILE* out = sf_open(outfile.c_str(), SFM_RDWR, &sf_info);
-       if (!out) {
-               error << string_compose(_("Import/SRC: could not open output file: %1"), outfile) << endmsg;
-               return false;
-       }
+// This function is still unable to cleanly update an existing source, even though
+// 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 (ImportStatus& status)
+{
+       uint32_t cnt = 1;
+       typedef vector<boost::shared_ptr<Source> > Sources;
+       Sources all_new_sources;
+       boost::shared_ptr<AudioFileSource> afs;
+       boost::shared_ptr<SMFSource> smfs;
+       uint channels = 0;
+
+       status.sources.clear ();
        
-       sf_seek (in, 0, SEEK_SET) ;
-       sf_seek (out, 0, SEEK_SET) ;
+       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<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);
+                               channels = source->channels();
+                       } catch (const failed_constructor& err) {
+                               error << string_compose(_("Import: cannot open input sound file \"%1\""), (*p)) << endmsg;
+                               status.done = status.cancel = true;
+                               return;
+                       }
 
-       /* Initialize the sample rate converter. */
-       if ((src_state = src_new (SRC_SINC_BEST_QUALITY, sf_info.channels, &err)) == 0) {       
-               error << string_compose(_("Import: src_new() failed : %1"), src_strerror (err)) << endmsg ;
-               return false ;
-       }
+               } else {
+                       try {
+                               smf_reader = std::auto_ptr<Evoral::SMF>(new Evoral::SMF());
+                               smf_reader->open(*p);
+                               channels = smf_reader->num_tracks();
+                       } catch (...) {
+                               error << _("Import: error opening MIDI file") << endmsg;
+                               status.done = status.cancel = true;
+                               return;
+                       }
+               }
 
-       src_data.end_of_input = 0 ; /* Set this later. */
+               vector<string> new_paths = get_paths_for_new_sources (status.replace_existing_source, *p,
+                                                                     get_best_session_directory_for_new_source (),
+                                                                     channels);
+               Sources newfiles;
 
-       /* Start with zero to force load in while loop. */
-       src_data.input_frames = 0 ;
-       src_data.data_in = input ;
+               if (status.replace_existing_source) {
+                       fatal << "THIS IS NOT IMPLEMENTED YET, IT SHOULD NEVER GET CALLED!!! DYING!" << endl;
+                       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);
+               }
 
-       src_data.src_ratio = (1.0 * frame_rate()) / sf_info.samplerate ;
+               // 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));
 
-       src_data.data_out = output ;
-       src_data.output_frames = BLOCKSIZE / sf_info.channels ;
+               if (status.cancel) break;
 
-       while (!status.cancel) {
-               /* If the input buffer is empty, refill it. */
-               if (src_data.input_frames == 0) {       
-                       src_data.input_frames = sf_readf_float (in, input, BLOCKSIZE / sf_info.channels) ;
-                       src_data.data_in = input ;
-
-                       /* The last read will not be a full buffer, so snd_of_input. */
-                       if (src_data.input_frames < (int)BLOCKSIZE / sf_info.channels) {
-                               src_data.end_of_input = SF_TRUE ;
+               for (Sources::iterator i = newfiles.begin(); i != newfiles.end(); ++i) {
+                       if ((afs = boost::dynamic_pointer_cast<AudioFileSource>(*i)) != 0) {
+                               afs->prepare_for_peakfile_writes ();
                        }
-               } 
-
-               if ((err = src_process (src_state, &src_data))) {
-                       error << string_compose(_("Import: %1"), src_strerror (err)) << endmsg ;
-                       return false ;
-               } 
+               }
 
-               /* Terminate if at end */
-               if (src_data.end_of_input && src_data.output_frames_gen == 0) {
-                       break ;
+               if (source) { // audio
+                       status.doing_what = compose_status_message (*p, source->samplerate(),
+                                                                   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);
+                       write_midi_data_to_new_files (smf_reader.get(), status, newfiles);
                }
+       }
 
-               /* Write output. */
-               sf_writef_float (out, output, src_data.output_frames_gen) ;
-               output_count += src_data.output_frames_gen ;
-               input_count += src_data.input_frames_used;
+       if (!status.cancel) {
+               struct tm* now;
+               time_t xnow;
+               time (&xnow);
+               now = localtime (&xnow);
+               status.freeze = true;
+
+               /* flush the final length(s) to the header(s) */
+
+               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->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) */
 
-               src_data.data_in += src_data.input_frames_used * sf_info.channels ;
-               src_data.input_frames -= src_data.input_frames_used ;
-               
-               status.progress = (float) input_count / total_input_frames;
-       }
+                       if ((smfs = boost::dynamic_pointer_cast<SMFSource>(*x)) != 0 && smfs->is_empty()) {
+                               x = all_new_sources.erase(x);
+                       } else {
+                               ++x;
+                       }
+               }
+
+               /* save state so that we don't lose these new Sources */
 
-       src_state = src_delete (src_state) ;
-       sf_close(in);
-       sf_close(out);
+               save_state (_name);
 
-       if (status.cancel) {
-               return false;
+               std::copy (all_new_sources.begin(), all_new_sources.end(), std::back_inserter(status.sources));
        } else {
-               return true ;
+               // this can throw...but it seems very unlikely
+               std::for_each (all_new_sources.begin(), all_new_sources.end(), remove_file_source);
        }
+
+       status.done = true;
 }
+