X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=libs%2Fardour%2Faudio_track_importer.cc;h=af6d9a613ae144645127bd0003e7eaf1b5b48c0f;hb=62f29d6c440dee32e45f8ed2b75d87de30234342;hp=43a40101cf9aeb64f834b77f6ae79600b937e920;hpb=22b07e0233a29d9633ffa825a79503befaf2e16e;p=ardour.git

diff --git a/libs/ardour/audio_track_importer.cc b/libs/ardour/audio_track_importer.cc
index 43a40101cf..af6d9a613a 100644
--- a/libs/ardour/audio_track_importer.cc
+++ b/libs/ardour/audio_track_importer.cc
@@ -21,17 +21,17 @@
 #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>
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace PBD;
@@ -51,7 +51,7 @@ AudioTrackImportHandler::AudioTrackImportHandler (XMLTree const & source, Sessio
 
 	XMLNodeList const & route_list = routes->children();
 	for (XMLNodeList::const_iterator it = route_list.begin(); it != route_list.end(); ++it) {
-		const XMLProperty* type = (*it)->property("default-type");
+		XMLProperty const * type = (*it)->property("default-type");
 		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)));
@@ -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");
@@ -254,7 +254,7 @@ AudioTrackImporter::_prepare_move ()
 		return false;
 	}
 
-	XMLProperty* p = c->property ("name");
+	XMLProperty * p = c->property ("name");
 	if (!p) {
 		error << _("badly-formed XML in imported track") << endmsg;
 		return false;
@@ -277,6 +277,8 @@ AudioTrackImporter::_cancel_move ()
 void
 AudioTrackImporter::_move ()
 {
+	/* XXX DISK */
+#if 0
 	/* Add diskstream */
 
 	boost::shared_ptr<XMLSharedNodeList> ds_node_list;
@@ -289,11 +291,11 @@ AudioTrackImporter::_move ()
 	}
 
 	boost::shared_ptr<XMLNode> ds_node = ds_node_list->front();
-	XMLProperty* p = ds_node->property (X_("id"));
+	XMLProperty * p = ds_node->property (X_("id"));
 	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;