diff options
| author | Sakari Bergen <sakari.bergen@beatwaves.net> | 2008-11-26 17:13:50 +0000 |
|---|---|---|
| committer | Sakari Bergen <sakari.bergen@beatwaves.net> | 2008-11-26 17:13:50 +0000 |
| commit | 38382b792113cbf23881c1dca64e16c2d0207d45 (patch) | |
| tree | 5fb1185a6f21ecc769a4c229fc0f6b7415eabaf5 /libs/ardour/audio_region_importer.cc | |
| parent | 95a86871c028ab7f0ae16608adb9b86495678d50 (diff) | |
More work on track import and some cleaning up of ElementImporter interface
git-svn-id: svn://localhost/ardour2/branches/3.0@4265 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/audio_region_importer.cc')
| -rw-r--r-- | libs/ardour/audio_region_importer.cc | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/libs/ardour/audio_region_importer.cc b/libs/ardour/audio_region_importer.cc index df98ad7274..142b96bcad 100644 --- a/libs/ardour/audio_region_importer.cc +++ b/libs/ardour/audio_region_importer.cc @@ -148,20 +148,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 +188,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 +208,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 +255,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(); |