Minor cleanups, removed braindead centralized singleton instance file

git-svn-id: http://svn.drobilla.net/lad/ingen@86 a436a847-0d15-0410-975c-d299462d15a1

4 files changed, 9 insertions, 28 deletions

diff --git a/src/progs/ingenuity/App.cpp b/src/progs/ingenuity/App.cpp
index 2b506a97..60fa4c7f 100644
--- a/src/progs/ingenuity/App.cpp
+++ b/src/progs/ingenuity/App.cpp
@@ -55,6 +55,11 @@ namespace OmGtk {
 
 class OmPort;
 
+
+/// Singleton instance
+App* App::_instance = 0;
+
+
 App::App()
 : m_configuration(new Configuration()),
   m_about_dialog(NULL),
diff --git a/src/progs/ingenuity/Controller.cpp b/src/progs/ingenuity/Controller.cpp
index 9f2a4cfe..9fa8b2f2 100644
--- a/src/progs/ingenuity/Controller.cpp
+++ b/src/progs/ingenuity/Controller.cpp
@@ -26,6 +26,10 @@
 namespace OmGtk {
 
 
+/// Singleton instance	
+Controller* Controller::_instance = 0;
+
+
 Controller::Controller(const string& engine_url)
 : OSCModelEngineInterface(engine_url),
   m_patch_librarian(new PatchLibrarian(this)),
diff --git a/src/progs/ingenuity/Makefile.am b/src/progs/ingenuity/Makefile.am
index 5b45c54a..aa04d3fb 100644
--- a/src/progs/ingenuity/Makefile.am
+++ b/src/progs/ingenuity/Makefile.am
@@ -16,7 +16,6 @@ ingenuity_SOURCES = \
 	cmdline.h \
 	cmdline.c \
 	main.cpp \
-	singletons.cpp \
 	ConnectWindow.h \
 	ConnectWindow.cpp \
 	App.h \
diff --git a/src/progs/ingenuity/singletons.cpp b/src/progs/ingenuity/singletons.cpp
deleted file mode 100644
index e3d113dc..00000000
--- a/src/progs/ingenuity/singletons.cpp
+++ /dev/null
@@ -1,27 +0,0 @@
-/* This file is part of Om.  Copyright (C) 2006 Dave Robillard.
- * 
- * Om is free software; you can redistribute it and/or modify it under the
- * terms of the GNU General Public License as published by the Free Software
- * Foundation; either version 2 of the License, or (at your option) any later
- * version.
- * 
- * Om is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for details.
- * 
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#include "App.h"
-#include "Store.h"
-#include "Controller.h"
-
-namespace OmGtk
-{
-	App*                App::_instance                = 0;
-	Store*              Store::_instance              = 0;
-	Controller*         Controller::_instance         = 0;
-}
-