summaryrefslogtreecommitdiff
path: root/libs/ardour/audio_playlist_importer.cc
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2016-05-04 23:09:37 -0400
committerPaul Davis <paul@linuxaudiosystems.com>2016-05-04 23:09:45 -0400
commit17ace643e4edbec1e5bd7b446d039f8c94beef75 (patch)
treedfd1d426f61cdb8bb5dd7d0dc0114c8960b761e8 /libs/ardour/audio_playlist_importer.cc
parent9b3b1d945f72324a5ee38b7053a54e9d257c41db (diff)
OMNIBUS COMMIT: prefer const XMLNode::property method (and provide a real one)
Diffstat (limited to 'libs/ardour/audio_playlist_importer.cc')
-rw-r--r--libs/ardour/audio_playlist_importer.cc14
1 files changed, 7 insertions, 7 deletions
diff --git a/libs/ardour/audio_playlist_importer.cc b/libs/ardour/audio_playlist_importer.cc
index 5390f1c9d4..f24777c68d 100644
--- a/libs/ardour/audio_playlist_importer.cc
+++ b/libs/ardour/audio_playlist_importer.cc
@@ -51,7 +51,7 @@ AudioPlaylistImportHandler::AudioPlaylistImportHandler (XMLTree const & source,
XMLNodeList const & pl_children = playlists->children();
for (XMLNodeList::const_iterator it = pl_children.begin(); it != pl_children.end(); ++it) {
- const XMLProperty* type = (*it)->property("type");
+ XMLProperty const * type = (*it)->property("type");
if ( !type || type->value() == "audio" ) {
try {
elements.push_back (ElementPtr ( new AudioPlaylistImporter (source, session, *this, **it)));
@@ -75,7 +75,7 @@ AudioPlaylistImportHandler::get_regions (XMLNode const & node, ElementList & lis
}
void
-AudioPlaylistImportHandler::update_region_id (XMLProperty* id_prop)
+AudioPlaylistImportHandler::update_region_id (XMLProperty * id_prop)
{
PBD::ID old_id (id_prop->value());
PBD::ID new_id (region_handler.get_new_id (old_id));
@@ -178,7 +178,7 @@ AudioPlaylistImporter::_prepare_move ()
name = rename_pair.second;
}
- XMLProperty* p = xml_playlist.property ("name");
+ XMLProperty * p = xml_playlist.property ("name");
if (!p) {
error << _("badly-formed XML in imported playlist") << endmsg;
return false;
@@ -219,8 +219,8 @@ AudioPlaylistImporter::_move ()
// Update region ids in crossfades
XMLNodeList crossfades = xml_playlist.children("Crossfade");
for (XMLNodeIterator it = crossfades.begin(); it != crossfades.end(); ++it) {
- XMLProperty* in = (*it)->property("in");
- XMLProperty* out = (*it)->property("out");
+ XMLProperty * in = (*it)->property("in");
+ XMLProperty * out = (*it)->property("out");
if (!in || !out) {
error << string_compose (X_("AudioPlaylistImporter (%1): did not find the \"in\" or \"out\" property from a crossfade"), name) << endmsg;
continue; // or fatal?
@@ -230,12 +230,12 @@ AudioPlaylistImporter::_move ()
handler.update_region_id (out);
// rate convert length and position
- XMLProperty* length = (*it)->property("length");
+ XMLProperty * length = (*it)->property("length");
if (length) {
length->set_value (rate_convert_samples (length->value()));
}
- XMLProperty* position = (*it)->property("position");
+ XMLProperty * position = (*it)->property("position");
if (position) {
position->set_value (rate_convert_samples (position->value()));
}