change Session::convert_to_frames_at() to Session::convert_to_frames() to reflect...

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

diff --git a/libs/ardour/audio_track_importer.cc b/libs/ardour/audio_track_importer.cc
index 146722b3c0bdc398891e47325047674dda20add1..a831e480dbceafdf598d02dcd530575ae3eb0e3d 100644 (file)
--- a/libs/ardour/audio_track_importer.cc
+++ b/libs/ardour/audio_track_importer.cc
@@ -91,7 +91,7 @@ AudioTrackImporter::AudioTrackImporter (XMLTree const & source,
                throw failed_constructor();
        }
 
-       XMLNodeList const & controllables = node.children ("Controllable");
+       XMLNodeList const & controllables = node.children (Controllable::xml_node_name);
        for (XMLNodeList::const_iterator it = controllables.begin(); it != controllables.end(); ++it) {
                parse_controllable (**it);
        }
@@ -197,7 +197,7 @@ AudioTrackImporter::parse_io ()
                return false;
        }
 
-       XMLNodeList const & controllables = io->children ("Controllable");
+       XMLNodeList const & controllables = io->children (Controllable::xml_node_name);
        for (XMLNodeList::const_iterator it = controllables.begin(); it != controllables.end(); ++it) {
                parse_controllable (**it);
        }
@@ -240,7 +240,7 @@ AudioTrackImporter::_prepare_move ()
        /* Rename */
 
        while (session.route_by_name (name) || !track_handler.check_name (name)) {
-               std::pair<bool, string> rename_pair = Rename (_("A playlist with this name already exists, please rename it."), name);
+               std::pair<bool, string> rename_pair = *Rename (_("A playlist with this name already exists, please rename it."), name);
                if (!rename_pair.first) {
                        return false;
                }
@@ -278,7 +278,8 @@ AudioTrackImporter::_move ()
 
        boost::shared_ptr<Diskstream> new_ds (new AudioDiskstream (session, *ds_node));
        new_ds->set_name (name);
-       session.add_diskstream (new_ds);
+       new_ds->do_refill_with_alloc ();
+       new_ds->set_block_size (session.get_block_size ());
 
        /* Import playlists */
 
@@ -356,7 +357,7 @@ AudioTrackImporter::rate_convert_events (XMLNode & node)
        std::stringstream str (content_node->content());
        std::ostringstream new_content;
 
-       nframes_t x;
+       framecnt_t x;
        double y;
        bool ok = true;