Add option to limit automatable control parmaters

[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 dd77cb370e4cce491e9a17a425f0801d6df6bd07..4b145e1a9d4fc64da9699fc66d82cc944473be1c 100644 (file)
--- a/libs/ardour/audio_track_importer.cc
+++ b/libs/ardour/audio_track_importer.cc
@@ -21,12 +21,12 @@
 #include "ardour/audio_track_importer.h"
 
 #include "ardour/audio_playlist_importer.h"
-#include "ardour/audio_diskstream.h"
+#include "ardour/disk_reader.h"
 #include "ardour/session.h"
 
 #include "pbd/controllable.h"
-#include "pbd/convert.h"
 #include "pbd/failed_constructor.h"
+#include "pbd/string_convert.h"
 
 #include <sstream>
 #include <algorithm>
@@ -55,7 +55,7 @@ AudioTrackImportHandler::AudioTrackImportHandler (XMLTree const & source, Sessio
                if ( (!type || type->value() == "audio") &&  ((*it)->property ("diskstream") != 0 || (*it)->property ("diskstream-id") != 0)) {
                        try {
                                elements.push_back (ElementPtr ( new AudioTrackImporter (source, session, *this, **it, pl_handler)));
-                       } catch (failed_constructor err) {
+                       } catch (failed_constructor const&) {
                                set_dirty();
                        }
                }
@@ -99,7 +99,7 @@ AudioTrackImporter::AudioTrackImporter (XMLTree const & source,
        XMLNode * remote_control = xml_track.child ("RemoteControl");
        if (remote_control && (prop = remote_control->property ("id"))) {
                uint32_t control_id = session.ntracks() + session.nbusses() + 1;
-               prop->set_value (to_string (control_id, std::dec));
+               prop->set_value (to_string (control_id));
        }
 
        xml_track.remove_nodes_and_delete ("Extra");
@@ -277,6 +277,8 @@ AudioTrackImporter::_cancel_move ()
 void
 AudioTrackImporter::_move ()
 {
+       /* XXX DISK */
+#if 0
        /* Add diskstream */
 
        boost::shared_ptr<XMLSharedNodeList> ds_node_list;
@@ -293,7 +295,7 @@ AudioTrackImporter::_move ()
        assert (p);
        p->set_value (new_ds_id.to_s());
 
-       boost::shared_ptr<Diskstream> new_ds (new AudioDiskstream (session, *ds_node));
+       boost::shared_ptr<DiskReader> new_ds (new DiskReader (session, *ds_node));
        new_ds->set_name (name);
        new_ds->do_refill_with_alloc ();
        new_ds->set_block_size (session.get_block_size ());
@@ -309,6 +311,7 @@ AudioTrackImporter::_move ()
        XMLNode routes ("Routes");
        routes.add_child_copy (xml_track);
        session.load_routes (routes, 3000);
+#endif
 }
 
 bool
@@ -374,7 +377,7 @@ AudioTrackImporter::rate_convert_events (XMLNode & node)
        std::stringstream str (content_node->content());
        std::ostringstream new_content;
 
-       framecnt_t x;
+       samplecnt_t x;
        double y;
        bool ok = true;