summaryrefslogtreecommitdiffstats
path: root/src/gui/WindowFactory.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/WindowFactory.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/WindowFactory.hpp')
-rw-r--r--src/gui/WindowFactory.hpp13
1 files changed, 8 insertions, 5 deletions
diff --git a/src/gui/WindowFactory.hpp b/src/gui/WindowFactory.hpp
index 46445ffb..952c3db7 100644
--- a/src/gui/WindowFactory.hpp
+++ b/src/gui/WindowFactory.hpp
@@ -19,9 +19,11 @@
#define INGEN_GUI_WINDOWFACTORY_HPP
#include <map>
+
#include <gtkmm.h>
-#include "raul/SharedPtr.hpp"
+
#include "ingen/GraphObject.hpp"
+#include "raul/SharedPtr.hpp"
using namespace Ingen::Shared;
@@ -36,6 +38,7 @@ using Ingen::Client::ObjectModel;
namespace GUI {
+class App;
class LoadPatchWindow;
class LoadPluginWindow;
class LoadRemotePatchWindow;
@@ -55,7 +58,7 @@ class UploadPatchWindow;
*/
class WindowFactory {
public:
- WindowFactory();
+ WindowFactory(App& app);
~WindowFactory();
size_t num_open_patch_windows();
@@ -96,9 +99,9 @@ private:
bool remove_control_window(NodeControlWindow* win,
GdkEventAny* ignored);
- PatchWindowMap _patch_windows;
- ControlWindowMap _control_windows;
-
+ App& _app;
+ PatchWindowMap _patch_windows;
+ ControlWindowMap _control_windows;
LoadPluginWindow* _load_plugin_win;
LoadPatchWindow* _load_patch_win;
LoadRemotePatchWindow* _load_remote_patch_win;