From f12a33ee1863f5ad6e05ce91b8c9387a7220e7c9 Mon Sep 17 00:00:00 2001 From: dave Date: Wed, 21 Jun 2006 07:03:30 +0000 Subject: [PATCH] More renaming, fixed bugs with disconnecting patch ports internally git-svn-id: http://svn.drobilla.net/lad@74 a436a847-0d15-0410-975c-d299462d15a1 --- ingen/configure.ac | 12 +- ingen/ingen.spec | 4 +- ingen/src/libs/engine/Makefile.am | 28 ++--- .../libs/engine/events/ConnectionEvent.cpp | 16 ++- .../src/libs/engine/events/ConnectionEvent.h | 1 - .../libs/engine/events/DisconnectionEvent.cpp | 113 ++++++++---------- .../libs/engine/events/DisconnectionEvent.h | 1 - ingen/src/progs/Makefile.am | 4 +- ingen/src/progs/demolition/demolition.cpp | 4 +- ingen/src/progs/ingenuity/DSSIController.cpp | 2 +- ingen/src/progs/ingenuity/GladeFactory.cpp | 6 +- ingen/src/progs/ingenuity/Makefile.am | 14 +-- ingen/src/progs/ingenuity/cmdline.c | 4 +- ingen/src/progs/ingenuity/cmdline.ggo | 4 +- ingen/src/progs/ingenuity/cmdline.h | 4 +- .../{om_gtk.glade => ingenuity.glade} | 0 .../{om_gtk.gladep => ingenuity.gladep} | 0 ingen/src/progs/ingenuity/om_gtk.gladep.bak | 9 -- ingen/src/progs/python/ingen.py | 2 +- ingen/src/progs/server/Makefile.am | 6 +- 20 files changed, 107 insertions(+), 127 deletions(-) rename ingen/src/progs/ingenuity/{om_gtk.glade => ingenuity.glade} (100%) rename ingen/src/progs/ingenuity/{om_gtk.gladep => ingenuity.gladep} (100%) delete mode 100644 ingen/src/progs/ingenuity/om_gtk.gladep.bak diff --git a/ingen/configure.ac b/ingen/configure.ac index 4f1c1d80..dc636276 100644 --- a/ingen/configure.ac +++ b/ingen/configure.ac @@ -5,10 +5,10 @@ AC_CONFIG_SRCDIR([src/common/interface/EngineInterface.h]) AC_CONFIG_SRCDIR([src/libs/engine/JackAudioDriver.cpp]) AC_CONFIG_SRCDIR([src/libs/engine/tests/node_tree_test.cpp]) AC_CONFIG_SRCDIR([src/libs/client/OSCController.cpp]) -AC_CONFIG_SRCDIR([src/progs/engine/main.cpp]) +AC_CONFIG_SRCDIR([src/progs/server/main.cpp]) AC_CONFIG_SRCDIR([src/progs/patch_loader/patch_loader.cpp]) AC_CONFIG_SRCDIR([src/progs/demolition/demolition.cpp]) -AC_CONFIG_SRCDIR([src/progs/gtk/main.cpp]) +AC_CONFIG_SRCDIR([src/progs/ingenuity/main.cpp]) AC_CONFIG_HEADER([config.h]) AM_INIT_AUTOMAKE @@ -339,13 +339,13 @@ AC_CONFIG_FILES([src/libs/engine/Makefile]) AC_CONFIG_FILES([src/libs/engine/tests/Makefile]) AC_CONFIG_FILES([src/libs/client/Makefile]) AC_CONFIG_FILES([src/progs/Makefile]) -AC_CONFIG_FILES([src/progs/om/Makefile]) +AC_CONFIG_FILES([src/progs/server/Makefile]) AC_CONFIG_FILES([src/progs/supercollider/Makefile]) AC_CONFIG_FILES([src/progs/python/Makefile]) AC_CONFIG_FILES([src/progs/python/scripts/Makefile]) AC_CONFIG_FILES([src/progs/demolition/Makefile]) AC_CONFIG_FILES([src/progs/patch_loader/Makefile]) -AC_CONFIG_FILES([src/progs/gtk/Makefile]) +AC_CONFIG_FILES([src/progs/ingenuity/Makefile]) AC_CONFIG_FILES([patches/Makefile]) AC_CONFIG_FILES([doc/Doxyfile]) AC_OUTPUT @@ -354,7 +354,7 @@ AC_OUTPUT AC_MSG_NOTICE([]) AC_MSG_NOTICE([Ingen build configuration:]) AC_MSG_NOTICE([]) -AC_MSG_NOTICE([Building engine: $build_engine]) +AC_MSG_NOTICE([Building server: $build_engine]) AC_MSG_NOTICE([ Jack MIDI support: $build_jack_midi]) AC_MSG_NOTICE([ ALSA MIDI support: $build_alsa_midi]) AC_MSG_NOTICE([ LV2 Plugin support: $build_lv2]) @@ -366,7 +366,7 @@ AC_MSG_NOTICE([Building in-process engine: $build_in_process_engine]) AC_MSG_NOTICE([]) AC_MSG_NOTICE([Building console clients: $build_console_clients]) AC_MSG_NOTICE([]) -AC_MSG_NOTICE([Building gtk client: $build_gtk_client]) +AC_MSG_NOTICE([Building Ingenuity (GTK): $build_gtk_client]) AC_MSG_NOTICE([]) AC_MSG_NOTICE([]) AC_MSG_NOTICE([Building with flags: $CXXFLAGS]) diff --git a/ingen/ingen.spec b/ingen/ingen.spec index 93671b0d..acc550fb 100644 --- a/ingen/ingen.spec +++ b/ingen/ingen.spec @@ -33,12 +33,12 @@ rm -rf %{buildroot} %files %defattr(-,root,root,-) %{_bindir}/om -%{_bindir}/om_gtk +%{_bindir}/ingenuity %{_bindir}/om_patch_loader %dir %{_datadir}/om %{_datadir}/om/patches/*.om %dir %{_datadir}/om-gtk -%{_datadir}/om-gtk/om_gtk.glade +%{_datadir}/om-gtk/ingenuity.glade %{_datadir}/om-gtk/om-icon.png diff --git a/ingen/src/libs/engine/Makefile.am b/ingen/src/libs/engine/Makefile.am index 322b5933..889f98fd 100644 --- a/ingen/src/libs/engine/Makefile.am +++ b/ingen/src/libs/engine/Makefile.am @@ -5,9 +5,9 @@ AM_CXXFLAGS = @JACK_CFLAGS@ @LOSC_CFLAGS@ @ALSA_CFLAGS@ @LASH_CFLAGS@ @SLV2_CFLA MAINTAINERCLEANFILES = Makefile.in -noinst_LTLIBRARIES = libom.la +noinst_LTLIBRARIES = libingen.la -libom_la_SOURCES = \ +libingen_la_SOURCES = \ util.h \ tuning.h \ DataType.h \ @@ -88,12 +88,12 @@ libom_la_SOURCES = \ AudioDriver.h \ MidiDriver.h \ midi.h \ - ../libom_la/util/Semaphore.h \ - ../libom_la/util/types.h \ - ../libom_la/util/Path.h \ - ../libom_la/util/Queue.h \ - ../libom_la/interface/ClientInterface.h \ - ../libom_la/interface/EngineInterface.h \ + ../libingen_la/util/Semaphore.h \ + ../libingen_la/util/types.h \ + ../libingen_la/util/Path.h \ + ../libingen_la/util/Queue.h \ + ../libingen_la/interface/ClientInterface.h \ + ../libingen_la/interface/EngineInterface.h \ instantiations.cpp \ events/RegisterClientEvent.h \ events/RegisterClientEvent.cpp \ @@ -169,25 +169,25 @@ libom_la_SOURCES = \ # MidiOutputNode.cpp if WITH_JACK_MIDI -libom_la_SOURCES += \ +libingen_la_SOURCES += \ JackMidiDriver.h \ JackMidiDriver.cpp endif if WITH_ALSA_MIDI -libom_la_SOURCES += \ +libingen_la_SOURCES += \ AlsaMidiDriver.h \ AlsaMidiDriver.cpp endif if WITH_LADSPA -libom_la_SOURCES += \ +libingen_la_SOURCES += \ LADSPANode.h \ LADSPANode.cpp endif if WITH_DSSI -libom_la_SOURCES += \ +libingen_la_SOURCES += \ DSSINode.h \ DSSINode.cpp \ events/DSSIConfigureEvent.cpp \ @@ -201,13 +201,13 @@ libom_la_SOURCES += \ endif if WITH_LV2 -libom_la_SOURCES += \ +libingen_la_SOURCES += \ LV2Node.h \ LV2Node.cpp endif if WITH_LASH -libom_la_SOURCES += \ +libingen_la_SOURCES += \ LashDriver.h \ LashDriver.cpp \ LashRestoreDoneEvent.h diff --git a/ingen/src/libs/engine/events/ConnectionEvent.cpp b/ingen/src/libs/engine/events/ConnectionEvent.cpp index 1182c723..aedfd881 100644 --- a/ingen/src/libs/engine/events/ConnectionEvent.cpp +++ b/ingen/src/libs/engine/events/ConnectionEvent.cpp @@ -164,19 +164,17 @@ TypedConnectionEvent::TypedConnectionEvent(CountedPtr responder, O assert(dst_port != NULL); } -template -TypedConnectionEvent::~TypedConnectionEvent() -{ - // FIXME: haaaack, prevent a double delete - // this class is unusable by anything other than ConnectionEvent because of this - //m_responder = NULL; -} - template void TypedConnectionEvent::pre_process() -{ +{ + if (m_dst_port->is_connected_to(m_src_port)) { + m_succeeded = false; + QueuedEvent::pre_process(); + return; + } + Node* const src_node = m_src_port->parent_node(); Node* const dst_node = m_dst_port->parent_node(); diff --git a/ingen/src/libs/engine/events/ConnectionEvent.h b/ingen/src/libs/engine/events/ConnectionEvent.h index 2d2e0c92..23bedcef 100644 --- a/ingen/src/libs/engine/events/ConnectionEvent.h +++ b/ingen/src/libs/engine/events/ConnectionEvent.h @@ -81,7 +81,6 @@ class TypedConnectionEvent : public QueuedEvent { public: TypedConnectionEvent(CountedPtr responder, OutputPort* src_port, InputPort* dst_port); - ~TypedConnectionEvent(); void pre_process(); void execute(samplecount offset); diff --git a/ingen/src/libs/engine/events/DisconnectionEvent.cpp b/ingen/src/libs/engine/events/DisconnectionEvent.cpp index 04193c6c..f3524500 100644 --- a/ingen/src/libs/engine/events/DisconnectionEvent.cpp +++ b/ingen/src/libs/engine/events/DisconnectionEvent.cpp @@ -78,61 +78,63 @@ void DisconnectionEvent::pre_process() { if (m_lookup) { - if (m_src_port_path.parent().parent() != m_dst_port_path.parent().parent()) { + if (m_src_port_path.parent().parent() != m_dst_port_path.parent().parent() + && m_src_port_path.parent() != m_dst_port_path.parent().parent() + && m_src_port_path.parent().parent() != m_dst_port_path.parent()) { m_error = PARENT_PATCH_DIFFERENT; QueuedEvent::pre_process(); return; } - + /*m_patch = om->object_store()->find_patch(m_src_port_path.parent().parent()); - - if (m_patch == NULL) { - m_error = PORT_NOT_FOUND; - QueuedEvent::pre_process(); - return; - }*/ - - Port* port1 = om->object_store()->find_port(m_src_port_path); - Port* port2 = om->object_store()->find_port(m_dst_port_path); - - if (port1 == NULL || port2 == NULL) { + + if (m_patch == NULL) { + m_error = PORT_NOT_FOUND; + QueuedEvent::pre_process(); + return; + }*/ + + m_src_port = om->object_store()->find_port(m_src_port_path); + m_dst_port = om->object_store()->find_port(m_dst_port_path); + + if (m_src_port == NULL || m_dst_port == NULL) { m_error = PORT_NOT_FOUND; QueuedEvent::pre_process(); return; } - - if (port1->type() != port2->type()) { + + if (m_src_port->type() != m_dst_port->type() || m_src_port->buffer_size() != m_dst_port->buffer_size()) { m_error = TYPE_MISMATCH; QueuedEvent::pre_process(); return; } - - if (port1->is_output() && port2->is_input()) { - m_src_port = port1; - m_dst_port = port2; - } else if (port2->is_output() && port1->is_input()) { - m_src_port = port2; - m_dst_port = port1; + + /*if (port1->is_output() && port2->is_input()) { + m_src_port = port1; + m_dst_port = port2; + } else if (port2->is_output() && port1->is_input()) { + m_src_port = port2; + m_dst_port = port1; + } else { + m_error = TYPE_MISMATCH; + QueuedEvent::pre_process(); + return; + }*/ + + // Create the typed event to actually do the work + const DataType type = m_src_port->type(); + if (type == DataType::FLOAT) { + m_typed_event = new TypedDisconnectionEvent(m_responder, + dynamic_cast*>(m_src_port), dynamic_cast*>(m_dst_port)); + } else if (type == DataType::MIDI) { + m_typed_event = new TypedDisconnectionEvent(m_responder, + dynamic_cast*>(m_src_port), dynamic_cast*>(m_dst_port)); } else { m_error = TYPE_MISMATCH; QueuedEvent::pre_process(); return; } } - - // Create the typed event to actually do the work - const DataType type = m_src_port->type(); - if (type == DataType::FLOAT) { - m_typed_event = new TypedDisconnectionEvent(m_responder, - dynamic_cast*>(m_src_port), dynamic_cast*>(m_dst_port)); - } else if (type == DataType::MIDI) { - m_typed_event = new TypedDisconnectionEvent(m_responder, - dynamic_cast*>(m_src_port), dynamic_cast*>(m_dst_port)); - } else { - m_error = TYPE_MISMATCH; - QueuedEvent::pre_process(); - return; - } m_typed_event->pre_process(); @@ -157,7 +159,7 @@ DisconnectionEvent::post_process() m_typed_event->post_process(); } else { // FIXME: better error messages - string msg = "Unable to make connection "; + string msg = "Unable to disconnect "; msg.append(m_src_port_path + " -> " + m_dst_port_path); m_responder->respond_error(msg); } @@ -181,14 +183,6 @@ TypedDisconnectionEvent::TypedDisconnectionEvent(CountedPtr respon assert(dst_port != NULL); } -template -TypedDisconnectionEvent::~TypedDisconnectionEvent() -{ - // FIXME: haaaack, prevent a double delete - // this class is unusable by anything other than DisconnectionEvent because of this - //m_responder = NULL; -} - template void @@ -202,8 +196,20 @@ TypedDisconnectionEvent::pre_process() Node* const src_node = m_src_port->parent_node(); Node* const dst_node = m_dst_port->parent_node(); - - m_patch = src_node->parent_patch(); + if (src_node->parent_patch() != dst_node->parent_patch()) { + // Connection to a patch port from inside the patch + assert(src_node->parent() == dst_node || dst_node->parent() == src_node); + if (src_node->parent() == dst_node) + m_patch = dynamic_cast(dst_node); + else + m_patch = dynamic_cast(src_node); + } else { + // Normal connection between nodes with the same parent + m_patch = src_node->parent_patch(); + } + + assert(m_patch); + assert(m_patch == src_node->parent() || m_patch == dst_node->parent()); if (src_node == NULL || dst_node == NULL) { m_succeeded = false; @@ -211,30 +217,17 @@ TypedDisconnectionEvent::pre_process() return; } - if (src_node->parent() != m_patch || dst_node->parent() != m_patch) { - m_succeeded = false; - QueuedEvent::pre_process(); - return; - } - - bool removed = false; - for (List::iterator i = dst_node->providers()->begin(); i != dst_node->providers()->end(); ++i) if ((*i) == src_node) { delete dst_node->providers()->remove(i); - removed = true; break; } - assert(removed); - removed = false; for (List::iterator i = src_node->dependants()->begin(); i != src_node->dependants()->end(); ++i) if ((*i) == dst_node) { delete src_node->dependants()->remove(i); - removed = true; break; } - assert(removed); if (m_patch->process()) m_process_order = m_patch->build_process_order(); diff --git a/ingen/src/libs/engine/events/DisconnectionEvent.h b/ingen/src/libs/engine/events/DisconnectionEvent.h index 6edbc78a..43b2d841 100644 --- a/ingen/src/libs/engine/events/DisconnectionEvent.h +++ b/ingen/src/libs/engine/events/DisconnectionEvent.h @@ -83,7 +83,6 @@ class TypedDisconnectionEvent : public QueuedEvent { public: TypedDisconnectionEvent(CountedPtr responder, OutputPort* src_port, InputPort* dst_port); - ~TypedDisconnectionEvent(); void pre_process(); void execute(samplecount offset); diff --git a/ingen/src/progs/Makefile.am b/ingen/src/progs/Makefile.am index e741d98a..a1a8c911 100644 --- a/ingen/src/progs/Makefile.am +++ b/ingen/src/progs/Makefile.am @@ -2,14 +2,14 @@ AM_CXXFLAGS = -I$(top_srcdir)/src/common DIST_SUBDIRS = python supercollider -SUBDIRS = om +SUBDIRS = server if BUILD_CONSOLE_CLIENTS SUBDIRS += patch_loader demolition endif if BUILD_GTK_CLIENT -SUBDIRS += gtk +SUBDIRS += ingenuity endif diff --git a/ingen/src/progs/demolition/demolition.cpp b/ingen/src/progs/demolition/demolition.cpp index 47c3279c..93d15575 100644 --- a/ingen/src/progs/demolition/demolition.cpp +++ b/ingen/src/progs/demolition/demolition.cpp @@ -183,7 +183,7 @@ create_patch() engine->create_patch_from_model(pm); - // Spread them out a bit for easier monitoring with om_gtk + // Spread them out a bit for easier monitoring with ingenuity char tmp_buf[8]; snprintf(tmp_buf, 8, "%d", 1600 + rand()%800 - 400); engine->set_metadata(pm->path(), "module-x", string(tmp_buf)); @@ -226,7 +226,7 @@ add_node() NodeModel* nm = new NodeModel(plugin, parent->path() +"/"+ random_name()); cout << "Adding node " << nm->path() << endl; engine->create_node_from_model(nm); - // Spread them out a bit for easier monitoring with om_gtk + // Spread them out a bit for easier monitoring with ingenuity char tmp_buf[8]; snprintf(tmp_buf, 8, "%d", 1600 + rand()%800 - 400); engine->set_metadata(nm->path(), "module-x", tmp_buf); diff --git a/ingen/src/progs/ingenuity/DSSIController.cpp b/ingen/src/progs/ingenuity/DSSIController.cpp index 3159504a..8eb40c5c 100644 --- a/ingen/src/progs/ingenuity/DSSIController.cpp +++ b/ingen/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/ingen/src/progs/ingenuity/GladeFactory.cpp b/ingen/src/progs/ingenuity/GladeFactory.cpp index 3b7a3a4d..e6409448 100644 --- a/ingen/src/progs/ingenuity/GladeFactory.cpp +++ b/ingen/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/ingen/src/progs/ingenuity/Makefile.am b/ingen/src/progs/ingenuity/Makefile.am index bb42d575..5b45c54a 100644 --- a/ingen/src/progs/ingenuity/Makefile.am +++ b/ingen/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/ingen/src/progs/ingenuity/cmdline.c b/ingen/src/progs/ingenuity/cmdline.c index 11fcd108..85c580d5 100644 --- a/ingen/src/progs/ingenuity/cmdline.c +++ b/ingen/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/ingen/src/progs/ingenuity/cmdline.ggo b/ingen/src/progs/ingenuity/cmdline.ggo index d62cf521..432fb646 100644 --- a/ingen/src/progs/ingenuity/cmdline.ggo +++ b/ingen/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/ingen/src/progs/ingenuity/cmdline.h b/ingen/src/progs/ingenuity/cmdline.h index e404ac2e..dca25a89 100644 --- a/ingen/src/progs/ingenuity/cmdline.h +++ b/ingen/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/ingen/src/progs/ingenuity/om_gtk.glade b/ingen/src/progs/ingenuity/ingenuity.glade similarity index 100% rename from ingen/src/progs/ingenuity/om_gtk.glade rename to ingen/src/progs/ingenuity/ingenuity.glade diff --git a/ingen/src/progs/ingenuity/om_gtk.gladep b/ingen/src/progs/ingenuity/ingenuity.gladep similarity index 100% rename from ingen/src/progs/ingenuity/om_gtk.gladep rename to ingen/src/progs/ingenuity/ingenuity.gladep diff --git a/ingen/src/progs/ingenuity/om_gtk.gladep.bak b/ingen/src/progs/ingenuity/om_gtk.gladep.bak deleted file mode 100644 index a8bd18bd..00000000 --- a/ingen/src/progs/ingenuity/om_gtk.gladep.bak +++ /dev/null @@ -1,9 +0,0 @@ - - - - - OmGtk - om_gtk - C++ - FALSE - diff --git a/ingen/src/progs/python/ingen.py b/ingen/src/progs/python/ingen.py index 25c05fea..5e013e5f 100644 --- a/ingen/src/progs/python/ingen.py +++ b/ingen/src/progs/python/ingen.py @@ -410,7 +410,7 @@ class Environment: #~ * min-value (float) - Suggested maximum value #~ * Note that in the event of loading a patch, this message could be followed immediately by a control change, meaning the default-value is not actually the current value of the port (ahem, Lachlan). - #~ * The minimum and maximum values are suggestions only, they are not enforced in any way, and going outside them is perfectly fine. Also note that the port ranges in om_gtk are not these ones! Those ranges are set as metadata. + #~ * The minimum and maximum values are suggestions only, they are not enforced in any way, and going outside them is perfectly fine. Also note that the port ranges in ingenuity are not these ones! Those ranges are set as metadata. def __ingen__new_port(self,path,porttype,direction,hint,defaultvalue,minvalue,maxvalue): port = self.getPort(path) port.setPortType(porttype) diff --git a/ingen/src/progs/server/Makefile.am b/ingen/src/progs/server/Makefile.am index 9ba20719..7b0f1625 100644 --- a/ingen/src/progs/server/Makefile.am +++ b/ingen/src/progs/server/Makefile.am @@ -8,10 +8,10 @@ MAINTAINERCLEANFILES = Makefile.in if BUILD_ENGINE bin_PROGRAMS = ingen -om_DEPENDENCIES = ../../libs/engine/libingen.la -om_LDADD = @JACK_LIBS@ @LOSC_LIBS@ @ALSA_LIBS@ @LASH_LIBS@ @SLV2_LIBS@ -lrt ../../libs/engine/libingen.la +ingen_DEPENDENCIES = ../../libs/engine/libingen.la +ingen_LDADD = @JACK_LIBS@ @LOSC_LIBS@ @ALSA_LIBS@ @LASH_LIBS@ @SLV2_LIBS@ -lrt ../../libs/engine/libingen.la -om_SOURCES = \ +ingen_SOURCES = \ main.cpp \ cmdline.h \ cmdline.c