and now with "d"

[ardour.git] / libs / ardour / import.cc

diff --git a/libs/ardour/import.cc b/libs/ardour/import.cc
index e86e500ed93ff6d12308e5c8db4b289a749c5aee..b2b9403e0ea9a8e383046abac3fa8b7b397815a5 100644 (file)
--- a/libs/ardour/import.cc
+++ b/libs/ardour/import.cc
@@ -34,7 +34,7 @@
 #include <sndfile.h>
 #include <samplerate.h>
 
-#include <glib/gstdio.h>
+#include "pbd/gstdio_compat.h"
 #include <glibmm.h>
 
 #include <boost/scoped_array.hpp>
@@ -67,7 +67,7 @@
 #include "ardour/caimportable.h"
 #endif
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;
@@ -130,7 +130,12 @@ Session::get_paths_for_new_sources (bool /*allow_replacing*/, const string& impo
 
                switch (type) {
                  case DataType::MIDI:
-                       filepath = new_midi_source_path (basename);
+                               if (channels > 1) {
+                                       string mchn_name = string_compose ("%1-t%2", basename, n);
+                                       filepath = new_midi_source_path (mchn_name);
+                               } else {
+                                       filepath = new_midi_source_path (basename);
+                               }
                        break;
                case DataType::AUDIO:
                        filepath = new_audio_source_path (basename, channels, n, false, false);
@@ -229,6 +234,9 @@ write_audio_data_to_new_files (ImportableSource* source, ImportStatus& status,
        const framecnt_t nframes = ResampledImportableSource::blocksize;
        boost::shared_ptr<AudioFileSource> afs;
        uint32_t channels = source->channels();
+       if (channels == 0) {
+               return;
+       }
 
        boost::scoped_array<float> data(new float[nframes * channels]);
        vector<boost::shared_array<Sample> > channel_data;
@@ -257,14 +265,14 @@ write_audio_data_to_new_files (ImportableSource* source, ImportStatus& status,
                uint32_t read_count = 0;
 
                while (!status.cancel) {
-                       framecnt_t const nread = source->read (data.get(), nframes);
+                       framecnt_t const nread = source->read (data.get(), nframes * channels);
                        if (nread == 0) {
                                break;
                        }
 
-                       peak = compute_peak (data.get(), nread, peak);
+                       peak = compute_peak (data.get(), nread * channels, peak);
 
-                       read_count += nread;
+                       read_count += nread / channels;
                        status.progress = 0.5 * read_count / (source->ratio() * source->length() * channels);
                }
 
@@ -286,7 +294,7 @@ write_audio_data_to_new_files (ImportableSource* source, ImportStatus& status,
                uint32_t x;
                uint32_t chn;
 
-               if ((nread = source->read (data.get(), nframes)) == 0) {
+               if ((nread = source->read (data.get(), nframes * channels)) == 0) {
 #ifdef PLATFORM_WINDOWS
                        /* Flush the data once we've finished importing the file. Windows can  */
                        /* cache the data for very long periods of time (perhaps not writing   */
@@ -346,7 +354,9 @@ write_midi_data_to_new_files (Evoral::SMF* source, ImportStatus& status,
 
                        boost::shared_ptr<SMFSource> smfs = boost::dynamic_pointer_cast<SMFSource> (*s);
 
-                       smfs->drop_model ();
+                       Glib::Threads::Mutex::Lock source_lock(smfs->mutex());
+
+                       smfs->drop_model (source_lock);
                        source->seek_to_track (i);
 
                        uint64_t t       = 0;
@@ -376,15 +386,17 @@ write_midi_data_to_new_files (Evoral::SMF* source, ImportStatus& status,
                                }
 
                                if (first) {
-                                       smfs->mark_streaming_write_started ();
+                                       smfs->mark_streaming_write_started (source_lock);
                                        first = false;
                                }
 
-                               smfs->append_event_unlocked_beats(
-                                       Evoral::Event<double>(0,
-                                                             (double)t / (double)source->ppqn(),
-                                                             size,
-                                                             buf));
+                               smfs->append_event_beats(
+                                       source_lock,
+                                       Evoral::Event<Evoral::Beats>(
+                                               0,
+                                               Evoral::Beats::ticks_at_rate(t, source->ppqn()),
+                                               size,
+                                               buf));
 
                                if (status.progress < 0.99) {
                                        status.progress += 0.01;
@@ -395,24 +407,24 @@ write_midi_data_to_new_files (Evoral::SMF* source, ImportStatus& status,
 
                                /* we wrote something */
 
-                               const framepos_t pos = 0;
-                               const double length_beats = ceil(t / (double)source->ppqn());
+                               const framepos_t     pos          = 0;
+                               const Evoral::Beats  length_beats = Evoral::Beats::ticks_at_rate(t, 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(pos + converter.to(length_beats.round_up_to_beat()));
+                               smfs->mark_streaming_write_completed (source_lock);
 
                                if (status.cancel) {
                                        break;
                                }
                        } else {
-                               warning << string_compose (_("Track %1 of %2 contained no usable MIDI data"), i, source->file_path()) << endmsg;
+                               info << string_compose (_("Track %1 of %2 contained no usable MIDI data"), i, source->num_tracks()) << endmsg;
                        }
 
                        ++s; // next source
                }
 
-       } catch (...) {
-               error << string_compose (_("MIDI file %1 was not readable (no reason available)"), source->file_path()) << endmsg;
+       } catch (exception& e) {
+               error << string_compose (_("MIDI file could not be written (best guess: %1)"), e.what()) << endmsg;
        }
 
        if (buf) {
@@ -425,6 +437,8 @@ remove_file_source (boost::shared_ptr<Source> source)
 {
        boost::shared_ptr<FileSource> fs = boost::dynamic_pointer_cast<FileSource> (source);
 
+       fs->DropReferences ();
+
        if (fs) {
                ::g_unlink (fs->path().c_str());
        }
@@ -445,7 +459,7 @@ Session::import_files (ImportStatus& status)
 
        status.sources.clear ();
 
-       for (vector<string>::iterator p = status.paths.begin();
+       for (vector<string>::const_iterator p = status.paths.begin();
             p != status.paths.end() && !status.cancel;
             ++p)
        {
@@ -474,7 +488,7 @@ Session::import_files (ImportStatus& status)
                                return;
                        }
                }
-               
+
                if (channels == 0) {
                        error << _("Import: file contains no channels.") << endmsg;
                        continue;
@@ -539,7 +553,7 @@ Session::import_files (ImportStatus& status)
                                        Analyser::queue_source_for_analysis (boost::static_pointer_cast<Source>(*x), false);
                                }
                        }
-                       
+
                        /* imported, copied files cannot be written or removed
                         */
 
@@ -577,7 +591,7 @@ Session::import_files (ImportStatus& status)
                } catch (...) {
                        error << _("Failed to remove some files after failed/cancelled import operation") << endmsg;
                }
-                               
+
        }
 
        status.done = true;