Made engine, serialisation, client library, and GUI all dynamically loaded modules.

Combined all executables into a single "ingen" program which can do everything.


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

1 files changed, 0 insertions, 427 deletions

diff --git a/src/progs/ingenuity/ConnectWindow.cpp b/src/progs/ingenuity/ConnectWindow.cpp
deleted file mode 100644
index 322750ea..00000000
--- a/src/progs/ingenuity/ConnectWindow.cpp
+++ /dev/null
@@ -1,427 +0,0 @@
-/* This file is part of Ingen.
- * Copyright (C) 2007 Dave Robillard <http://drobilla.net>
- * 
- * 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 <string>
-#include <time.h>
-#include <sys/time.h>
-#include <stdlib.h>
-#include <sys/time.h>
-#include <sys/resource.h>
-#include <raul/Process.h>
-#include "config.h"
-#include "interface/ClientKey.h"
-#include "interface/EngineInterface.h"
-#include "engine/tuning.h"
-#include "engine/Engine.h"
-#include "engine/DirectResponder.h"
-#include "engine/QueuedEngineInterface.h"
-#include "client/OSCClientReceiver.h"
-#include "client/OSCEngineSender.h"
-#include "client/ThreadedSigClientInterface.h"
-#include "client/Store.h"
-#include "client/PatchModel.h"
-#include "module/Module.h"
-#include "App.h"
-#include "WindowFactory.h"
-#include "ConnectWindow.h"
-using Ingen::QueuedEngineInterface;
-using Ingen::Client::ThreadedSigClientInterface;
-
-namespace Ingenuity {
-
-
-// Paste together some interfaces to get the combination we want
-
-
-struct OSCSigEmitter : public OSCClientReceiver, public ThreadedSigClientInterface {
-	OSCSigEmitter(size_t queue_size, int listen_port)
-		: Ingen::Shared::ClientInterface()
-		, OSCClientReceiver(listen_port)
-		, ThreadedSigClientInterface(queue_size)
-	{
-	}
-};
-
-
-// ConnectWindow
-
-
-ConnectWindow::ConnectWindow(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& xml)
-	: Gtk::Dialog(cobject)
-	, _mode(CONNECT_REMOTE)
-	, _ping_id(-1)
-	, _attached(false)
-	, _connect_stage(0)
-	, _new_engine(NULL)
-	, _new_queued_engine_interface(NULL)
-{
-	xml->get_widget("connect_icon",                 _icon);
-	xml->get_widget("connect_progress_bar",         _progress_bar);
-	xml->get_widget("connect_progress_label",       _progress_label);
-	xml->get_widget("connect_server_radiobutton",   _server_radio);
-	xml->get_widget("connect_url_entry",            _url_entry);
-	xml->get_widget("connect_launch_radiobutton",   _launch_radio);
-	xml->get_widget("connect_port_spinbutton",      _port_spinbutton);
-	xml->get_widget("connect_internal_radiobutton", _internal_radio);
-	xml->get_widget("connect_disconnect_button",    _disconnect_button);
-	xml->get_widget("connect_connect_button",       _connect_button);
-	xml->get_widget("connect_quit_button",          _quit_button);
-
-	_server_radio->signal_toggled().connect(sigc::mem_fun(this, &ConnectWindow::server_toggled));
-	_launch_radio->signal_toggled().connect(sigc::mem_fun(this, &ConnectWindow::launch_toggled));
-	_internal_radio->signal_clicked().connect(sigc::mem_fun(this, &ConnectWindow::internal_toggled));
-	_disconnect_button->signal_clicked().connect(sigc::mem_fun(this, &ConnectWindow::disconnect));
-	_connect_button->signal_clicked().connect(sigc::mem_fun(this, &ConnectWindow::connect));
-	_quit_button->signal_clicked().connect(sigc::mem_fun(this, &ConnectWindow::quit));
-
-	_engine_module = Ingen::Shared::load_module("ingen_engine");
-
-	if (!_engine_module) {
-		cerr << "Unable to load ingen_engine module, internal engine unavailable." << endl;
-		cerr << "If you are running from the source tree, run ingenuity_dev." << endl;
-	}
-
-	bool found1 = _engine_module->get_symbol("new_engine", (void*&)_new_engine);
-	bool found2 = _engine_module->get_symbol("new_queued_engine_interface",
-			(void*&)_new_queued_engine_interface);
-
-	if (!found1 || !found2) {
-		cerr << "Unable to find module entry point, internal engine unavailable." << endl;
-		_engine_module.reset();
-	}
-}
-
-
-void
-ConnectWindow::start()
-{
-	resize(100, 100);
-	init();
-	show();
-	connect();
-}
-
-
-void
-ConnectWindow::init()
-{
-	_icon->set(Gtk::Stock::DISCONNECT, Gtk::ICON_SIZE_LARGE_TOOLBAR);
-	_progress_bar->set_fraction(0.0);
-	_url_entry->set_sensitive(true);
-	_connect_button->set_sensitive(true);
-	_disconnect_button->set_sensitive(false);
-	_port_spinbutton->set_sensitive(false);
-	_launch_radio->set_sensitive(true);
-	if (_new_engine)
-		_internal_radio->set_sensitive(true);
-	else
-		_internal_radio->set_sensitive(false);
-	server_toggled();
-		
-	_progress_label->set_text(string("Disconnected"));
-}
-
-
-/** Launch (if applicable) and connect to the Engine.
- *
- * This will create the EngineInterface and ClientInterface and initialize
- * the App with them.
- */
-void
-ConnectWindow::connect()
-{
-	assert(!_attached);
-	assert(!App::instance().engine());
-	assert(!App::instance().client());
-
-	_connect_button->set_sensitive(false);
-	_disconnect_button->set_label("gtk-cancel");
-	_disconnect_button->set_sensitive(true);
-
-	_connect_stage = 0;
-
-	if (_mode == CONNECT_REMOTE) {
-		SharedPtr<EngineInterface> engine(
-			new OSCEngineSender(_url_entry->get_text()));
-
-		OSCSigEmitter* ose = new OSCSigEmitter(1024, 16181); // FIXME: args
-		SharedPtr<SigClientInterface> client(ose);
-		App::instance().attach(engine, client);
-
-		Glib::signal_timeout().connect(
-			sigc::mem_fun(this, &ConnectWindow::gtk_callback), 100);
-		
-		Glib::signal_timeout().connect(
-			sigc::mem_fun(ose, &ThreadedSigClientInterface::emit_signals), 2, G_PRIORITY_HIGH_IDLE);
-
-	} else if (_mode == LAUNCH_REMOTE) {
-
-		int port = _port_spinbutton->get_value_as_int();
-		char port_str[6];
-		snprintf(port_str, 6, "%u", port);
-		const string cmd = string("ingen --port=").append(port_str);
-
-		if (Raul::Process::launch(cmd)) {
-		SharedPtr<EngineInterface> engine(
-				new OSCEngineSender(string("osc.udp://localhost:").append(port_str)));
-
-		OSCSigEmitter* ose = new OSCSigEmitter(1024, 16181); // FIXME: args
-		SharedPtr<SigClientInterface> client(ose);
-		App::instance().attach(engine, client);
-
-		Glib::signal_timeout().connect(
-				sigc::mem_fun(this, &ConnectWindow::gtk_callback), 100);
-
-		Glib::signal_timeout().connect(
-				sigc::mem_fun(ose, &ThreadedSigClientInterface::emit_signals),
-				2, G_PRIORITY_HIGH_IDLE);
-		} else {
-			cerr << "Failed to launch ingen process." << endl;
-		}
-
-	} else if (_mode == INTERNAL) {
-		assert(_new_engine);
-		SharedPtr<Ingen::Engine> engine(_new_engine());
-		engine->start_jack_driver();
-		
-		assert(_new_queued_engine_interface);
-		SharedPtr<Ingen::QueuedEngineInterface> engine_interface(_new_queued_engine_interface(*engine.get()));
-
-		ThreadedSigClientInterface* tsci = new ThreadedSigClientInterface(Ingen::event_queue_size);
-		SharedPtr<SigClientInterface> client(tsci);
-		
-		App::instance().attach(engine_interface, client);
-
-		engine_interface->set_responder(SharedPtr<Ingen::Responder>(new Ingen::DirectResponder(client, 1)));
-
-		engine->set_event_source(engine_interface);
-
-		engine->activate();
-
-		Glib::signal_timeout().connect(
-			sigc::mem_fun(engine.get(), &Ingen::Engine::main_iteration), 1000);
-		
-		Glib::signal_timeout().connect(
-			sigc::mem_fun(this, &ConnectWindow::gtk_callback), 100);
-		
-		Glib::signal_timeout().connect(
-			sigc::mem_fun(tsci, &ThreadedSigClientInterface::emit_signals), 2, G_PRIORITY_HIGH_IDLE);
-	}
-}
-
-
-void
-ConnectWindow::disconnect()
-{
-	_connect_stage = -1;
-	_attached = false;
-
-	_progress_bar->set_fraction(0.0);
-	_connect_button->set_sensitive(false);
-	_disconnect_button->set_sensitive(false);
-
-	App::instance().detach();
-
-	init();
-	
-	_connect_button->set_sensitive(true);
-	_disconnect_button->set_sensitive(false);
-}
-
-
-void
-ConnectWindow::quit()
-{
-	if (_attached) {
-		Gtk::MessageDialog d(*this, "This will exit Ingenuity, but the engine will "
-			"remain running (if it is remote).\n\nAre you sure you want to quit?",
-			true, Gtk::MESSAGE_WARNING, Gtk::BUTTONS_NONE, true);
-			d.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
-			d.add_button(Gtk::Stock::QUIT, Gtk::RESPONSE_CLOSE);
-		int ret = d.run();
-		if (ret == Gtk::RESPONSE_CLOSE)
-			Gtk::Main::quit();
-	} else {
-		Gtk::Main::quit();
-	}
-}
-
-
-void
-ConnectWindow::server_toggled()
-{
-	_url_entry->set_sensitive(true);
-	_port_spinbutton->set_sensitive(false);
-	_mode = CONNECT_REMOTE;
-}
-
-
-void
-ConnectWindow::launch_toggled()
-{
-	_url_entry->set_sensitive(false);
-	_port_spinbutton->set_sensitive(true);
-	_mode = LAUNCH_REMOTE;
-}
-
-
-void
-ConnectWindow::internal_toggled()
-{
-	_url_entry->set_sensitive(false);
-	_port_spinbutton->set_sensitive(false);
-	_mode = INTERNAL;
-}
-
-
-bool
-ConnectWindow::gtk_callback()
-{
-	/* This isn't very nice (isn't threaded), but better than no dialog at 
-	 * all like before :)
-	 */
-	
-	// Timing stuff for repeated attach attempts
-	timeval now;
-	gettimeofday(&now, NULL);
-	static timeval last = now;
-	
-	/* Connecting to engine */
-	if (_connect_stage == 0) {
-
-		assert(!_attached);
-		assert(App::instance().engine());
-		assert(App::instance().client());
-
-		// FIXME
-		//assert(!App::instance().engine()->is_attached());
-		_progress_label->set_text("Connecting to engine...");
-		present();
-
-		App::instance().client()->response_sig.connect(sigc::mem_fun(this, &ConnectWindow::response_received));
-
-		_ping_id = rand();
-		while (_ping_id == -1)
-			_ping_id = rand();
-
-		App::instance().engine()->set_next_response_id(_ping_id);
-		App::instance().engine()->ping();
-		++_connect_stage;
-
-
-	} else if (_connect_stage == 1) {
-		if (_attached) {
-			App::instance().engine()->activate();
-			++_connect_stage;
-		} else {
-			const float ms_since_last = (now.tv_sec - last.tv_sec) * 1000.0f +
-				(now.tv_usec - last.tv_usec) * 0.001f;
-			if (ms_since_last > 1000) {
-				App::instance().engine()->set_next_response_id(_ping_id);
-				App::instance().engine()->ping();
-				last = now;
-			}
-		}
-	} else if (_connect_stage == 2) {
-		_progress_label->set_text(string("Registering as client..."));
-		//App::instance().engine()->register_client(App::instance().engine()->client_hooks());
-		// FIXME
-		//auto_ptr<ClientInterface> client(new ThreadedSigClientInterface();
-		App::instance().engine()->register_client(ClientKey(), App::instance().client());
-		App::instance().engine()->load_plugins();
-		++_connect_stage;
-	} else if (_connect_stage == 3) {
-		// Register idle callback to process events and whatnot
-		// (Gtk refreshes at priority G_PRIORITY_HIGH_IDLE+20)
-		/*Glib::signal_timeout().connect(
-			sigc::mem_fun(this, &App::idle_callback), 100, G_PRIORITY_HIGH_IDLE);*/
-		//Glib::signal_idle().connect(sigc::mem_fun(this, &App::idle_callback));
-	/*	Glib::signal_timeout().connect(
-			sigc::mem_fun((ThreadedSigClientInterface*)_client, &ThreadedSigClientInterface::emit_signals),
-			5, G_PRIORITY_DEFAULT_IDLE);*/
-		
-		_progress_label->set_text(string("Requesting plugins..."));
-		App::instance().engine()->request_plugins();
-		++_connect_stage;
-	} else if (_connect_stage == 4) {
-		// Wait for first plugins message
-		if (App::instance().store()->plugins().size() > 0) {
-			_progress_label->set_text(string("Receiving plugins..."));
-			++_connect_stage;
-		}
-	} else if (_connect_stage == 5) {
-		// FIXME
-		/*if (App::instance().store().plugins().size() < _client->num_plugins()) {
-			static char buf[32];
-			snprintf(buf, 32, "%zu/%zu", App::instance().store().plugins().size(),
-				ThreadedSigClientInterface::instance()->num_plugins());
-			_progress_bar->set_text(Glib::ustring(buf));
-			_progress_bar->set_fraction(
-				App::instance().store().plugins().size() / (double)_client->num_plugins());
-		} else {*/
-			_progress_bar->set_text("");
-			++_connect_stage;
-		//}
-	} else if (_connect_stage == 6) {
-		_progress_label->set_text(string("Waiting for root patch..."));
-		App::instance().engine()->request_all_objects();
-		++_connect_stage;
-	} else if (_connect_stage == 7) {
-		if (App::instance().store()->objects().size() > 0) {
-			SharedPtr<PatchModel> root = PtrCast<PatchModel>(App::instance().store()->object("/"));
-			assert(root);
-			App::instance().window_factory()->present_patch(root);
-			++_connect_stage;
-		}
-	} else if (_connect_stage == 8) {
-		_progress_label->set_text("Connected to engine");
-		++_connect_stage;
-	} else if (_connect_stage == 9) {
-		++_connect_stage;
-		hide();
-	} else if (_connect_stage == 10) {
-		_icon->set(Gtk::Stock::CONNECT, Gtk::ICON_SIZE_LARGE_TOOLBAR);
-		_progress_bar->set_fraction(1.0);
-		_url_entry->set_sensitive(false);
-		_connect_button->set_sensitive(false);
-		_disconnect_button->set_label("gtk-disconnect");
-		_disconnect_button->set_sensitive(true);
-		_port_spinbutton->set_sensitive(false);
-		_launch_radio->set_sensitive(false);
-		_internal_radio->set_sensitive(false);
-		_connect_stage = 0; // set ourselves up for next time (if there is one)
-		return false; // deregister this callback
-	}
-	
-	if (_connect_stage != 5) // yeah, ew
-		_progress_bar->pulse();
-	
-	if (_connect_stage == -1) { // we were cancelled
-		_icon->set(Gtk::Stock::DISCONNECT, Gtk::ICON_SIZE_LARGE_TOOLBAR);
-		_progress_bar->set_fraction(0.0);
-		_connect_button->set_sensitive(true);
-		_disconnect_button->set_sensitive(false);
-		_disconnect_button->set_label("gtk-disconnect");
-		_progress_label->set_text(string("Disconnected"));
-		return false;
-	} else {
-		return true;
-	}
-}
-
-
-} // namespace Ingenuity