Drove 'er home! Working monolothic Ingenuity (ie. in-process engine).

Countless bugfixes.


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

1 files changed, 0 insertions, 175 deletions

diff --git a/src/progs/ingenuity/Controller.cpp b/src/progs/ingenuity/Controller.cpp
deleted file mode 100644
index a007ece8..00000000
--- a/src/progs/ingenuity/Controller.cpp
+++ /dev/null
@@ -1,175 +0,0 @@
-/* This file is part of Ingen.  Copyright (C) 2006 Dave Robillard.
- * 
- * Ingen 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.
- * 
- * Ingen 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 "PatchModel.h"
-#include "PatchController.h"
-#include "OSCModelEngineInterface.h"
-#include "PatchLibrarian.h"
-#include "Controller.h"
-#include "Loader.h"
-#include "interface/ClientKey.h"
-
-namespace Ingenuity {
-
-
-/// Singleton instance	
-Controller* Controller::_instance = 0;
-
-
-Controller::Controller(const string& engine_url)
-: OSCModelEngineInterface(engine_url),
-  m_patch_librarian(new PatchLibrarian(this)),
-  m_loader(new Loader(m_patch_librarian))
-{
-	m_loader->launch();
-}
-
-
-Controller::~Controller()
-{
-	// FIXME
-	//if (is_attached()) {
-		unregister_client(ClientKey()); // FIXME
-		//detach();
-	//}
-
-	delete m_loader;
-	delete m_patch_librarian;
-}
-
-
-/** "Attach" to the Om engine.
- * See documentation OSCModelEngineInterface::attach.
- */
-void
-Controller::attach(int32_t ping_id)
-{
-	OSCModelEngineInterface::attach(ping_id, false);
-}
-
-/*
-void
-Controller::register_client_and_wait()
-{
-//	int id = get_next_request_id();
-//	set_wait_response_id(id);
-	OSCModelEngineInterface::register_client();
-//	wait_for_response();
-	cout << "[Controller] Registered with engine.  maybe.  fixme." << endl;
-}
-*/
-void   Controller::set_engine_url(const string& url) { _engine_url = url; }
-
-void
-Controller::create_node_from_model(const NodeModel* nm)
-{
-	//push_added_node(nm);
-	OSCModelEngineInterface::create_node_from_model(nm);
-	char temp_buf[16];
-	snprintf(temp_buf, 16, "%f", nm->x());
-	set_metadata(nm->path(), "module-x", temp_buf);
-	snprintf(temp_buf, 16, "%f", nm->y());
-	set_metadata(nm->path(), "module-y", temp_buf);
-}
-
-void
-Controller::create_patch_from_model(const PatchModel* pm)
-{ 
-	//push_added_patch(pm);
-
-	//int id = get_next_request_id();
-	//set_wait_response_id(id);
-	OSCModelEngineInterface::create_patch_from_model(pm);
-	if (pm->parent()) {
-	//	wait_for_response();
-		char temp_buf[16];
-		snprintf(temp_buf, 16, "%f", pm->x());
-		set_metadata(pm->path(), "module-x", temp_buf);
-		snprintf(temp_buf, 16, "%f", pm->y());
-		set_metadata(pm->path(), "module-y", temp_buf);
-	}
-	enable_patch(pm->path());
-}
-
-
-void
-Controller::set_patch_path(const string& path)
-{
-	m_patch_librarian->path(path);
-}
-
-
-/** Load patch in a seperate thread.
- * This will return immediately and the patch will be loaded in the background.
- * FIXME: merge parameter makes no sense, always true */
-void
-Controller::load_patch(PatchModel* model, bool wait, bool merge)
-{
-	//push_added_patch(model);
-	m_loader->load_patch(model, wait, merge);
-}
-
-
-/** Load patch in a seperate thread.
- * This will return immediately and the patch will be saved in the background. */
-void
-Controller::save_patch(PatchModel* model, const string& filename, bool recursive)
-{
-	m_loader->save_patch(model, filename, recursive);
-}
-
-
-#if 0
-/** Returns the added node with the given path and removes it from the cache.
- */
-NodeModel*
-Controller::yank_added_node(const string& path)
-{
-	NodeModel* nm = NULL;
-	
-	for (list<NodeModel*>::iterator i = m_added_nodes.begin(); i != m_added_nodes.end(); ++i) {
-		if ((*i)->path() == path) {
-			nm = *i;
-			m_added_nodes.erase(i);
-			break;
-		}
-	}
-
-	return nm;
-}
-
-
-/** Returns the added patch with the given path and removes it from the cache.
- */
-PatchModel*
-Controller::yank_added_patch(const string& path)
-{
-	PatchModel* pm = NULL;
-	
-	for (list<PatchModel*>::iterator i = m_added_patches.begin(); i != m_added_patches.end(); ++i) {
-		if ((*i)->path() == path) {
-			pm = *i;
-			m_added_patches.erase(i);
-			break;
-		}
-	}
-
-	return pm;
-}
-#endif
-
-} // namespace Ingenuity
-