More renaming, fixed bugs with disconnecting patch ports internally

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

9 files changed, 17 insertions, 26 deletions

diff --git a/src/progs/ingenuity/DSSIController.cpp b/src/progs/ingenuity/DSSIController.cpp
index 3159504a..8eb40c5c 100644
--- a/src/progs/ingenuity/DSSIController.cpp
+++ b/src/progs/ingenuity/DSSIController.cpp
@@ -154,7 +154,7 @@ DSSIController::attempt_to_show_gui()
 	
 	const char*   dllName   = node_model()->plugin()->lib_name().c_str();
 	const char*   label     = node_model()->plugin()->plug_label().c_str();
-	const char*   myName    = "om_gtk";
+	const char*   myName    = "ingenuity";
 	const string& oscUrl    = engine_url + "/dssi" + node_model()->path();
 
 	struct dirent* entry = NULL;
diff --git a/src/progs/ingenuity/GladeFactory.cpp b/src/progs/ingenuity/GladeFactory.cpp
index 3b7a3a4d..e6409448 100644
--- a/src/progs/ingenuity/GladeFactory.cpp
+++ b/src/progs/ingenuity/GladeFactory.cpp
@@ -30,16 +30,16 @@ void
 GladeFactory::find_glade_file()
 {
 	// Check for the .glade file in current directory
-	glade_filename = "./om_gtk.glade";
+	glade_filename = "./ingenuity.glade";
 	ifstream fs(glade_filename.c_str());
 	if (fs.fail()) { // didn't find it, check PKGDATADIR
 		fs.clear();
 		glade_filename = PKGDATADIR;
-		glade_filename += "/om_gtk.glade";
+		glade_filename += "/ingenuity.glade";
 	
 		fs.open(glade_filename.c_str());
 		if (fs.fail()) {
-			cerr << "[GladeFactory] Unable to find om_gtk.glade in current directory or " << PKGDATADIR << "." << endl;
+			cerr << "[GladeFactory] Unable to find ingenuity.glade in current directory or " << PKGDATADIR << "." << endl;
 			throw;
 		}
 		fs.close();
diff --git a/src/progs/ingenuity/Makefile.am b/src/progs/ingenuity/Makefile.am
index bb42d575..5b45c54a 100644
--- a/src/progs/ingenuity/Makefile.am
+++ b/src/progs/ingenuity/Makefile.am
@@ -1,18 +1,18 @@
 if BUILD_GTK_CLIENT
 
-EXTRA_DIST = om_gtk.gladep
+EXTRA_DIST = ingenuity.gladep
 MAINTAINERCLEANFILES = Makefile.in
 
 sharefilesdir = $(pkgdatadir)
-dist_sharefiles_DATA = om_gtk.glade om-icon.png
+dist_sharefiles_DATA = ingenuity.glade om-icon.png
 
 AM_CXXFLAGS = -DGTK_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -I$(top_srcdir)/src/common -I$(top_srcdir)/src/libs/client -DPKGDATADIR=\"$(pkgdatadir)\" @GTKMM_CFLAGS@ @LIBGLADEMM_CFLAGS@ @GNOMECANVASMM_CFLAGS@ @LOSC_CFLAGS@ @LASH_CFLAGS@ @FLOWCANVAS_CFLAGS@ -DWITH_RTTI
-om_gtk_LDADD = @GTKMM_LIBS@ @LIBGLADEMM_LIBS@ @GNOMECANVASMM_LIBS@ @LOSC_LIBS@ @LASH_LIBS@ @FLOWCANVAS_LIBS@ ../../libs/client/libomclient.la
-om_gtk_DEPENDENCIES = ../../libs/client/libomclient.la
+ingenuity_LDADD = @GTKMM_LIBS@ @LIBGLADEMM_LIBS@ @GNOMECANVASMM_LIBS@ @LOSC_LIBS@ @LASH_LIBS@ @FLOWCANVAS_LIBS@ ../../libs/client/libomclient.la
+ingenuity_DEPENDENCIES = ../../libs/client/libomclient.la
 
 
-bin_PROGRAMS = om_gtk
-om_gtk_SOURCES = \
+bin_PROGRAMS = ingenuity
+ingenuity_SOURCES = \
 	cmdline.h \
 	cmdline.c \
 	main.cpp \
@@ -88,7 +88,7 @@ om_gtk_SOURCES = \
 	PatchTreeWindow.cpp
 
 if WITH_LASH
-om_gtk_SOURCES += LashController.h LashController.cpp
+ingenuity_SOURCES += LashController.h LashController.cpp
 endif
 
 
diff --git a/src/progs/ingenuity/cmdline.c b/src/progs/ingenuity/cmdline.c
index 11fcd108..85c580d5 100644
--- a/src/progs/ingenuity/cmdline.c
+++ b/src/progs/ingenuity/cmdline.c
@@ -36,7 +36,7 @@ cmdline_parser_print_help (void)
   "Usage: %s [OPTIONS]...\n", CMDLINE_PARSER_PACKAGE);
   printf("   -h         --help               Print help and exit\n");
   printf("   -V         --version            Print version and exit\n");
-  printf("   -uSTRING   --engine-url=STRING  Om engine URL to connect to\n");
+  printf("   -uSTRING   --engine-url=STRING  Ingen OSC URL to connect to\n");
   printf("   -pINT      --client-port=INT    Client port to listen on\n");
 }
 
@@ -106,7 +106,7 @@ cmdline_parser (int argc, char * const *argv, struct gengetopt_args_info *args_i
           cmdline_parser_print_version ();
           exit (EXIT_SUCCESS);
 
-        case 'u':	/* Om engine URL to connect to.  */
+        case 'u':	/* Ingen OSC URL to connect to.  */
           if (args_info->engine_url_given)
             {
               fprintf (stderr, "%s: `--engine-url' (`-u') option given more than once\n", CMDLINE_PARSER_PACKAGE);
diff --git a/src/progs/ingenuity/cmdline.ggo b/src/progs/ingenuity/cmdline.ggo
index d62cf521..432fb646 100644
--- a/src/progs/ingenuity/cmdline.ggo
+++ b/src/progs/ingenuity/cmdline.ggo
@@ -1,7 +1,7 @@
 # Process this file with gengetopt -u to generate the necessary code (in cmdline.h, cmdline.c)
 
-package "om_gtk - A GUI client for the Om realtime modular synthesizer"
+package "ingenuity - A GUI client for the Ingen realtime audio processor"
 
-option "engine-url"  u "Om engine URL to connect to" string no
+option "engine-url"  u "Ingen OSC URL to connect to" string no
 option "client-port" p "Client port to listen on"    int    no
 
diff --git a/src/progs/ingenuity/cmdline.h b/src/progs/ingenuity/cmdline.h
index e404ac2e..dca25a89 100644
--- a/src/progs/ingenuity/cmdline.h
+++ b/src/progs/ingenuity/cmdline.h
@@ -15,7 +15,7 @@ extern "C" {
 #endif /* __cplusplus */
 
 #ifndef CMDLINE_PARSER_PACKAGE
-#define CMDLINE_PARSER_PACKAGE "om_gtk - A GUI client for the Om realtime modular synthesizer"
+#define CMDLINE_PARSER_PACKAGE "ingenuity - A GUI client for the Ingen realtime audio processor"
 #endif
 
 #ifndef CMDLINE_PARSER_VERSION
@@ -24,7 +24,7 @@ extern "C" {
 
 struct gengetopt_args_info
 {
-  char * engine_url_arg;	/* Om engine URL to connect to.  */
+  char * engine_url_arg;	/* Ingen OSC URL to connect to.  */
   int client_port_arg;	/* Client port to listen on.  */
 
   int help_given ;	/* Whether help was given.  */
diff --git a/src/progs/ingenuity/om_gtk.glade b/src/progs/ingenuity/ingenuity.glade
index 17736ce2..17736ce2 100644
--- a/src/progs/ingenuity/om_gtk.glade
+++ b/src/progs/ingenuity/ingenuity.glade
diff --git a/src/progs/ingenuity/om_gtk.gladep b/src/progs/ingenuity/ingenuity.gladep
index a8bd18bd..a8bd18bd 100644
--- a/src/progs/ingenuity/om_gtk.gladep
+++ b/src/progs/ingenuity/ingenuity.gladep
diff --git a/src/progs/ingenuity/om_gtk.gladep.bak b/src/progs/ingenuity/om_gtk.gladep.bak
deleted file mode 100644
index a8bd18bd..00000000
--- a/src/progs/ingenuity/om_gtk.gladep.bak
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
-<!DOCTYPE glade-project SYSTEM "http://glade.gnome.org/glade-project-2.0.dtd">
-
-<glade-project>
-  <name>OmGtk</name>
-  <program_name>om_gtk</program_name>
-  <language>C++</language>
-  <gnome_support>FALSE</gnome_support>
-</glade-project>