diff options
author | David Robillard <d@drobilla.net> | 2011-05-13 01:22:29 +0000 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2011-05-13 01:22:29 +0000 |
commit | 981c7950a6f5fc9f22decaee261556d20b641d5c (patch) | |
tree | 326c2256d5876e3c55ec2fb9ea13c4a04f29bf0b /src/client/PortModel.hpp | |
parent | eae8f927dbf4913c7cb72605af5da0763f7be422 (diff) | |
download | ingen-981c7950a6f5fc9f22decaee261556d20b641d5c.tar.gz ingen-981c7950a6f5fc9f22decaee261556d20b641d5c.tar.bz2 ingen-981c7950a6f5fc9f22decaee261556d20b641d5c.zip |
Make signals private with accessors, and localise dependency on sigc::signal.
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@3258 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/client/PortModel.hpp')
-rw-r--r-- | src/client/PortModel.hpp | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/src/client/PortModel.hpp b/src/client/PortModel.hpp index 264f532e..133a2794 100644 --- a/src/client/PortModel.hpp +++ b/src/client/PortModel.hpp @@ -20,7 +20,6 @@ #include <cstdlib> #include <string> -#include <sigc++/sigc++.h> #include "raul/log.hpp" #include "raul/SharedPtr.hpp" #include "ingen/Port.hpp" @@ -66,21 +65,21 @@ public: inline void value(const Raul::Atom& val) { if (val != _current_val) { _current_val = val; - signal_value_changed.emit(val); + _signal_value_changed.emit(val); } } inline void value(uint32_t voice, const Raul::Atom& val) { // FIXME: implement properly - signal_voice_changed.emit(voice, val); + _signal_voice_changed.emit(voice, val); } // Signals - sigc::signal<void, const Raul::Atom&> signal_value_changed; ///< Value ports - sigc::signal<void, uint32_t, const Raul::Atom&> signal_voice_changed; ///< Polyphonic value ports - sigc::signal<void> signal_activity; ///< Message ports - sigc::signal<void, SharedPtr<PortModel> > signal_connection; - sigc::signal<void, SharedPtr<PortModel> > signal_disconnection; + INGEN_SIGNAL(value_changed, void, const Raul::Atom&); + INGEN_SIGNAL(voice_changed, void, uint32_t, const Raul::Atom&); + INGEN_SIGNAL(activity, void); + INGEN_SIGNAL(connection, void, SharedPtr<PortModel>); + INGEN_SIGNAL(disconnection, void, SharedPtr<PortModel>); private: friend class ClientStore; @@ -101,8 +100,8 @@ private: void add_child(SharedPtr<ObjectModel> c) { throw; } bool remove_child(SharedPtr<ObjectModel> c) { throw; } - void connected_to(SharedPtr<PortModel> p) { ++_connections; signal_connection.emit(p); } - void disconnected_from(SharedPtr<PortModel> p) { --_connections; signal_disconnection.emit(p); } + void connected_to(SharedPtr<PortModel> p) { ++_connections; _signal_connection.emit(p); } + void disconnected_from(SharedPtr<PortModel> p) { --_connections; _signal_disconnection.emit(p); } void set(SharedPtr<ObjectModel> model); |