From 4d60d565d99eb06360251ee06f1af094811656e3 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Thu, 4 Feb 2010 19:34:35 +0000 Subject: Consistent name (property_changed) for ObjectModel::signal_property handlers. git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@2426 a436a847-0d15-0410-975c-d299462d15a1 --- src/gui/ControlPanel.cpp | 4 ++-- src/gui/ControlPanel.hpp | 2 +- src/gui/Controls.cpp | 4 ++-- src/gui/Controls.hpp | 2 +- src/gui/NodeModule.cpp | 8 ++++---- src/gui/NodeModule.hpp | 2 +- src/gui/PatchPortModule.cpp | 8 ++++---- src/gui/PatchPortModule.hpp | 2 +- src/gui/PortPropertiesWindow.cpp | 4 ++-- src/gui/PortPropertiesWindow.hpp | 2 +- 10 files changed, 19 insertions(+), 19 deletions(-) (limited to 'src/gui') diff --git a/src/gui/ControlPanel.cpp b/src/gui/ControlPanel.cpp index bcbc0824..63361c45 100644 --- a/src/gui/ControlPanel.cpp +++ b/src/gui/ControlPanel.cpp @@ -77,7 +77,7 @@ ControlPanel::init(SharedPtr node, uint32_t poly) } node->signal_property.connect( - sigc::mem_fun(this, &ControlPanel::variable_changed)); + sigc::mem_fun(this, &ControlPanel::property_changed)); if (node->parent()) node->signal_property.connect( @@ -222,7 +222,7 @@ ControlPanel::parent_property_changed(const Raul::URI& predicate, const Raul::At void -ControlPanel::variable_changed(const Raul::URI& predicate, const Raul::Atom& value) +ControlPanel::property_changed(const Raul::URI& predicate, const Raul::Atom& value) { if (predicate == App::instance().uris().ingen_polyphony && value.type() == Atom::BOOL) { if (value.get_bool()) diff --git a/src/gui/ControlPanel.hpp b/src/gui/ControlPanel.hpp index 93110cfa..402ffe13 100644 --- a/src/gui/ControlPanel.hpp +++ b/src/gui/ControlPanel.hpp @@ -76,7 +76,7 @@ private: void all_voices_selected(); void specific_voice_selected(); - void variable_changed(const Raul::URI& predicate, const Raul::Atom& value); + void property_changed(const Raul::URI& predicate, const Raul::Atom& value); void parent_property_changed(const Raul::URI& predicate, const Raul::Atom& value); bool _callback_enabled; diff --git a/src/gui/Controls.cpp b/src/gui/Controls.cpp index d5ebc11f..a73711f0 100644 --- a/src/gui/Controls.cpp +++ b/src/gui/Controls.cpp @@ -166,7 +166,7 @@ SliderControl::init(ControlPanel* panel, SharedPtr pm) _slider->set_increments(0, 0); } - pm->signal_property.connect(sigc::mem_fun(this, &SliderControl::port_property_change)); + pm->signal_property.connect(sigc::mem_fun(this, &SliderControl::port_property_changed)); _slider->set_range(std::min(min, pm->value().get_float()), std::max(max, pm->value().get_float())); @@ -218,7 +218,7 @@ SliderControl::set_value(const Atom& atom) void -SliderControl::port_property_change(const URI& key, const Atom& value) +SliderControl::port_property_changed(const URI& key, const Atom& value) { _enable_signal = false; diff --git a/src/gui/Controls.hpp b/src/gui/Controls.hpp index 2996b177..dd1e8177 100644 --- a/src/gui/Controls.hpp +++ b/src/gui/Controls.hpp @@ -85,7 +85,7 @@ private: void set_value(const Raul::Atom& value); void set_range(float min, float max); - void port_property_change(const Raul::URI& key, const Raul::Atom& value); + void port_property_changed(const Raul::URI& key, const Raul::Atom& value); void update_range(); void update_value_from_slider(); diff --git a/src/gui/NodeModule.cpp b/src/gui/NodeModule.cpp index 9f10ffe7..482cbe95 100644 --- a/src/gui/NodeModule.cpp +++ b/src/gui/NodeModule.cpp @@ -55,7 +55,7 @@ NodeModule::NodeModule(boost::shared_ptr canvas, SharedPtrsignal_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_property.connect(sigc::mem_fun(this, &NodeModule::set_property)); + node->signal_property.connect(sigc::mem_fun(this, &NodeModule::property_changed)); node->signal_moved.connect(sigc::mem_fun(this, &NodeModule::rename)); PluginModel* plugin = dynamic_cast(node->plugin()); if (plugin) @@ -99,10 +99,10 @@ NodeModule::create(boost::shared_ptr canvas, SharedPtr n ret = boost::shared_ptr(new NodeModule(canvas, node)); for (GraphObject::Properties::const_iterator m = node->meta().properties().begin(); m != node->meta().properties().end(); ++m) - ret->set_property(m->first, m->second); + ret->property_changed(m->first, m->second); for (GraphObject::Properties::const_iterator m = node->properties().begin(); m != node->properties().end(); ++m) - ret->set_property(m->first, m->second); + ret->property_changed(m->first, m->second); for (NodeModel::Ports::const_iterator p = node->ports().begin(); p != node->ports().end(); ++p) ret->add_port(*p, false); @@ -399,7 +399,7 @@ NodeModule::store_location() void -NodeModule::set_property(const URI& key, const Atom& value) +NodeModule::property_changed(const URI& key, const Atom& value) { const Shared::LV2URIMap& uris = App::instance().uris(); switch (value.type()) { diff --git a/src/gui/NodeModule.hpp b/src/gui/NodeModule.hpp index 08a396a1..9b9e78a0 100644 --- a/src/gui/NodeModule.hpp +++ b/src/gui/NodeModule.hpp @@ -77,7 +77,7 @@ protected: void set_selected(bool b); void rename(); - void set_property(const Raul::URI& predicate, const Raul::Atom& value); + void property_changed(const Raul::URI& predicate, const Raul::Atom& value); void add_port(SharedPtr port, bool resize=true); diff --git a/src/gui/PatchPortModule.cpp b/src/gui/PatchPortModule.cpp index a32d202f..1551b142 100644 --- a/src/gui/PatchPortModule.cpp +++ b/src/gui/PatchPortModule.cpp @@ -50,7 +50,7 @@ PatchPortModule::PatchPortModule(boost::shared_ptr canvas, SharedPt set_stacked_border(model->polyphonic()); - model->signal_property.connect(sigc::mem_fun(this, &PatchPortModule::set_property)); + model->signal_property.connect(sigc::mem_fun(this, &PatchPortModule::property_changed)); } @@ -66,11 +66,11 @@ PatchPortModule::create(boost::shared_ptr canvas, SharedPtrmeta().properties().begin(); m != model->meta().properties().end(); ++m) - ret->set_property(m->first, m->second); + ret->property_changed(m->first, m->second); for (GraphObject::Properties::const_iterator m = model->properties().begin(); m != model->properties().end(); ++m) - ret->set_property(m->first, m->second); + ret->property_changed(m->first, m->second); ret->resize(); return ret; @@ -132,7 +132,7 @@ PatchPortModule::set_name(const std::string& n) void -PatchPortModule::set_property(const URI& key, const Atom& value) +PatchPortModule::property_changed(const URI& key, const Atom& value) { const LV2URIMap& uris = App::instance().uris(); switch (value.type()) { diff --git a/src/gui/PatchPortModule.hpp b/src/gui/PatchPortModule.hpp index 6659864a..26da87d8 100644 --- a/src/gui/PatchPortModule.hpp +++ b/src/gui/PatchPortModule.hpp @@ -69,7 +69,7 @@ protected: void set_port(SharedPtr port) { _port = port; } - void set_property(const Raul::URI& predicate, const Raul::Atom& value); + void property_changed(const Raul::URI& predicate, const Raul::Atom& value); SharedPtr _model; SharedPtr _port; diff --git a/src/gui/PortPropertiesWindow.cpp b/src/gui/PortPropertiesWindow.cpp index 14cd9b1f..7dd5efe2 100644 --- a/src/gui/PortPropertiesWindow.cpp +++ b/src/gui/PortPropertiesWindow.cpp @@ -84,7 +84,7 @@ PortPropertiesWindow::present(SharedPtr pm) sigc::mem_fun(*this, &PortPropertiesWindow::max_changed))); _connections.push_back(pm->signal_property.connect( - sigc::mem_fun(this, &PortPropertiesWindow::property_change))); + sigc::mem_fun(this, &PortPropertiesWindow::property_changed))); //_enable_signal = true; @@ -93,7 +93,7 @@ PortPropertiesWindow::present(SharedPtr pm) void -PortPropertiesWindow::property_change(const URI& key, const Atom& value) +PortPropertiesWindow::property_changed(const URI& key, const Atom& value) { const Shared::LV2URIMap& uris = App::instance().uris(); //_enable_signal = false; diff --git a/src/gui/PortPropertiesWindow.hpp b/src/gui/PortPropertiesWindow.hpp index 56b1bc69..2e14976f 100644 --- a/src/gui/PortPropertiesWindow.hpp +++ b/src/gui/PortPropertiesWindow.hpp @@ -42,7 +42,7 @@ public: void present(SharedPtr port_model); private: - void property_change(const Raul::URI& key, const Raul::Atom& value); + void property_changed(const Raul::URI& key, const Raul::Atom& value); void min_changed(); void max_changed(); -- cgit v1.2.1