Removed globals (Om.h)

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

5 files changed, 7 insertions, 36 deletions

diff --git a/src/progs/demolition/demolition.cpp b/src/progs/demolition/demolition.cpp
index 93d15575..cc2de60c 100644
--- a/src/progs/demolition/demolition.cpp
+++ b/src/progs/demolition/demolition.cpp
@@ -100,7 +100,7 @@ main(int argc, char** argv)
 	
 	while (true) {
 		do_something();
-		usleep(100000);
+		usleep(10000);
 	}
 	
 	sleep(2);
diff --git a/src/progs/ingenuity/NodeController.cpp b/src/progs/ingenuity/NodeController.cpp
index 3fcdcdd6..0ed2aaab 100644
--- a/src/progs/ingenuity/NodeController.cpp
+++ b/src/progs/ingenuity/NodeController.cpp
@@ -204,7 +204,6 @@ NodeController::add_port(CountedPtr<PortModel> pm)
 	// FIXME: leak
 	PortController* pc = new PortController(pm);
 	assert(pm->controller() == pc);
-	//pc->add_to_store();
 	
 	if (m_module != NULL) {
 		pc->create_port(m_module);
diff --git a/src/progs/ingenuity/PatchController.cpp b/src/progs/ingenuity/PatchController.cpp
index ddcb4608..e4a58bcc 100644
--- a/src/progs/ingenuity/PatchController.cpp
+++ b/src/progs/ingenuity/PatchController.cpp
@@ -104,20 +104,6 @@ PatchController::~PatchController()
 	}
 }
 
-/*
-void
-PatchController::add_to_store()
-{
-	Store::instance().add_object(this);
-}
-
-
-void
-PatchController::remove_from_store()
-{
-	Store::instance().remove_object(this);
-}
-*/
 
 void
 PatchController::clear()
diff --git a/src/progs/ingenuity/PortController.cpp b/src/progs/ingenuity/PortController.cpp
index c7bb4e1f..6fb13543 100644
--- a/src/progs/ingenuity/PortController.cpp
+++ b/src/progs/ingenuity/PortController.cpp
@@ -38,20 +38,6 @@ PortController::PortController(CountedPtr<PortModel> model)
 	model->set_controller(this);
 }
 
-/*
-void
-PortController::add_to_store()
-{
-	Store::instance().add_object(this);
-}
-
-
-void
-PortController::remove_from_store()
-{
-	Store::instance().remove_object(this);
-}
-*/
 
 void
 PortController::destroy()
diff --git a/src/progs/server/main.cpp b/src/progs/server/main.cpp
index fdd39c53..2429462a 100644
--- a/src/progs/server/main.cpp
+++ b/src/progs/server/main.cpp
@@ -20,8 +20,7 @@
 #include "config.h"
 #include "util.h"
 #include "cmdline.h"
-#include "Om.h"
-#include "OmApp.h"
+#include "Ingen.h"
 #ifdef HAVE_LASH
 #include "LashDriver.h"
 #endif
@@ -40,7 +39,7 @@ catch_int(int)
 	signal(SIGTERM, catch_int);
 
 	std::cout << "[Main] Om interrupted." << std::endl;
-	Om::om->quit();
+	Om::Ingen::instance().quit();
 }
 
 
@@ -133,19 +132,20 @@ main(int argc, char** argv)
 
 		Om::set_denormal_flags();
 
-		Om::om = new Om::OmApp(args_info.port_arg);
+		Om::Ingen::instantiate(args_info.port_arg);
 
 #ifdef HAVE_LASH
 		Om::lash_driver = new Om::LashDriver(Om::om, lash_args);
 #endif
 
-		Om::om->main();
+		Om::Ingen::instance().main();
 
 #ifdef HAVE_LASH
 		delete Om::lash_driver;
 #endif
 
-		delete Om::om;
+		// FIXME: leak
+		//delete Om::om;
 	}
 	
 	return ret;