summaryrefslogtreecommitdiffstats
path: root/src/gui/ControlPanel.hpp
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2011-10-22 03:08:06 +0000
committerDavid Robillard <d@drobilla.net>2011-10-22 03:08:06 +0000
commitac1d6d135bda8d739fdb8bf564f89c38b664c097 (patch)
treed750da79dd88b64ab2a88cca1651c2a5a240bd72 /src/gui/ControlPanel.hpp
parent143968e38cc2f058dd7c500e984904a39864d652 (diff)
downloadingen-ac1d6d135bda8d739fdb8bf564f89c38b664c097.tar.gz
ingen-ac1d6d135bda8d739fdb8bf564f89c38b664c097.tar.bz2
ingen-ac1d6d135bda8d739fdb8bf564f89c38b664c097.zip
De-singleton-ify GUI.
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@3584 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/gui/ControlPanel.hpp')
-rw-r--r--src/gui/ControlPanel.hpp11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/gui/ControlPanel.hpp b/src/gui/ControlPanel.hpp
index a657b8d2..3e5aa8b6 100644
--- a/src/gui/ControlPanel.hpp
+++ b/src/gui/ControlPanel.hpp
@@ -38,6 +38,8 @@ using namespace Ingen::Client;
namespace GUI {
+class App;
+
/** A group of controls for a node (or patch).
*
* Used by both NodeControlWindow and the main window (for patch controls).
@@ -50,7 +52,7 @@ public:
const Glib::RefPtr<Gtk::Builder>& xml);
virtual ~ControlPanel();
- void init(SharedPtr<const NodeModel> node, uint32_t poly);
+ void init(App& app, SharedPtr<const NodeModel> node, uint32_t poly);
Control* find_port(const Raul::Path& path) const;
@@ -72,12 +74,11 @@ public:
}
private:
- bool _callback_enabled;
-
- std::pair<int,int> _ideal_size;
-
+ App* _app;
+ std::pair<int,int> _ideal_size;
std::vector<Control*> _controls;
Gtk::VBox* _control_box;
+ bool _callback_enabled;
};
} // namespace GUI