obey monitor=disk when recording also; remove debug output

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

diff --git a/libs/ardour/audio_region_importer.cc b/libs/ardour/audio_region_importer.cc
index ebe4ae527046df4bf860002e125312ab34196988..775bd0119f1eca90009965704a16085d71fdfe51 100644 (file)
--- a/libs/ardour/audio_region_importer.cc
+++ b/libs/ardour/audio_region_importer.cc
@@ -126,7 +126,7 @@ AudioRegionImporter::~AudioRegionImporter ()
 string
 AudioRegionImporter::get_info () const
 {
-       nframes_t length, position;
+       framecnt_t length, position;
        Timecode::Time length_time, position_time;
        std::ostringstream oss;
 
@@ -176,8 +176,6 @@ AudioRegionImporter::_move ()
        if (broken()) {
                return;
        }
-
-       session.add_regions (region);
 }
 
 bool
@@ -209,7 +207,7 @@ AudioRegionImporter::parse_xml_region ()
                } else if (!prop.compare("name")) {
                        // rename region if necessary
                        name = (*it)->value();
-                       name = session.new_region_name (name);
+                       name = RegionFactory::new_region_name (name);
                        (*it)->set_value (name);
                        name_ok = true;
                } else {
@@ -358,7 +356,7 @@ AudioRegionImporter::prepare_sources ()
        session.import_audiofiles (status);
 
        // Add imported sources to handlers map
-       std::vector<Glib::ustring>::iterator file_it = status.paths.begin();
+       std::vector<string>::iterator file_it = status.paths.begin();
        for (SourceList::iterator source_it = status.sources.begin(); source_it != status.sources.end(); ++source_it) {
                if (*source_it) {
                        handler.add_source(*file_it, *source_it);