8 files changed, 1 insertions, 455 deletions

diff --git a/src/libs/gui/DSSIController.cpp b/src/libs/gui/DSSIController.cpp
deleted file mode 100644
index 9bb037ba..00000000
--- a/src/libs/gui/DSSIController.cpp
+++ /dev/null
@@ -1,280 +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 "DSSIController.hpp"
-#include <iomanip>
-#include <sstream>
-#include <dirent.h>
-#include <unistd.h>
-#include <sys/stat.h>
-#include "interface/EngineInterface.hpp"
-#include "client/NodeModel.hpp"
-#include "App.hpp"
-#include "DSSIModule.hpp"
-
-namespace Ingen {
-namespace GUI {
-
-
-DSSIController::DSSIController(SharedPtr<NodeModel> model)
-: _banks_dirty(true)
-{
-#if 0
-	assert(model->plugin()->type() == PluginModel::DSSI);
-	Gtk::Menu::MenuList& items = _menu.items();
-	items[0].property_sensitive() = true; // "Show Control Window" item
-	
-	Gtk::Menu_Helpers::MenuElem program_elem("Select Program", _program_menu);
-	items.push_front(program_elem);
-	_program_menu_item = program_elem.get_child();
-	_program_menu_item->set_sensitive(false);
-	
-	items.push_front(Gtk::Menu_Helpers::MenuElem("Show Plugin GUI",
-		sigc::mem_fun(this, &DSSIController::show_gui)));
-#endif
-}
-
-void
-DSSIController::program_add(int bank, int program, const string& name)
-{
-	cerr << "FIXME: DSSI add program\n";
-	//node_model()->add_program(bank, program, name);
-	//m_banks_dirty = true;
-}
-
-
-void
-DSSIController::program_remove(int bank, int program)
-{
-	cerr << "FIXME: DSSI add program\n";
-	//node_model()->remove_program(bank, program);
-	//m_banks_dirty = true;
-}
-
-/** Trivial wrapper of attempt_to_show_gui for libsigc
- */
-void
-DSSIController::show_gui()
-{
-	attempt_to_show_gui();
-}
-
-
-void
-DSSIController::update_program_menu()
-{
-	cerr << "FIXME: Program menu\n";
-#if 0
-	_program_menu.items().clear();
-	
-	const map<int, map<int, string> >& banks = node_model()->get_programs();
-	std::ostringstream oss;
-	
-	map<int, map<int, string> >::const_iterator i;
-	for (i = banks.begin(); i != banks.end(); ++i) {
-		Gtk::Menu* bank_menu;
-		if (banks.size() > 1)
-			bank_menu = manage(new Gtk::Menu());
-		else
-			bank_menu = &_program_menu;
-		map<int, string>::const_iterator j;
-		for (j = i->second.begin(); j != i->second.end(); ++j) {
-			oss.str("");
-			oss << std::setw(3) << std::setfill('0')
-				<< j->first << ' ' << j->second;
-			sigc::slot<void> slt = bind(
-				bind(sigc::mem_fun(*this, &DSSIController::send_program_change),
-					j->first), i->first);
-			bank_menu->items().push_back(
-				Gtk::Menu_Helpers::MenuElem(oss.str(), slt));
-		}
-		if (banks.size() > 1) {
-			oss.str("");
-			oss << "Bank " << i->first;
-			_program_menu.items().push_back(
-				Gtk::Menu_Helpers::MenuElem(oss.str(), *bank_menu));
-		}
-	}
-
-	// Disable the program menu if there are no programs
-	if (banks.size() == 0)
-		_program_menu_item->set_sensitive(false);
-	else
-		_program_menu_item->set_sensitive(true);
-	
-	_banks_dirty = false;
-#endif
-}
-
-
-void
-DSSIController::send_program_change(int bank, int program)
-{
-	//App::instance().engine()->set_program(node_model()->path(), bank, program);
-}
-
-
-/** Attempt to show the DSSI GUI for this plugin.
- *
- * Returns whether or not GUI was successfully loaded/shown.
- */
-bool
-DSSIController::attempt_to_show_gui()
-{
-	cerr << "FIXME: DSSI GUI" << endl;
-#if 0
-	// Shamelessley "inspired by" jack-dssi-host
-	// Copyright 2004 Chris Cannam, Steve Harris and Sean Bolton.
-
-	const bool verbose = false;
-
-	string engine_url = App::instance().engine()->engine_url();
-	// Hack off last character if it's a /
-	if (engine_url[engine_url.length()-1] == '/')
-		engine_url = engine_url.substr(0, engine_url.length()-1);
-	
-	const char*   dllName   = node_model()->plugin()->lib_name().c_str();
-	const char*   label     = node_model()->plugin()->plug_label().c_str();
-	const char*   myName    = "ingenuity";
-	const string& oscUrl    = engine_url + "/dssi" + node_model()->path();
-
-	struct dirent* entry = NULL;
-	char*          dllBase = strdup(dllName);
-	char*          subpath = NULL;
-	DIR*           subdir = NULL;
-	char*          filename = NULL;
-	struct stat    buf;
-	int            fuzzy = 0;
-
-	char* env_dssi_path = getenv("DSSI_PATH");
-	string dssi_path;
-	if (!env_dssi_path) {
-	 	cerr << "DSSI_PATH is empty.  Assuming /usr/lib/dssi:/usr/local/lib/dssi." << endl;
-		dssi_path = "/usr/lib/dssi:/usr/local/lib/dssi";
-	} else {
-		dssi_path = env_dssi_path;
-	}
-
-	if (strlen(dllBase) > 3 && !strcasecmp(dllBase + strlen(dllBase) - 3, ".so")) {
-		dllBase[strlen(dllBase) - 3] = '\0';
-	}
-
-
-	// This is pretty nasty, it loops through the path, even if the dllBase is absolute
-	while (dssi_path != "") {
-		string directory = dssi_path.substr(0, dssi_path.find(':'));
-		if (dssi_path.find(':') != string::npos)
-			dssi_path = dssi_path.substr(dssi_path.find(':')+1);
-		else
-			dssi_path = "";
-		
-		if (*dllBase == '/') {
-			subpath = strdup(dllBase);
-		} else {
-			subpath = (char*)malloc(strlen(directory.c_str()) + strlen(dllBase) + 2);
-			sprintf(subpath, "%s/%s", directory.c_str(), dllBase);
-		}
-	
-		for (fuzzy = 0; fuzzy <= 1; ++fuzzy) {
-	
-			if (!(subdir = opendir(subpath))) {
-				if (verbose) {
-					fprintf(stderr, "%s: can't open plugin GUI directory \"%s\"\n", myName, subpath);
-				}
-				break;
-			}
-	
-			while ((entry = readdir(subdir))) {
-	
-				if (entry->d_name[0] == '.')
-					continue;
-				if (!strchr(entry->d_name, '_'))
-					continue;
-	
-				if (fuzzy) {
-					if (verbose) {
-						fprintf(stderr, "checking %s against %s\n", entry->d_name, dllBase);
-					}
-					if (strncmp(entry->d_name, dllBase, strlen(dllBase)))
-						continue;
-				} else {
-					if (verbose) {
-						fprintf(stderr, "checking %s against %s\n", entry->d_name, label);
-					}
-					if (strncmp(entry->d_name, label, strlen(label)))
-						continue;
-				}
-	
-				filename = (char*)malloc(strlen(subpath) + strlen(entry->d_name) + 2);
-				sprintf(filename, "%s/%s", subpath, entry->d_name);
-	
-				if (stat(filename, &buf)) {
-					perror("stat failed");
-					free(filename);
-					continue;
-				}
-	
-				if ((S_ISREG(buf.st_mode) || S_ISLNK(buf.st_mode)) &&
-					(buf.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH))) {
-	
-					if (verbose) {
-						fprintf(stderr, "%s: trying to execute GUI at \"%s\"\n",
-								myName, filename);
-					}
-	
-					if (fork() == 0) {
-						execlp(filename, filename, oscUrl.c_str(), dllName, label,
-							node_model()->name().c_str(), 0);
-						perror("exec failed");
-						exit(1);
-					}
-	
-					free(filename);
-					free(subpath);
-					free(dllBase);
-					return true;
-				}
-	
-				free(filename);
-			}
-		}
-	}
-	
-	cerr << "Unable to launch DSSI GUI for " << node_model()->path() << endl;
-	
-	free(subpath);
-	free(dllBase);
-#endif
-	return false;
-}
-
-
-void
-DSSIController::show_menu(GdkEventButton* event)
-{
-#if 0
-	if (_banks_dirty)
-		update_program_menu();
-
-	NodeController::show_menu(event);
-#endif
-}
-
-
-} // namespace GUI
-} // namespace Ingen
-
diff --git a/src/libs/gui/DSSIController.hpp b/src/libs/gui/DSSIController.hpp
deleted file mode 100644
index 7d6e0c97..00000000
--- a/src/libs/gui/DSSIController.hpp
+++ /dev/null
@@ -1,77 +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
- */
-
-#ifndef DSSICONTROLLER_H
-#define DSSICONTROLLER_H
-
-#include <string>
-#include <gtkmm.h>
-#include <raul/Path.hpp>
-#include "client/NodeModel.hpp"
-
-using std::string;
-using namespace Ingen::Client;
-
-namespace Ingen { namespace Client {
-	class MetadataModel;
-	class NodeModel;
-	class PortModel;
-} }
-
-namespace Ingen {
-namespace GUI {
-
-class NodeControlWindow;
-
-
-/* Controller for a DSSI node.
- *
- * FIXME: legacy cruft.  move this code to the appropriate places and nuke
- * this class.
- *
- * \ingroup GUI
- */
-class DSSIController
-{
-public:
-	DSSIController(SharedPtr<NodeModel> model);
-
-	virtual ~DSSIController() {}
-	
-	void show_gui();
-	bool attempt_to_show_gui();
-	void program_add(int bank, int program, const string& name);
-	void program_remove(int bank, int program);
-	
-	void send_program_change(int bank, int program);
-	
-	void show_menu(GdkEventButton* event);
-
-private:
-	void update_program_menu();
-	
-	Gtk::Menu                   _program_menu;
-	Glib::RefPtr<Gtk::MenuItem> _program_menu_item;
-	
-	bool _banks_dirty;
-};
-
-
-} // namespace GUI
-} // namespace Ingen
-
-#endif // DSSICONTROLLER_H
diff --git a/src/libs/gui/DSSIModule.cpp b/src/libs/gui/DSSIModule.cpp
deleted file mode 100644
index 84058100..00000000
--- a/src/libs/gui/DSSIModule.cpp
+++ /dev/null
@@ -1,43 +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 "DSSIModule.hpp"
-#include "DSSIController.hpp"
-
-namespace Ingen {
-namespace GUI {
-
-
-DSSIModule::DSSIModule(boost::shared_ptr<PatchCanvas> canvas, SharedPtr<NodeModel> node)
-: NodeModule(canvas, node)
-{
-}
-
-
-void
-DSSIModule::on_double_click(GdkEventButton* ev)
-{
-	/*
-	DSSIController* dc = dynamic_cast<DSSIController*>(_node);
-	if (!dc || ! dc->attempt_to_show_gui())
-		show_control_window();
-	*/
-}
-
-
-} // namespace GUI
-} // namespace Ingen
diff --git a/src/libs/gui/DSSIModule.hpp b/src/libs/gui/DSSIModule.hpp
deleted file mode 100644
index 76824bdc..00000000
--- a/src/libs/gui/DSSIModule.hpp
+++ /dev/null
@@ -1,46 +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
- */
-
-#ifndef DSSIMODULE_H
-#define DSSIMODULE_H
-
-#include "NodeModule.hpp"
-
-namespace Ingen {
-namespace GUI {
-
-class DSSIController;
-
-/* Module for a DSSI node.
- *
- * \ingroup GUI
- */
-class DSSIModule : public NodeModule
-{
-public:
-	DSSIModule(boost::shared_ptr<PatchCanvas> canvas, SharedPtr<NodeModel> node);
-	virtual ~DSSIModule() {}
-
-	void on_double_click(GdkEventButton* ev);
-};
-
-
-} // namespace GUI
-} // namespace Ingen
-
-#endif // DSSIMODULE_H
-
diff --git a/src/libs/gui/LoadPluginWindow.cpp b/src/libs/gui/LoadPluginWindow.cpp
index 9aaed171..6d698f94 100644
--- a/src/libs/gui/LoadPluginWindow.cpp
+++ b/src/libs/gui/LoadPluginWindow.cpp
@@ -224,8 +224,6 @@ LoadPluginWindow::set_plugins(const Raul::Table<string, SharedPtr<PluginModel> >
 			row[_plugins_columns._col_type] = "Internal";
 		else if (!strcmp(plugin->type_uri(), "ingen:LV2"))
 			row[_plugins_columns._col_type] = "LV2";
-		else if (!strcmp(plugin->type_uri(), "ingen:DSSI"))
-			row[_plugins_columns._col_type] = "DSSI";
 		else if (!strcmp(plugin->type_uri(), "ingen:LADSPA"))
 			row[_plugins_columns._col_type] = "LADSPA";
 		else
diff --git a/src/libs/gui/Makefile.am b/src/libs/gui/Makefile.am
index a1e070cd..d0d07fd8 100644
--- a/src/libs/gui/Makefile.am
+++ b/src/libs/gui/Makefile.am
@@ -46,10 +46,6 @@ libingen_gui_la_SOURCES = \
 	ControlGroups.hpp \
 	ControlPanel.cpp \
 	ControlPanel.hpp \
-	DSSIController.cpp \
-	DSSIController.hpp \
-	DSSIModule.cpp \
-	DSSIModule.hpp \
 	GladeFactory.cpp \
 	GladeFactory.hpp \
 	LoadPatchWindow.cpp \
diff --git a/src/libs/gui/NodeModule.hpp b/src/libs/gui/NodeModule.hpp
index cf4bff9e..32e9220d 100644
--- a/src/libs/gui/NodeModule.hpp
+++ b/src/libs/gui/NodeModule.hpp
@@ -42,8 +42,7 @@ class Port;
 
 /** A module in a patch.
  *
- * This base class is extended for various types of modules - SubpatchModule,
- * DSSIModule, etc.
+ * This base class is extended for various types of modules.	
  *
  * \ingroup GUI
  */
diff --git a/src/libs/gui/UploadPatchWindow.hpp b/src/libs/gui/UploadPatchWindow.hpp
index c3de55fa..af064bdb 100644
--- a/src/libs/gui/UploadPatchWindow.hpp
+++ b/src/libs/gui/UploadPatchWindow.hpp
@@ -28,7 +28,6 @@
 #include "client/PatchModel.hpp"
 #include "client/PluginModel.hpp"
 using Ingen::Client::PatchModel;
-using Ingen::Client::MetadataMap;
 
 namespace Ingen {
 namespace GUI {