summaryrefslogtreecommitdiffstats
path: root/src/progs/demolition
diff options
context:
space:
mode:
Diffstat (limited to 'src/progs/demolition')
-rw-r--r--src/progs/demolition/DemolitionModel.cpp8
-rw-r--r--src/progs/demolition/Makefile.am4
-rw-r--r--src/progs/demolition/demolition.cpp3
3 files changed, 7 insertions, 8 deletions
diff --git a/src/progs/demolition/DemolitionModel.cpp b/src/progs/demolition/DemolitionModel.cpp
index 786c08cd..b4faa533 100644
--- a/src/progs/demolition/DemolitionModel.cpp
+++ b/src/progs/demolition/DemolitionModel.cpp
@@ -64,7 +64,7 @@ DemolitionModel::random_node()
if (i == pm->nodes().end())
return NULL;
}
- return (*i).second;
+ return (*i).second.get();
}
}
//cout << "***************************** Not returning node *********" << endl;
@@ -89,7 +89,7 @@ DemolitionModel::random_node_in_patch(PatchModel* pm)
if (i == pm->nodes().end())
return NULL;
}
- return (*i).second;
+ return (*i).second.get();
}
@@ -108,7 +108,7 @@ DemolitionModel::random_port()
for (PortModelList::iterator p = ports.begin(); p != ports.end(); ++p, ++i)
if (i == index)
- return (*p);
+ return (*p).get();
return NULL; // shouldn't happen
}
@@ -128,7 +128,7 @@ DemolitionModel::random_port_in_node(NodeModel* node)
for (PortModelList::iterator p = ports.begin(); p != ports.end(); ++p, ++i)
if (i == index)
- return (*p);
+ return (*p).get();
return NULL; // shouldn't happen
}
diff --git a/src/progs/demolition/Makefile.am b/src/progs/demolition/Makefile.am
index 64fb3315..07caff5b 100644
--- a/src/progs/demolition/Makefile.am
+++ b/src/progs/demolition/Makefile.am
@@ -1,7 +1,7 @@
EXTRA_DIST = README
-om_demolition_CXXFLAGS = -I$(top_srcdir)/src/libs/client -I$(top_srcdir)/src/common -DPKGDATADIR=\"$(pkgdatadir)\" $(LXML2_CFLAGS) $(LOSC_CFLAGS)
-om_demolition_LDADD = ../../libs/client/libomclient.la $(LOSC_LIBS) $(LXML2_LIBS)
+om_demolition_CXXFLAGS = -I$(top_srcdir)/src/libs/client -I$(top_srcdir)/src/common -DPKGDATADIR=\"$(pkgdatadir)\" $(LXML2_CFLAGS) $(LOSC_CFLAGS) $(LSIGCPP_CFLAGS)
+om_demolition_LDADD = ../../libs/client/libomclient.la $(LOSC_LIBS) $(LXML2_LIBS) $(LSIGCPP_LIBS)
bin_PROGRAMS = om_demolition
diff --git a/src/progs/demolition/demolition.cpp b/src/progs/demolition/demolition.cpp
index 84a08c84..93a37414 100644
--- a/src/progs/demolition/demolition.cpp
+++ b/src/progs/demolition/demolition.cpp
@@ -223,8 +223,7 @@ add_node()
PluginModel* plugin = model->random_plugin();
if (parent != NULL && plugin != NULL) {
- NodeModel* nm = new NodeModel(parent->path() +"/"+ random_name());
- nm->plugin(plugin);
+ NodeModel* nm = new NodeModel(plugin, parent->path() +"/"+ random_name());
cout << "Adding node " << nm->path() << endl;
engine->create_node_from_model(nm);
// Spread them out a bit for easier monitoring with om_gtk