* radically cleaned up / refactored midi_clock_slave.cc

[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 df98ad727440d64d4777fcabb0a12fc142084b0b..714446bfe2fc718a3fff76b5313ac2d0d5d79b1b 100644 (file)
--- a/libs/ardour/audio_region_importer.cc
+++ b/libs/ardour/audio_region_importer.cc
@@ -118,6 +118,10 @@ AudioRegionImporter::AudioRegionImporter (XMLTree const & source, Session & sess
        handler.register_id (old_id, id);
 }
 
+AudioRegionImporter::~AudioRegionImporter ()
+{
+}
+
 string
 AudioRegionImporter::get_info () const
 {
@@ -148,20 +152,18 @@ AudioRegionImporter::get_info () const
 }
 
 bool
-AudioRegionImporter::prepare_move ()
+AudioRegionImporter::_prepare_move ()
 {
-       queued = true;
        return true;
 }
 
 void
-AudioRegionImporter::cancel_move ()
+AudioRegionImporter::_cancel_move ()
 {
-       queued = false;
 }
 
 void
-AudioRegionImporter::move ()
+AudioRegionImporter::_move ()
 {
        if (!region_prepared) {
                prepare_region();
@@ -190,6 +192,7 @@ AudioRegionImporter::parse_xml_region ()
                  !prop.compare ("shift") || !prop.compare ("first_edit") ||
                  !prop.compare ("layer") || !prop.compare ("flags") ||
                  !prop.compare ("scale-gain") || !prop.compare("channels") ||
+                 !prop.compare ("first-edit") ||
                  prop.find ("master-source-") == 0 || prop.find ("source-") == 0) {
                        // All ok
                } else if (!prop.compare ("start") || !prop.compare ("length") ||
@@ -209,7 +212,7 @@ AudioRegionImporter::parse_xml_region ()
                        (*it)->set_value (name);
                        name_ok = true;
                } else {
-                       std::cerr << string_compose (X_("AudioRegionImporter (%1): did not recognise XML-property \"%1\""), name, prop) << endmsg;
+                       std::cerr << string_compose (X_("AudioRegionImporter (%1): did not recognise XML-property \"%2\""), name, prop) << endmsg;
                }
        }
        
@@ -256,7 +259,7 @@ AudioRegionImporter::parse_source_xml ()
                snprintf (buf, sizeof(buf), X_("source-%d"), i);
                prop = xml_region.property (buf);
                if (!prop) {
-                       error << string_compose (X_("AudioRegionImporter (%1): did not find necessary XML-property \"%3\""), name, buf) << endmsg;
+                       error << string_compose (X_("AudioRegionImporter (%1): did not find necessary XML-property \"%2\""), name, buf) << endmsg;
                        return false;
                }
                string source_id = prop->value();