reinstate thread buffer debug output

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

diff --git a/libs/ardour/import.cc b/libs/ardour/import.cc
index 17b396961aad80af14eabb8d59f7dc386065324b..b47b99571bc446c43eb202944bd4cbbc9e2614bb 100644 (file)
--- a/libs/ardour/import.cc
+++ b/libs/ardour/import.cc
@@ -184,7 +184,7 @@ get_paths_for_new_sources (HeaderFormat hf, const bool allow_replacing, const st
                const DataType type = SMFSource::safe_midi_file_extension (import_file_path) ? DataType::MIDI : DataType::AUDIO;
 
                std::string filepath = (type == DataType::MIDI)
-                       ? sdir.midi_path().to_string() : sdir.sound_path().to_string();
+                       ? sdir.midi_path() : sdir.sound_path();
 
                filepath = Glib::build_filename (filepath,
                                                 get_non_existent_filename (hf, type, allow_replacing, filepath, basename, n, channels));
@@ -474,7 +474,7 @@ remove_file_source (boost::shared_ptr<Source> source)
 // is disabled at the GUI until the Source implementations are able to provide
 // the necessary API.
 void
-Session::import_audiofiles (ImportStatus& status)
+Session::import_files (ImportStatus& status)
 {
        typedef vector<boost::shared_ptr<Source> > Sources;
        Sources all_new_sources;