Add AutomationControl::parameter() for terseness.

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

diff --git a/libs/ardour/import.cc b/libs/ardour/import.cc
index 712b9a35e464ee206c890e98936bd5ad9ac072e6..bc16cde1568a1de2af7e7274ca978f9f51baeb04 100644 (file)
--- a/libs/ardour/import.cc
+++ b/libs/ardour/import.cc
@@ -34,7 +34,9 @@
 #include <pbd/basename.h>
 
 #include <ardour/ardour.h>
+#include <ardour/types.h>
 #include <ardour/session.h>
+#include <ardour/session_directory.h>
 #include <ardour/audio_diskstream.h>
 #include <ardour/sndfilesource.h>
 #include <ardour/sndfile_helpers.h>
@@ -146,7 +148,9 @@ Session::import_audiofile (import_status& status)
                newfiles.push_back (boost::shared_ptr<AudioFileSource>());
        }
 
-       sounds_dir = discover_best_sound_dir ();
+       SessionDirectory sdir(get_best_session_directory_for_new_source ());
+       sounds_dir = sdir.sound_path().to_string();
+
        basepath = PBD::basename_nosuffix (status.paths.front());
 
        for (int n = 0; n < info.channels; ++n) {
@@ -183,7 +187,8 @@ Session::import_audiofile (import_status& status)
                } while ( !goodfile);
 
                try { 
-                       newfiles[n] = boost::dynamic_pointer_cast<AudioFileSource> (SourceFactory::createWritable (*this, buf, false, frame_rate()));
+                       newfiles[n] = boost::dynamic_pointer_cast<AudioFileSource> (
+                               SourceFactory::createWritable (DataType::AUDIO, *this, buf, false, frame_rate()));
                }
 
                catch (failed_constructor& err) {
@@ -316,7 +321,6 @@ Session::import_audiofile (import_status& status)
        }
 
        if (status.cancel) {
-
                status.new_regions.clear ();
 
                for (vector<string>::iterator i = new_paths.begin(); i != new_paths.end(); ++i) {