#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;
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)));
- } catch (failed_constructor err) {
+ } catch (failed_constructor const&) {
set_dirty();
}
}
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");
return false;
}
- XMLProperty* p = c->property ("name");
+ XMLProperty * p = c->property ("name");
if (!p) {
error << _("badly-formed XML in imported track") << endmsg;
return false;
void
AudioTrackImporter::_move ()
{
+ /* XXX DISK */
+#if 0
/* Add diskstream */
boost::shared_ptr<XMLSharedNodeList> ds_node_list;
}
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 ());
XMLNode routes ("Routes");
routes.add_child_copy (xml_track);
session.load_routes (routes, 3000);
+#endif
}
bool
std::stringstream str (content_node->content());
std::ostringstream new_content;
- framecnt_t x;
+ samplecnt_t x;
double y;
bool ok = true;