switch Evoral::Sequence debugging to use DEBUG_TRACE(); Sequence uses multiset<....

[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 364d681217a2dd4eb94952c3bdf2d5ea2dd51ccd..c5a584a7f4ec604726b14fc734d0362789d811e1 100644 (file)
--- a/libs/ardour/audio_track_importer.cc
+++ b/libs/ardour/audio_track_importer.cc
@@ -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 */
 
@@ -290,7 +291,7 @@ AudioTrackImporter::_move ()
 
        XMLNode routes ("Routes");
        routes.add_child_copy (xml_track);
-       session.load_routes (routes);
+       session.load_routes (routes, 3000);
 }
 
 bool