summaryrefslogtreecommitdiffstats
path: root/src/progs/gtk
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2006-06-16 23:17:46 +0000
committerDavid Robillard <d@drobilla.net>2006-06-16 23:17:46 +0000
commit471c9e43493ab1d3a83ed6a8ca53bd818a2ed275 (patch)
tree544fed2bcb9b976bbf665f8cd20029f837b9f4bb /src/progs/gtk
parent45eae6d2d3729876b898e5964829771985eaf9f7 (diff)
downloadingen-471c9e43493ab1d3a83ed6a8ca53bd818a2ed275.tar.gz
ingen-471c9e43493ab1d3a83ed6a8ca53bd818a2ed275.tar.bz2
ingen-471c9e43493ab1d3a83ed6a8ca53bd818a2ed275.zip
More thorough assertion checking in CountedPtr;
Adding plugins to subpatches working. git-svn-id: http://svn.drobilla.net/lad/grauph@46 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/progs/gtk')
-rw-r--r--src/progs/gtk/PatchController.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/progs/gtk/PatchController.cpp b/src/progs/gtk/PatchController.cpp
index 20dcc096..1caf1e8c 100644
--- a/src/progs/gtk/PatchController.cpp
+++ b/src/progs/gtk/PatchController.cpp
@@ -63,6 +63,7 @@ PatchController::PatchController(CountedPtr<PatchModel> model)
{
assert(model->path().length() > 0);
assert(model->controller() == this); // NodeController() does this
+ assert(m_patch_model == model);
/* FIXME if (model->path() != "/") {
PatchController* parent = Store::instance().patch(model->path().parent());
@@ -412,8 +413,8 @@ void
PatchController::add_node(CountedPtr<NodeModel> object)
{
assert(object);
- assert(object->parent() == m_patch_model);
assert(object->path().parent() == m_patch_model->path());
+ assert(object->parent() == m_patch_model);
/*if (patch_model()->get_node(nm->name()) != NULL) {
cerr << "Ignoring existing\n";
@@ -423,6 +424,7 @@ PatchController::add_node(CountedPtr<NodeModel> object)
CountedPtr<NodeModel> node(object);
+ assert(node == object);
if (node) {
assert(node->parent() == m_patch_model);
@@ -430,6 +432,7 @@ PatchController::add_node(CountedPtr<NodeModel> object)
CountedPtr<PatchModel> patch(node);
if (patch) {
+ assert(patch == node == object);
assert(patch->parent() == m_patch_model);
nc = new PatchController(patch);
} else {