diff options
| author | David Robillard <d@drobilla.net> | 2009-05-27 23:21:34 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2009-05-27 23:21:34 +0000 |
| commit | 2f595631859574bfa7779ebb42f42b8590f5424c (patch) | |
| tree | c91c0cddcd93af991161c6cde4eceaaf45c5c8d5 /src/gui/NodeModule.cpp | |
| parent | 20ff9af76b21b751ac29b354cf557e86b69c52f7 (diff) | |
| download | ingen-2f595631859574bfa7779ebb42f42b8590f5424c.tar.gz ingen-2f595631859574bfa7779ebb42f42b8590f5424c.tar.bz2 ingen-2f595631859574bfa7779ebb42f42b8590f5424c.zip | |
Remove 'property' vs 'variable' dichotomy in favour of 'meta objects' (to match serialisation).
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@2016 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/gui/NodeModule.cpp')
| -rw-r--r-- | src/gui/NodeModule.cpp | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/gui/NodeModule.cpp b/src/gui/NodeModule.cpp index 74f3bc9e..b507bba7 100644 --- a/src/gui/NodeModule.cpp +++ b/src/gui/NodeModule.cpp @@ -52,7 +52,6 @@ NodeModule::NodeModule(boost::shared_ptr<PatchCanvas> canvas, SharedPtr<NodeMode node->signal_new_port.connect(sigc::bind(sigc::mem_fun(this, &NodeModule::add_port), true)); node->signal_removed_port.connect(sigc::hide_return(sigc::mem_fun(this, &NodeModule::remove_port))); - node->signal_variable.connect(sigc::mem_fun(this, &NodeModule::set_property)); node->signal_property.connect(sigc::mem_fun(this, &NodeModule::set_property)); node->signal_moved.connect(sigc::mem_fun(this, &NodeModule::rename)); } @@ -201,7 +200,7 @@ NodeModule::embed_gui(bool embed) for (NodeModel::Ports::const_iterator p = _node->ports().begin(); p != _node->ports().end(); ++p) if ((*p)->type().is_control() && (*p)->is_output()) - App::instance().engine()->set_variable((*p)->path(), "ingen:broadcast", true); + App::instance().engine()->set_property((*p)->path(), "ingen:broadcast", true); } } else { // un-embed @@ -211,7 +210,7 @@ NodeModule::embed_gui(bool embed) for (NodeModel::Ports::const_iterator p = _node->ports().begin(); p != _node->ports().end(); ++p) if ((*p)->type().is_control() && (*p)->is_output()) - App::instance().engine()->set_variable((*p)->path(), "ingen:broadcast", false); + App::instance().engine()->set_property((*p)->path(), "ingen:broadcast", false); } if (embed && _embed_item) { @@ -362,13 +361,13 @@ NodeModule::store_location() const float x = static_cast<float>(property_x()); const float y = static_cast<float>(property_y()); - const Atom& existing_x = _node->get_variable("ingenuity:canvas-x"); - const Atom& existing_y = _node->get_variable("ingenuity:canvas-y"); + const Atom& existing_x = _node->get_property("ingenuity:canvas-x"); + const Atom& existing_y = _node->get_property("ingenuity:canvas-y"); if (existing_x.type() != Atom::FLOAT || existing_y.type() != Atom::FLOAT || existing_x.get_float() != x || existing_y.get_float() != y) { - App::instance().engine()->set_variable(_node->path(), "ingenuity:canvas-x", Atom(x)); - App::instance().engine()->set_variable(_node->path(), "ingenuity:canvas-y", Atom(y)); + App::instance().engine()->set_property(_node->path(), "ingenuity:canvas-x", Atom(x)); + App::instance().engine()->set_property(_node->path(), "ingenuity:canvas-y", Atom(y)); } } @@ -406,7 +405,7 @@ NodeModule::set_selected(bool b) if (b != selected()) { Module::set_selected(b); if (App::instance().signal()) - App::instance().engine()->set_variable(_node->path(), "ingen:selected", b); + App::instance().engine()->set_property(_node->path(), "ingen:selected", b); } } |