diff options
author | David Robillard <d@drobilla.net> | 2008-08-14 21:36:53 +0000 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2008-08-14 21:36:53 +0000 |
commit | 45689d6eab8d2a6bcdbe8b45d7de2d4ef806de0c (patch) | |
tree | e59acc02541c17cf6bf039fe91a5559dbc3478e4 /src/libs/gui/ControlPanel.hpp | |
parent | 406d7376bf8faf0965fb87feaf6401962d357962 (diff) | |
download | ingen-45689d6eab8d2a6bcdbe8b45d7de2d4ef806de0c.tar.gz ingen-45689d6eab8d2a6bcdbe8b45d7de2d4ef806de0c.tar.bz2 ingen-45689d6eab8d2a6bcdbe8b45d7de2d4ef806de0c.zip |
Support for toggle ports in control window (shown as a checkbox).
Rename "ControlGroups" "Controls" (each is only for one port...).
git-svn-id: http://svn.drobilla.net/lad/ingen@1379 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/libs/gui/ControlPanel.hpp')
-rw-r--r-- | src/libs/gui/ControlPanel.hpp | 30 |
1 files changed, 13 insertions, 17 deletions
diff --git a/src/libs/gui/ControlPanel.hpp b/src/libs/gui/ControlPanel.hpp index b7a1c4b2..9dded79b 100644 --- a/src/libs/gui/ControlPanel.hpp +++ b/src/libs/gui/ControlPanel.hpp @@ -27,11 +27,7 @@ #include <libglademm/xml.h> #include <libglademm.h> #include <raul/Path.hpp> -#include "ControlGroups.hpp" - - -using std::vector; using std::string; using std::pair; -using std::cerr; using std::cout; using std::endl; +#include "Controls.hpp" namespace Ingen { namespace Client { class PortModel; @@ -56,7 +52,7 @@ public: void init(SharedPtr<NodeModel> node, uint32_t poly); - ControlGroup* find_port(const Path& path) const; + Control* find_port(const Path& path) const; void add_port(SharedPtr<PortModel> port); void remove_port(const Path& path); @@ -64,10 +60,10 @@ public: void enable_port(const Path& path); void disable_port(const Path& path); - size_t num_controls() const { return _controls.size(); } - pair<int,int> ideal_size() const { return _ideal_size; } + size_t num_controls() const { return _controls.size(); } + std::pair<int,int> ideal_size() const { return _ideal_size; } - // Callback for ControlGroup + // Callback for Control void value_changed(SharedPtr<PortModel> port_path, float val); private: @@ -78,14 +74,14 @@ private: bool _callback_enabled; - pair<int,int> _ideal_size; - - vector<ControlGroup*> _controls; - Gtk::VBox* _control_box; - Gtk::Box* _voice_control_box; - Gtk::RadioButton* _all_voices_radio; - Gtk::RadioButton* _specific_voice_radio; - Gtk::SpinButton* _voice_spinbutton; + std::pair<int,int> _ideal_size; + + std::vector<Control*> _controls; + Gtk::VBox* _control_box; + Gtk::Box* _voice_control_box; + Gtk::RadioButton* _all_voices_radio; + Gtk::RadioButton* _specific_voice_radio; + Gtk::SpinButton* _voice_spinbutton; }; |