diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/libs/client/DeprecatedLoader.cpp | 13 | ||||
| -rw-r--r-- | src/libs/client/OSCClientReceiver.cpp | 44 | ||||
| -rw-r--r-- | src/libs/client/OSCEngineSender.cpp | 58 | ||||
| -rw-r--r-- | src/libs/client/PortModel.h | 2 | ||||
| -rw-r--r-- | src/libs/client/Serializer.cpp | 168 | ||||
| -rw-r--r-- | src/libs/client/Serializer.h | 14 | ||||
| -rw-r--r-- | src/libs/engine/OSCClientSender.cpp | 113 | ||||
| -rw-r--r-- | src/libs/engine/OSCEngineReceiver.cpp | 209 | ||||
| -rw-r--r-- | src/libs/engine/OSCEngineReceiver.h | 3 | ||||
| -rw-r--r-- | src/libs/engine/OSCResponder.cpp | 4 | ||||
| -rw-r--r-- | src/progs/ingenuity/Configuration.cpp | 2 |
11 files changed, 212 insertions, 418 deletions
diff --git a/src/libs/client/DeprecatedLoader.cpp b/src/libs/client/DeprecatedLoader.cpp index f174fb1e..97e6583d 100644 --- a/src/libs/client/DeprecatedLoader.cpp +++ b/src/libs/client/DeprecatedLoader.cpp @@ -149,22 +149,21 @@ DeprecatedLoader::add_metadata(MetadataMap& data, string old_key, string value) * is 0, it will be loaded from file. Otherwise the given values will * be used. * - * @param wait If true the patch will be checked for existence before - * loading everything in to it (to prevent messing up existing patches - * that exist at the path this one should load as). - * - * @param existing If true, the patch will be loaded into a currently - * existing patch (ie a merging will take place). Errors will result - * if Nodes of conflicting names exist. + * @param filename Local name of file to load patch from * * @param parent_path Patch to load this patch as a child of (empty string to load * to the root patch) * * @param name Name of this patch (loaded/generated if the empty string) + * @param poly Polyphony of this patch (loaded/generated if 0) * * @param initial_data will be set last, so values passed there will override * any values loaded from the patch file. * + * @param existing If true, the patch will be loaded into a currently + * existing patch (ie a merging will take place). Errors will result + * if Nodes of conflicting names exist. + * * Returns the path of the newly created patch. */ string diff --git a/src/libs/client/OSCClientReceiver.cpp b/src/libs/client/OSCClientReceiver.cpp index 6fb39a55..7545b141 100644 --- a/src/libs/client/OSCClientReceiver.cpp +++ b/src/libs/client/OSCClientReceiver.cpp @@ -76,8 +76,8 @@ OSCClientReceiver::start() // Print all incoming messages lo_server_thread_add_method(_st, NULL, NULL, generic_cb, NULL); - //lo_server_thread_add_method(_st, "/om/response/ok", "i", om_response_ok_cb, this); - //lo_server_thread_add_method(_st, "/om/response/error", "is", om_responseerror_cb, this); + //lo_server_thread_add_method(_st, "/ingen/response/ok", "i", om_response_ok_cb, this); + //lo_server_thread_add_method(_st, "/ingen/response/error", "is", om_responseerror_cb, this); setup_callbacks(); @@ -144,23 +144,23 @@ OSCClientReceiver::unknown_cb(const char* path, const char* types, lo_arg** argv void OSCClientReceiver::setup_callbacks() { - lo_server_thread_add_method(_st, "/om/response", "iis", response_cb, this); - lo_server_thread_add_method(_st, "/om/num_plugins", "i", num_plugins_cb, this); - lo_server_thread_add_method(_st, "/om/plugin", "sss", plugin_cb, this); - lo_server_thread_add_method(_st, "/om/new_patch", "si", new_patch_cb, this); - lo_server_thread_add_method(_st, "/om/destroyed", "s", destroyed_cb, this); - lo_server_thread_add_method(_st, "/om/patch_enabled", "s", patch_enabled_cb, this); - lo_server_thread_add_method(_st, "/om/patch_disabled", "s", patch_disabled_cb, this); - lo_server_thread_add_method(_st, "/om/patch_cleared", "s", patch_cleared_cb, this); - lo_server_thread_add_method(_st, "/om/object_renamed", "ss", object_renamed_cb, this); - lo_server_thread_add_method(_st, "/om/new_connection", "ss", connection_cb, this); - lo_server_thread_add_method(_st, "/om/disconnection", "ss", disconnection_cb, this); - lo_server_thread_add_method(_st, "/om/new_node", "ssii", new_node_cb, this); - lo_server_thread_add_method(_st, "/om/new_port", "ssi", new_port_cb, this); - lo_server_thread_add_method(_st, "/om/metadata/update", NULL, metadata_update_cb, this); - lo_server_thread_add_method(_st, "/om/control_change", "sf", control_change_cb, this); - lo_server_thread_add_method(_st, "/om/program_add", "siis", program_add_cb, this); - lo_server_thread_add_method(_st, "/om/program_remove", "sii", program_remove_cb, this); + lo_server_thread_add_method(_st, "/ingen/response", "iis", response_cb, this); + lo_server_thread_add_method(_st, "/ingen/num_plugins", "i", num_plugins_cb, this); + lo_server_thread_add_method(_st, "/ingen/plugin", "sss", plugin_cb, this); + lo_server_thread_add_method(_st, "/ingen/new_patch", "si", new_patch_cb, this); + lo_server_thread_add_method(_st, "/ingen/destroyed", "s", destroyed_cb, this); + lo_server_thread_add_method(_st, "/ingen/patch_enabled", "s", patch_enabled_cb, this); + lo_server_thread_add_method(_st, "/ingen/patch_disabled", "s", patch_disabled_cb, this); + lo_server_thread_add_method(_st, "/ingen/patch_cleared", "s", patch_cleared_cb, this); + lo_server_thread_add_method(_st, "/ingen/object_renamed", "ss", object_renamed_cb, this); + lo_server_thread_add_method(_st, "/ingen/new_connection", "ss", connection_cb, this); + lo_server_thread_add_method(_st, "/ingen/disconnection", "ss", disconnection_cb, this); + lo_server_thread_add_method(_st, "/ingen/new_node", "ssii", new_node_cb, this); + lo_server_thread_add_method(_st, "/ingen/new_port", "ssi", new_port_cb, this); + lo_server_thread_add_method(_st, "/ingen/metadata_update", NULL, metadata_update_cb, this); + lo_server_thread_add_method(_st, "/ingen/control_change", "sf", control_change_cb, this); + lo_server_thread_add_method(_st, "/ingen/program_add", "siis", program_add_cb, this); + lo_server_thread_add_method(_st, "/ingen/program_remove", "sii", program_remove_cb, this); } @@ -375,8 +375,8 @@ OSCClientReceiver::_response_cb(const char* path, const char* types, lo_arg** ar } -/** Number of plugins in engine, should precede /om/plugin messages in response - * to a /om/send_plugins +/** Number of plugins in engine, should precede /ingen/plugin messages in response + * to a /ingen/send_plugins */ int OSCClientReceiver::_num_plugins_cb(const char* path, const char* types, lo_arg** argv, int argc, lo_message msg) @@ -387,7 +387,7 @@ OSCClientReceiver::_num_plugins_cb(const char* path, const char* types, lo_arg** } -/** A plugin info response from the server, in response to a /send_plugins +/** A plugin info response from the server, in response to an /ingen/send_plugins */ int OSCClientReceiver::_plugin_cb(const char* path, const char* types, lo_arg** argv, int argc, lo_message msg) diff --git a/src/libs/client/OSCEngineSender.cpp b/src/libs/client/OSCEngineSender.cpp index 70ab9ca2..11bbc3d7 100644 --- a/src/libs/client/OSCEngineSender.cpp +++ b/src/libs/client/OSCEngineSender.cpp @@ -112,7 +112,7 @@ OSCEngineSender::register_client(ClientKey key, SharedPtr<ClientInterface> clien { // FIXME: use parameters.. er, somehow. assert(_engine_addr); - lo_send(_engine_addr, "/om/engine/register_client", "i", next_id()); + lo_send(_engine_addr, "/ingen/register_client", "i", next_id()); } @@ -120,7 +120,7 @@ void OSCEngineSender::unregister_client(ClientKey key) { assert(_engine_addr); - lo_send(_engine_addr, "/om/engine/unregister_client", "i", next_id()); + lo_send(_engine_addr, "/ingen/unregister_client", "i", next_id()); } @@ -130,7 +130,7 @@ void OSCEngineSender::load_plugins() { assert(_engine_addr); - lo_send(_engine_addr, "/om/engine/load_plugins", "i", next_id()); + lo_send(_engine_addr, "/ingen/load_plugins", "i", next_id()); } @@ -138,7 +138,7 @@ void OSCEngineSender::activate() { assert(_engine_addr); - lo_send(_engine_addr, "/om/engine/activate", "i", next_id()); + lo_send(_engine_addr, "/ingen/activate", "i", next_id()); } @@ -146,7 +146,7 @@ void OSCEngineSender::deactivate() { assert(_engine_addr); - lo_send(_engine_addr, "/om/engine/deactivate", "i", next_id()); + lo_send(_engine_addr, "/ingen/deactivate", "i", next_id()); } @@ -154,7 +154,7 @@ void OSCEngineSender::quit() { assert(_engine_addr); - lo_send(_engine_addr, "/om/engine/quit", "i", next_id()); + lo_send(_engine_addr, "/ingen/quit", "i", next_id()); } @@ -166,7 +166,7 @@ OSCEngineSender::create_patch(const string& path, uint32_t poly) { assert(_engine_addr); - lo_send(_engine_addr, "/om/synth/create_patch", "isi", + lo_send(_engine_addr, "/ingen/create_patch", "isi", next_id(), path.c_str(), poly); @@ -179,7 +179,7 @@ OSCEngineSender::create_port(const string& path, bool is_output) { assert(_engine_addr); - lo_send(_engine_addr, "/om/synth/create_port", "issi", + lo_send(_engine_addr, "/ingen/create_port", "issi", next_id(), path.c_str(), data_type.c_str(), @@ -193,7 +193,7 @@ OSCEngineSender::create_node(const string& path, bool polyphonic) { assert(_engine_addr); - lo_send(_engine_addr, "/om/synth/create_node", "issi", + lo_send(_engine_addr, "/ingen/create_node", "issi", next_id(), path.c_str(), plugin_uri.c_str(), @@ -213,7 +213,7 @@ OSCEngineSender::create_node(const string& path, bool polyphonic) { assert(_engine_addr); - lo_send(_engine_addr, "/om/synth/create_node", "issssi", + lo_send(_engine_addr, "/ingen/create_node", "issssi", next_id(), path.c_str(), plugin_type.c_str(), @@ -228,7 +228,7 @@ OSCEngineSender::rename(const string& old_path, const string& new_name) { assert(_engine_addr); - lo_send(_engine_addr, "/om/synth/rename", "iss", + lo_send(_engine_addr, "/ingen/rename", "iss", next_id(), old_path.c_str(), new_name.c_str()); @@ -239,7 +239,7 @@ void OSCEngineSender::destroy(const string& path) { assert(_engine_addr); - lo_send(_engine_addr, "/om/synth/destroy", "is", + lo_send(_engine_addr, "/ingen/destroy", "is", next_id(), path.c_str()); } @@ -249,7 +249,7 @@ void OSCEngineSender::clear_patch(const string& patch_path) { assert(_engine_addr); - lo_send(_engine_addr, "/om/synth/clear_patch", "is", + lo_send(_engine_addr, "/ingen/clear_patch", "is", next_id(), patch_path.c_str()); } @@ -259,7 +259,7 @@ void OSCEngineSender::enable_patch(const string& patch_path) { assert(_engine_addr); - lo_send(_engine_addr, "/om/synth/enable_patch", "is", + lo_send(_engine_addr, "/ingen/enable_patch", "is", next_id(), patch_path.c_str()); } @@ -269,7 +269,7 @@ void OSCEngineSender::disable_patch(const string& patch_path) { assert(_engine_addr); - lo_send(_engine_addr, "/om/synth/disable_patch", "is", + lo_send(_engine_addr, "/ingen/disable_patch", "is", next_id(), patch_path.c_str()); } @@ -280,7 +280,7 @@ OSCEngineSender::connect(const string& src_port_path, const string& dst_port_path) { assert(_engine_addr); - lo_send(_engine_addr, "/om/synth/connect", "iss", + lo_send(_engine_addr, "/ingen/connect", "iss", next_id(), src_port_path.c_str(), dst_port_path.c_str()); @@ -292,7 +292,7 @@ OSCEngineSender::disconnect(const string& src_port_path, const string& dst_port_path) { assert(_engine_addr); - lo_send(_engine_addr, "/om/synth/disconnect", "iss", + lo_send(_engine_addr, "/ingen/disconnect", "iss", next_id(), src_port_path.c_str(), dst_port_path.c_str()); @@ -303,7 +303,7 @@ void OSCEngineSender::disconnect_all(const string& node_path) { assert(_engine_addr); - lo_send(_engine_addr, "/om/synth/disconnect_all", "is", + lo_send(_engine_addr, "/ingen/disconnect_all", "is", next_id(), node_path.c_str()); } @@ -314,7 +314,7 @@ OSCEngineSender::set_port_value(const string& port_path, float val) { assert(_engine_addr); - lo_send(_engine_addr, "/om/synth/set_port_value", "isf", + lo_send(_engine_addr, "/ingen/set_port_value", "isf", next_id(), port_path.c_str(), val); @@ -327,7 +327,7 @@ OSCEngineSender::set_port_value(const string& port_path, float val) { assert(_engine_addr); - lo_send(_engine_addr, "/om/synth/set_port_value", "isif", + lo_send(_engine_addr, "/ingen/set_port_value", "isif", next_id(), port_path.c_str(), voice, @@ -340,7 +340,7 @@ OSCEngineSender::set_port_value_queued(const string& port_path, float val) { assert(_engine_addr); - lo_send(_engine_addr, "/om/synth/set_port_value_queued", "isf", + lo_send(_engine_addr, "/ingen/set_port_value_queued", "isf", next_id(), port_path.c_str(), val); @@ -365,7 +365,7 @@ void OSCEngineSender::midi_learn(const string& node_path) { assert(_engine_addr); - lo_send(_engine_addr, "/om/synth/midi_learn", "is", + lo_send(_engine_addr, "/ingen/midi_learn", "is", next_id(), node_path.c_str()); } @@ -383,7 +383,7 @@ OSCEngineSender::set_metadata(const string& obj_path, lo_message_add_string(m, obj_path.c_str()); lo_message_add_string(m, predicate.c_str()); Raul::AtomLiblo::lo_message_add_atom(m, value); - lo_send_message(_engine_addr, "/om/metadata/set", m); + lo_send_message(_engine_addr, "/ingen/set_metadata", m); } @@ -393,7 +393,7 @@ void OSCEngineSender::ping() { assert(_engine_addr); - lo_send(_engine_addr, "/om/ping", "i", next_id()); + lo_send(_engine_addr, "/ingen/ping", "i", next_id()); } @@ -401,7 +401,7 @@ void OSCEngineSender::request_plugin(const string& uri) { assert(_engine_addr); - lo_send(_engine_addr, "/om/request/plugin", "is", + lo_send(_engine_addr, "/ingen/request_plugin", "is", next_id(), uri.c_str()); } @@ -411,7 +411,7 @@ void OSCEngineSender::request_object(const string& path) { assert(_engine_addr); - lo_send(_engine_addr, "/om/request/object", "is", + lo_send(_engine_addr, "/ingen/request_object", "is", next_id(), path.c_str()); } @@ -421,7 +421,7 @@ void OSCEngineSender::request_port_value(const string& port_path) { assert(_engine_addr); - lo_send(_engine_addr, "/om/request/port_value", "is", + lo_send(_engine_addr, "/ingen/request_port_value", "is", next_id(), port_path.c_str()); } @@ -431,7 +431,7 @@ void OSCEngineSender::request_plugins() { assert(_engine_addr); - lo_send(_engine_addr, "/om/request/plugins", "i", next_id()); + lo_send(_engine_addr, "/ingen/request_plugins", "i", next_id()); } @@ -439,7 +439,7 @@ void OSCEngineSender::request_all_objects() { assert(_engine_addr); - lo_send(_engine_addr, "/om/request/all_objects", "i", next_id()); + lo_send(_engine_addr, "/ingen/request_all_objects", "i", next_id()); } diff --git a/src/libs/client/PortModel.h b/src/libs/client/PortModel.h index 35a19b56..15a381d4 100644 --- a/src/libs/client/PortModel.h +++ b/src/libs/client/PortModel.h @@ -34,7 +34,7 @@ namespace Client { /** Model of a port. * - * \ingroup IngenClient. + * \ingroup IngenClient */ class PortModel : public ObjectModel { diff --git a/src/libs/client/Serializer.cpp b/src/libs/client/Serializer.cpp index 1374ab12..1b274635 100644 --- a/src/libs/client/Serializer.cpp +++ b/src/libs/client/Serializer.cpp @@ -367,174 +367,6 @@ Serializer::serialize_connection(SharedPtr<ConnectionModel> connection) throw (s */ } -#if 0 -/** Load a patch into the engine (e.g. from a patch file). - * - * @param base_uri Base URI (e.g. URI of the file to load from). - * - * @param data_path Path of the patch relative to base_uri - * (e.g. relative to file root patch). - * - * @param engine_path Path in the engine for the newly created patch - * (i.e. 'destination' of the load). - * - * @param initial_data will be set last, so values passed there will override - * any values loaded from the patch file (or values in the existing patch). - * - * @param merge If true, the loaded patch's contents will be loaded into a - * currently existing patch. Errors may result if Nodes of conflicting names - * (etc) exist - the loaded patch will take precendence (ie overwriting - * existing values). If false and the patch at @a load_path already exists, - * load is aborted and false is returned. - * - * @param poly Polyphony of new loaded patch if given, otherwise polyphony - * will be loaded (unless saved polyphony isn't found, in which case it's 1). - * - * Returns whether or not patch was loaded. - */ -bool -Serializer::load_patch(bool merge, - const string& data_base_uri, - const Path& data_path, - MetadataMap engine_data, - optional<const Path&> engine_parent, - optional<const string&> engine_name, - optional<size_t> engine_poly) - -{ - cerr << "LOAD: " << data_base_uri << ", " << data_path << ", " << engine_parent << endl; -#if 0 - cerr << "[Serializer] Loading patch " << filename << "" << endl; - - Path path = "/"; // path of the new patch - - const bool load_name = (name == ""); - const bool load_poly = (poly == 0); - - if (initial_data.find("filename") == initial_data.end()) - initial_data["filename"] = Atom(filename.c_str()); // FIXME: URL? - - xmlDocPtr doc = xmlParseFile(filename.c_str()); - - if (!doc) { - cerr << "Unable to parse patch file." << endl; - return ""; - } - - xmlNodePtr cur = xmlDocGetRootElement(doc); - - if (!cur) { - cerr << "Empty document." << endl; - xmlFreeDoc(doc); - return ""; - } - - if (xmlStrcmp(cur->name, (const xmlChar*) "patch")) { - cerr << "File is not an Ingen patch file (root node != <patch>)" << endl; - xmlFreeDoc(doc); - return ""; - } - - xmlChar* key = NULL; - cur = cur->xmlChildrenNode; - - // Load Patch attributes - while (cur != NULL) { - key = xmlNodeListGetString(doc, cur->xmlChildrenNode, 1); - - if ((!xmlStrcmp(cur->name, (const xmlChar*)"name"))) { - if (load_name) { - assert(key != NULL); - if (parent_path != "") - path = Path(parent_path).base() + Path::nameify((char*)key); - } - } else if ((!xmlStrcmp(cur->name, (const xmlChar*)"polyphony"))) { - if (load_poly) { - poly = atoi((char*)key); - } - } else if (xmlStrcmp(cur->name, (const xmlChar*)"connection") - && xmlStrcmp(cur->name, (const xmlChar*)"node") - && xmlStrcmp(cur->name, (const xmlChar*)"subpatch") - && xmlStrcmp(cur->name, (const xmlChar*)"filename") - && xmlStrcmp(cur->name, (const xmlChar*)"preset")) { - // Don't know what this tag is, add it as metadata without overwriting - // (so caller can set arbitrary parameters which will be preserved) - if (key) - if (initial_data.find((const char*)cur->name) == initial_data.end()) - initial_data[(const char*)cur->name] = (const char*)key; - } - - xmlFree(key); - key = NULL; // Avoid a (possible?) double free - - cur = cur->next; - } - - if (poly == 0) - poly = 1; - - // Create it, if we're not merging - if (!existing) - _engine->create_patch_with_data(path, poly, initial_data); - - // Load nodes - cur = xmlDocGetRootElement(doc)->xmlChildrenNode; - while (cur != NULL) { - if ((!xmlStrcmp(cur->name, (const xmlChar*)"node"))) - load_node(path, doc, cur); - - cur = cur->next; - } - - // Load subpatches - cur = xmlDocGetRootElement(doc)->xmlChildrenNode; - while (cur != NULL) { - if ((!xmlStrcmp(cur->name, (const xmlChar*)"subpatch"))) { - load_subpatch(path, doc, cur); - } - cur = cur->next; - } - - // Load connections - cur = xmlDocGetRootElement(doc)->xmlChildrenNode; - while (cur != NULL) { - if ((!xmlStrcmp(cur->name, (const xmlChar*)"connection"))) { - load_connection(path, doc, cur); - } - cur = cur->next; - } - - - // Load presets (control values) - cerr << "FIXME: load preset\n"; - /*cur = xmlDocGetRootElement(doc)->xmlChildrenNode; - while (cur != NULL) { - if ((!xmlStrcmp(cur->name, (const xmlChar*)"preset"))) { - load_preset(pm, doc, cur); - assert(preset_model != NULL); - if (preset_model->name() == "default") - _engine->set_preset(pm->path(), preset_model); - } - cur = cur->next; - } - */ - - xmlFreeDoc(doc); - xmlCleanupParser(); - - // Done above.. late enough? - //_engine->set_metadata_map(path, initial_data); - - if (!existing) - _engine->enable_patch(path); - - _load_path_translations.clear(); - - return path; -#endif - return "/FIXME"; -} -#endif } // namespace Client } // namespace Ingen diff --git a/src/libs/client/Serializer.h b/src/libs/client/Serializer.h index 45407e52..83e85bf8 100644 --- a/src/libs/client/Serializer.h +++ b/src/libs/client/Serializer.h @@ -61,20 +61,6 @@ class Serializer public: Serializer(); - //void path(const string& path) { _patch_search_path = path; } - //const string& path() { return _patch_search_path; } - - //string find_file(const string& filename, const string& additional_path = ""); - - /*bool load_patch(bool merge, - const string& data_base_uri, - const Path& data_path, - MetadataMap engine_data, - optional<const Path&> engine_parent = optional<const Path&>(), - optional<const string&> engine_name = optional<const string&>(), - optional<size_t> engine_poly = optional<size_t>()); - */ - void start_to_filename(const string& filename) throw (std::logic_error); void start_to_string() throw (std::logic_error); void serialize(SharedPtr<ObjectModel> object) throw (std::logic_error); diff --git a/src/libs/engine/OSCClientSender.cpp b/src/libs/engine/OSCClientSender.cpp index a1f82fd5..e8eb9d05 100644 --- a/src/libs/engine/OSCClientSender.cpp +++ b/src/libs/engine/OSCClientSender.cpp @@ -89,10 +89,15 @@ OSCClientSender::transfer_end() * \n\n */ + +/** \page client_osc_namespace + * \n + * <h2>Control Band</h2> + */ /** \page client_osc_namespace - * <p> \b /om/response - Respond to a user command + * <p> \b /ingen/response - Respond to a user command * \arg \b response-id (int) - Request ID this is a response to * \arg \b success (boolean int) - Whether response is affirmative or an error * \arg \b message (string) - Error message (natural language text) @@ -104,7 +109,7 @@ OSCClientSender::response(int32_t id, bool success, string msg) if (!_enabled) return; - if (lo_send(_address, "/om/response", "iis", id, success ? 1 : 0, msg.c_str()) < 0) { + if (lo_send(_address, "/ingen/response", "iis", id, success ? 1 : 0, msg.c_str()) < 0) { cerr << "Unable to send response " << id << "! (" << lo_address_errstr(_address) << ")" << endl; } @@ -113,13 +118,13 @@ OSCClientSender::response(int32_t id, bool success, string msg) /** \page client_osc_namespace * \n - * <h3>Notification Band</h3> + * <h2>Notification Band</h2> */ + /** \page client_osc_namespace - * <p> \b /om/error - Notification that an error has occurred - * \arg \b message (string) - Error message (natural language text) - * + * <p> \b /ingen/error - Notification that an error has occurred + * \arg \b message (string) - Error message (natural language text) \n\n * \li This is for notification of errors that aren't a direct response to a * user command, ie "unexpected" errors.</p> \n \n */ @@ -129,23 +134,23 @@ OSCClientSender::error(string msg) if (!_enabled) return; - lo_send(_address, "/om/error", "s", msg.c_str()); + lo_send(_address, "/ingen/error", "s", msg.c_str()); } /** \page client_osc_namespace - * <p> \b /om/num_plugins - * \arg \b num (int) - Number of plugins engine has loaded + * <p> \b /ingen/num_plugins + * \arg \b num (int) - Number of plugins engine has loaded\n\n * \li This is sent before sending the list of plugins, so the client is aware - * of how many plugins (/om/plugin messages) to expect.</p> \n \n + * of how many plugins (/ingen/plugin messages) to expect.</p> \n \n */ /** \page client_osc_namespace - * <p> \b /om/num_plugins - * \arg \b num (int) - Number of plugins engine has loaded + * <p> \b /ingen/num_plugins + * \arg \b num (int) - Number of plugins engine has loaded\n\n * \li This is sent before sending the list of plugins, so the client is aware - * of how many plugins (/om/plugin messages) to expect.</p> \n \n + * of how many plugins (/ingen/plugin messages) to expect.</p> \n \n */ void OSCClientSender::num_plugins(uint32_t num) @@ -155,12 +160,12 @@ OSCClientSender::num_plugins(uint32_t num) lo_message m = lo_message_new(); lo_message_add_int32(m, num); - lo_send_message(_address, "/om/num_plugins", m); + lo_send_message(_address, "/ingen/num_plugins", m); } /** \page client_osc_namespace - * <p> \b /om/plugin - Notification of the existance of a plugin + * <p> \b /ingen/plugin - Notification of the existance of a plugin * \arg \b type (string) - Type if plugin ("LADSPA", "DSSI", or "Internal") * \arg \b uri (string) - URI of the plugin (see engine namespace documentation) \n * \arg \b lib-name (string) - Name of shared library plugin resides in (ie "cmt.so") @@ -184,7 +189,7 @@ OSCClientSender::plugins() list<lo_message> msgs; lo_message_add_int32(m, plugs.size()); - lo_bundle_add_message(b, "/om/num_plugins", m); + lo_bundle_add_message(b, "/ingen/num_plugins", m); msgs.push_back(m); for (list<Plugin*>::const_iterator j = plugs.begin(); j != plugs.end(); ++j) { @@ -195,7 +200,7 @@ OSCClientSender::plugins() lo_message_add_string(m, plugin->uri().c_str()); lo_message_add_string(m, plugin->plug_label().c_str()); lo_message_add_string(m, plugin->name().c_str()); - lo_bundle_add_message(b, "/om/plugin", m); + lo_bundle_add_message(b, "/ingen/plugin", m); msgs.push_back(m); if (lo_bundle_length(b) > 1024) { lo_send_bundle(_address, b); @@ -218,14 +223,14 @@ OSCClientSender::plugins() */ /** \page client_osc_namespace - * <p> \b /om/new_node - Notification of a new node's creation. + * <p> \b /ingen/new_node - Notification of a new node's creation. * \arg \b plug-uri (string) - URI of the plugin new node is an instance of * \arg \b path (string) - Path of the new node * \arg \b polyphonic (integer-boolean) - Node is polyphonic (1 = yes, 0 = no) - * \arg \b num-ports (integer) - Number of ports (number of new_port messages to expect) + * \arg \b num-ports (integer) - Number of ports (number of new_port messages to expect)\n\n * \li New nodes are sent as a bundle. The first message in the bundle will be - * this one (/om/new_node), followed by a series of /om/new_port commands, - * followed by /om/new_node_end. </p> \n \n + * this one (/ingen/new_node), followed by a series of /ingen/new_port commands, + * followed by /ingen/new_node_end. </p> \n \n */ void OSCClientSender::new_node(string plugin_uri, string node_path, @@ -237,7 +242,7 @@ void OSCClientSender::new_node(string plugin_uri, //cerr << "Sending node " << node_path << endl; - lo_send(_address, "/om/new_node", "ssii", plugin_uri.c_str(), + lo_send(_address, "/ingen/new_node", "ssii", plugin_uri.c_str(), node_path.c_str(), is_polyphonic ? 1 : 0, num_ports); #if 0 /* @@ -253,7 +258,7 @@ void OSCClientSender::new_node(string plugin_uri, lo_message_add_int32(m, is_polyphonic ? 1 : 0); lo_message_add_int32(m, num_ports); - lo_bundle_add_message(b, "/om/new_node", m); + lo_bundle_add_message(b, "/ingen/new_node", m); msgs.push_back(m); */ @@ -277,7 +282,7 @@ void OSCClientSender::new_node(string plugin_uri, lo_message_add_float(m, info->default_val()); lo_message_add_float(m, info->min_val()); lo_message_add_float(m, info->max_val()); - lo_bundle_add_message(b, "/om/new_port", m); + lo_bundle_add_message(b, "/ingen/new_port", m); msgs.push_back(m); // If the bundle is getting very large, send it and start @@ -290,7 +295,7 @@ void OSCClientSender::new_node(string plugin_uri, } */ /*m = lo_message_new(); - //lo_bundle_add_message(b, "/om/new_node_end", m); + //lo_bundle_add_message(b, "/ingen/new_node_end", m); //msgs.push_back(m); lo_send_bundle(_address, b); @@ -329,7 +334,7 @@ void OSCClientSender::new_node(string plugin_uri, /** \page client_osc_namespace - * <p> \b /om/new_port - Notification of a new port's creation. + * <p> \b /ingen/new_port - Notification of a new port's creation. * \arg \b path (string) - Path of new port * \arg \b data-type (string) - Type of port (ingen:audio, ingen:control, or ingen:midi) * \arg \b direction ("is-output") (integer) - Direction of data flow (Input = 0, Output = 1) @@ -352,7 +357,7 @@ OSCClientSender::new_port(string path, //PortInfo* info = port->port_info(); - lo_send(_address, "/om/new_port", "ssi", path.c_str(), data_type.c_str(), is_output); + lo_send(_address, "/ingen/new_port", "ssi", path.c_str(), data_type.c_str(), is_output); // Send metadata /*const map<string, string>& data = port->metadata(); @@ -362,7 +367,7 @@ OSCClientSender::new_port(string path, /** \page client_osc_namespace - * <p> \b /om/destroyed - Notification an object has been destroyed + * <p> \b /ingen/destroyed - Notification an object has been destroyed * \arg \b path (string) - Path of object (which no longer exists) </p> \n \n */ void @@ -373,12 +378,12 @@ OSCClientSender::object_destroyed(string path) assert(path != "/"); - lo_send(_address, "/om/destroyed", "s", path.c_str()); + lo_send(_address, "/ingen/destroyed", "s", path.c_str()); } /** \page client_osc_namespace - * <p> \b /om/patch_cleared - Notification a patch has been cleared (all children destroyed) + * <p> \b /ingen/patch_cleared - Notification a patch has been cleared (all children destroyed) * \arg \b path (string) - Path of patch (which is now empty)</p> \n \n */ void @@ -387,12 +392,12 @@ OSCClientSender::patch_cleared(string patch_path) if (!_enabled) return; - lo_send(_address, "/om/patch_cleared", "s", patch_path.c_str()); + lo_send(_address, "/ingen/patch_cleared", "s", patch_path.c_str()); } /** \page client_osc_namespace - * <p> \b /om/patch_enabled - Notification a patch's DSP processing has been enabled. + * <p> \b /ingen/patch_enabled - Notification a patch's DSP processing has been enabled. * \arg \b path (string) - Path of enabled patch</p> \n \n */ void @@ -401,12 +406,12 @@ OSCClientSender::patch_enabled(string patch_path) if (!_enabled) return; - lo_send(_address, "/om/patch_enabled", "s", patch_path.c_str()); + lo_send(_address, "/ingen/patch_enabled", "s", patch_path.c_str()); } /** \page client_osc_namespace - * <p> \b /om/patch_disabled - Notification a patch's DSP processing has been disabled. + * <p> \b /ingen/patch_disabled - Notification a patch's DSP processing has been disabled. * \arg \b path (string) - Path of disabled patch</p> \n \n */ void @@ -415,12 +420,12 @@ OSCClientSender::patch_disabled(string patch_path) if (!_enabled) return; - lo_send(_address, "/om/patch_disabled", "s", patch_path.c_str()); + lo_send(_address, "/ingen/patch_disabled", "s", patch_path.c_str()); } /** \page client_osc_namespace - * <p> \b /om/new_connection - Notification a new connection has been made. + * <p> \b /ingen/new_connection - Notification a new connection has been made. * \arg \b src-path (string) - Path of the source port * \arg \b dst-path (string) - Path of the destination port</p> \n \n */ @@ -430,12 +435,12 @@ OSCClientSender::connection(string src_port_path, string dst_port_path) if (!_enabled) return; - lo_send(_address, "/om/new_connection", "ss", src_port_path.c_str(), dst_port_path.c_str()); + lo_send(_address, "/ingen/new_connection", "ss", src_port_path.c_str(), dst_port_path.c_str()); } /** \page client_osc_namespace - * <p> \b /om/disconnection - Notification a connection has been unmade. + * <p> \b /ingen/disconnection - Notification a connection has been unmade. * \arg \b src-path (string) - Path of the source port * \arg \b dst-path (string) - Path of the destination port</p> \n \n */ @@ -445,12 +450,12 @@ OSCClientSender::disconnection(string src_port_path, string dst_port_path) if (!_enabled) return; - lo_send(_address, "/om/disconnection", "ss", src_port_path.c_str(), dst_port_path.c_str()); + lo_send(_address, "/ingen/disconnection", "ss", src_port_path.c_str(), dst_port_path.c_str()); } /** \page client_osc_namespace - * <p> \b /om/metadata/update - Notification of a piece of metadata. + * <p> \b /ingen/metadata_update - Notification of a piece of metadata. * \arg \b path (string) - Path of the object associated with metadata (can be a node, patch, or port) * \arg \b key (string) * \arg \b value (string)</p> \n \n @@ -465,12 +470,12 @@ OSCClientSender::metadata_update(string path, string key, Atom value) lo_message_add_string(m, path.c_str()); lo_message_add_string(m, key.c_str()); Raul::AtomLiblo::lo_message_add_atom(m, value); - lo_send_message(_address, "/om/metadata/update", m); + lo_send_message(_address, "/ingen/metadata_update", m); } /** \page client_osc_namespace - * <p> \b /om/control_change - Notification the value of a port has changed + * <p> \b /ingen/control_change - Notification the value of a port has changed * \arg \b path (string) - Path of port * \arg \b value (float) - New value of port * @@ -483,14 +488,14 @@ OSCClientSender::control_change(string port_path, float value) if (!_enabled) return; - lo_send(_address, "/om/control_change", "sf", port_path.c_str(), value); + lo_send(_address, "/ingen/control_change", "sf", port_path.c_str(), value); } /** \page client_osc_namespace - * <p> \b /om/plugin - Notification of the existance of a plugin - * \arg \b type (string) - Type if plugin ("LADSPA", "DSSI", or "Internal")</p> \n \n - * \arg \b uri (string) - Type if plugin ("LADSPA", "DSSI", or "Internal")</p> \n \n + * <p> \b /ingen/plugin - Notification of the existance of a plugin + * \arg \b type (string) - Type of plugin ("LADSPA", "DSSI", or "Internal") + * \arg \b uri (string) - Type of plugin ("LADSPA", "DSSI", or "Internal") * \arg \b name (string) - Descriptive human-readable name of plugin (ie "ADSR Envelope") */ void @@ -505,14 +510,14 @@ OSCClientSender::new_plugin(string uri, string type_uri, string name) lo_message_add_string(m, name.c_str()); //if (_transfer) - // lo_bundle_add_message(_transfer, "/om/plugin", m); + // lo_bundle_add_message(_transfer, "/ingen/plugin", m); //else - lo_send_message(_address, "/om/plugin", m); + lo_send_message(_address, "/ingen/plugin", m); } /** \page client_osc_namespace - * <p> \b /om/new_patch - Notification of a new patch + * <p> \b /ingen/new_patch - Notification of a new patch * \arg \b path (string) - Path of new patch * \arg \b poly (int) - Polyphony of new patch (\em not a boolean like new_node) </p> \n \n */ @@ -522,7 +527,7 @@ OSCClientSender::new_patch(string path, uint32_t poly) if (!_enabled) return; - lo_send(_address, "/om/new_patch", "si", path.c_str(), poly); + lo_send(_address, "/ingen/new_patch", "si", path.c_str(), poly); /* if (p->process()) @@ -538,7 +543,7 @@ OSCClientSender::new_patch(string path, uint32_t poly) /** \page client_osc_namespace - * <p> \b /om/object_renamed - Notification of an object's renaming + * <p> \b /ingen/object_renamed - Notification of an object's renaming * \arg \b old-path (string) - Old path of object * \arg \b new-path (string) - New path of object </p> \n \n */ @@ -548,7 +553,7 @@ OSCClientSender::object_renamed(string old_path, string new_path) if (!_enabled) return; - lo_send(_address, "/om/object_renamed", "ss", old_path.c_str(), new_path.c_str()); + lo_send(_address, "/ingen/object_renamed", "ss", old_path.c_str(), new_path.c_str()); } @@ -560,7 +565,7 @@ OSCClientSender::program_add(string node_path, uint32_t bank, uint32_t program, if (!_enabled) return; - lo_send(_address, "/om/program_add", "siis", + lo_send(_address, "/ingen/program_add", "siis", node_path.c_str(), bank, program, name.c_str()); } @@ -571,7 +576,7 @@ OSCClientSender::program_remove(string node_path, uint32_t bank, uint32_t progra if (!_enabled) return; - lo_send(_address, "/om/program_remove", "sii", + lo_send(_address, "/ingen/program_remove", "sii", node_path.c_str(), bank, program); } diff --git a/src/libs/engine/OSCEngineReceiver.cpp b/src/libs/engine/OSCEngineReceiver.cpp index 8b1ea85f..218af3c5 100644 --- a/src/libs/engine/OSCEngineReceiver.cpp +++ b/src/libs/engine/OSCEngineReceiver.cpp @@ -44,7 +44,7 @@ using Shared::ClientKey; * * <p>All commands on this page are in the "control band". If a client needs to * know about the state of the engine, it must listen to the "notification band". - * See the "Client OSC Namespace Documentation" for details. + * See the "Client OSC Namespace Documentation" for details.</p>\n\n */ @@ -74,47 +74,43 @@ OSCEngineReceiver::OSCEngineReceiver(SharedPtr<Engine> engine, size_t queue_size lo_server_add_method(_server, NULL, NULL, set_response_address_cb, this); // Commands - lo_server_add_method(_server, "/om/ping", "i", ping_cb, this); - lo_server_add_method(_server, "/om/ping_slow", "i", ping_slow_cb, this); - lo_server_add_method(_server, "/om/engine/quit", "i", quit_cb, this); - //lo_server_add_method(_server, "/om/engine/register_client", "is", register_client_cb, this); - lo_server_add_method(_server, "/om/engine/register_client", "i", register_client_cb, this); - lo_server_add_method(_server, "/om/engine/unregister_client", "i", unregister_client_cb, this); - lo_server_add_method(_server, "/om/engine/load_plugins", "i", load_plugins_cb, this); - lo_server_add_method(_server, "/om/engine/activate", "i", engine_activate_cb, this); - lo_server_add_method(_server, "/om/engine/deactivate", "i", engine_deactivate_cb, this); - lo_server_add_method(_server, "/om/synth/create_patch", "isi", create_patch_cb, this); - lo_server_add_method(_server, "/om/synth/enable_patch", "is", enable_patch_cb, this); - lo_server_add_method(_server, "/om/synth/disable_patch", "is", disable_patch_cb, this); - lo_server_add_method(_server, "/om/synth/clear_patch", "is", clear_patch_cb, this); - lo_server_add_method(_server, "/om/synth/create_port", "issi", create_port_cb, this); - lo_server_add_method(_server, "/om/synth/create_node", "issssi", create_node_cb, this); - lo_server_add_method(_server, "/om/synth/create_node", "issi", create_node_by_uri_cb, this); - lo_server_add_method(_server, "/om/synth/destroy", "is", destroy_cb, this); - lo_server_add_method(_server, "/om/synth/rename", "iss", rename_cb, this); - lo_server_add_method(_server, "/om/synth/connect", "iss", connect_cb, this); - lo_server_add_method(_server, "/om/synth/disconnect", "iss", disconnect_cb, this); - lo_server_add_method(_server, "/om/synth/disconnect_all", "is", disconnect_all_cb, this); - lo_server_add_method(_server, "/om/synth/set_port_value", "isf", set_port_value_cb, this); - lo_server_add_method(_server, "/om/synth/set_port_value", "isif", set_port_value_voice_cb, this); - lo_server_add_method(_server, "/om/synth/set_port_value_slow", "isf", set_port_value_slow_cb, this); - lo_server_add_method(_server, "/om/synth/note_on", "isii", note_on_cb, this); - lo_server_add_method(_server, "/om/synth/note_off", "isi", note_off_cb, this); - lo_server_add_method(_server, "/om/synth/all_notes_off", "isi", all_notes_off_cb, this); - lo_server_add_method(_server, "/om/synth/midi_learn", "is", midi_learn_cb, this); -#ifdef HAVE_LASH - lo_server_add_method(_server, "/om/lash/restore_finished", "i", lash_restore_done_cb, this); -#endif - - lo_server_add_method(_server, "/om/metadata/request", "isss", metadata_get_cb, this); - lo_server_add_method(_server, "/om/metadata/set", NULL, metadata_set_cb, this); - + lo_server_add_method(_server, "/ingen/ping", "i", ping_cb, this); + lo_server_add_method(_server, "/ingen/ping_queued", "i", ping_slow_cb, this); + lo_server_add_method(_server, "/ingen/quit", "i", quit_cb, this); + //lo_server_add_method(_server, "/ingen/register_client", "is", register_client_cb, this); + lo_server_add_method(_server, "/ingen/register_client", "i", register_client_cb, this); + lo_server_add_method(_server, "/ingen/unregister_client", "i", unregister_client_cb, this); + lo_server_add_method(_server, "/ingen/load_plugins", "i", load_plugins_cb, this); + lo_server_add_method(_server, "/ingen/activate", "i", engine_activate_cb, this); + lo_server_add_method(_server, "/ingen/deactivate", "i", engine_deactivate_cb, this); + lo_server_add_method(_server, "/ingen/create_patch", "isi", create_patch_cb, this); + lo_server_add_method(_server, "/ingen/enable_patch", "is", enable_patch_cb, this); + lo_server_add_method(_server, "/ingen/disable_patch", "is", disable_patch_cb, this); + lo_server_add_method(_server, "/ingen/clear_patch", "is", clear_patch_cb, this); + lo_server_add_method(_server, "/ingen/create_port", "issi", create_port_cb, this); + lo_server_add_method(_server, "/ingen/create_node", "issssi", create_node_cb, this); + lo_server_add_method(_server, "/ingen/create_node", "issi", create_node_by_uri_cb, this); + lo_server_add_method(_server, "/ingen/destroy", "is", destroy_cb, this); + lo_server_add_method(_server, "/ingen/rename", "iss", rename_cb, this); + lo_server_add_method(_server, "/ingen/connect", "iss", connect_cb, this); + lo_server_add_method(_server, "/ingen/disconnect", "iss", disconnect_cb, this); + lo_server_add_method(_server, "/ingen/disconnect_all", "is", disconnect_all_cb, this); + lo_server_add_method(_server, "/ingen/set_port_value", "isf", set_port_value_cb, this); + lo_server_add_method(_server, "/ingen/set_port_value", "isif", set_port_value_voice_cb, this); + lo_server_add_method(_server, "/ingen/set_port_value_queued", "isf", set_port_value_slow_cb, this); + lo_server_add_method(_server, "/ingen/note_on", "isii", note_on_cb, this); + lo_server_add_method(_server, "/ingen/note_off", "isi", note_off_cb, this); + lo_server_add_method(_server, "/ingen/all_notes_off", "isi", all_notes_off_cb, this); + lo_server_add_method(_server, "/ingen/midi_learn", "is", midi_learn_cb, this); + lo_server_add_method(_server, "/ingen/set_metadata", NULL, metadata_set_cb, this); + // Queries - lo_server_add_method(_server, "/om/request/plugin", "is", request_plugin_cb, this); - lo_server_add_method(_server, "/om/request/object", "is", request_object_cb, this); - lo_server_add_method(_server, "/om/request/port_value", "is", request_port_value_cb, this); - lo_server_add_method(_server, "/om/request/plugins", "i", request_plugins_cb, this); - lo_server_add_method(_server, "/om/request/all_objects", "i", request_all_objects_cb, this); + lo_server_add_method(_server, "/ingen/request_metadata", "iss", metadata_get_cb, this); + lo_server_add_method(_server, "/ingen/request_plugin", "is", request_plugin_cb, this); + lo_server_add_method(_server, "/ingen/request_object", "is", request_object_cb, this); + lo_server_add_method(_server, "/ingen/request_port_value", "is", request_port_value_cb, this); + lo_server_add_method(_server, "/ingen/request_plugins", "i", request_plugins_cb, this); + lo_server_add_method(_server, "/ingen/request_all_objects", "i", request_all_objects_cb, this); // DSSI support @@ -274,7 +270,7 @@ OSCEngineReceiver::error_cb(int num, const char* msg, const char* path) /** \page engine_osc_namespace - * <p> \b /om/ping - Immediately sends a successful response to the given response id. + * <p> \b /ingen/ping - Immediately sends a successful response to the given response id. * \arg \b response-id (integer) </p> \n \n */ int @@ -286,11 +282,11 @@ OSCEngineReceiver::_ping_cb(const char* path, const char* types, lo_arg** argv, /** \page engine_osc_namespace - * <p> \b /om/ping_slow - Sends response after going through the ("slow") event queue. + * <p> \b /ingen/ping_queued - Sends response after going through the event queue. * \arg \b response-id (integer) * - * \li See the documentation for /om/synth/set_port_value_slow for an explanation of how - * this differs from /om/ping. This is useful to send after sending a large cluster of + * \li See the documentation for /ingen/set_port_value_queued for an explanation of how + * this differs from /ingen/ping. This is useful to send after sending a large cluster of * events as a sentinel and wait on it's response, to know when the events are all * finished processing.</p> \n \n */ @@ -303,7 +299,7 @@ OSCEngineReceiver::_ping_slow_cb(const char* path, const char* types, lo_arg** a /** \page engine_osc_namespace - * <p> \b /om/engine/quit - Terminates the engine. + * <p> \b /ingen/quit - Terminates the engine. * \arg \b response-id (integer) * * \li Note that there is NO order guarantees with this command at all. You could @@ -313,22 +309,20 @@ OSCEngineReceiver::_ping_slow_cb(const char* path, const char* types, lo_arg** a int OSCEngineReceiver::_quit_cb(const char* path, const char* types, lo_arg** argv, int argc, lo_message msg) { - quit(); return 0; } /** \page engine_osc_namespace - * <p> \b /om/engine/register_client - Registers a new client with the engine - * \arg \b response-id (integer) - * - * The incoming address will be used for the new registered client. If you - * want to register a different specific address, use the URL version. + * <p> \b /ingen/register_client - Registers a new client with the engine + * \arg \b response-id (integer) \n\n + * \li The incoming address will be used for the new registered client. If you + * want to register a different specific address, use the URL version. </p> \n \n */ int OSCEngineReceiver::_register_client_cb(const char* path, const char* types, lo_arg** argv, int argc, lo_message msg) { - lo_address addr = lo_message_get_source(msg); + lo_address addr = lo_message_get_source(msg); char* const url = lo_address_get_url(addr); SharedPtr<ClientInterface> client(new OSCClientSender((const char*)url)); @@ -340,13 +334,13 @@ OSCEngineReceiver::_register_client_cb(const char* path, const char* types, lo_a /** \page engine_osc_namespace - * <p> \b /om/engine/unregister_client - Unregisters a client + * <p> \b /ingen/unregister_client - Unregisters a client * \arg \b response-id (integer) </p> \n \n */ int OSCEngineReceiver::_unregister_client_cb(const char* path, const char* types, lo_arg** argv, int argc, lo_message msg) { - lo_address addr = lo_message_get_source(msg); + lo_address addr = lo_message_get_source(msg); char* url = lo_address_get_url(addr); unregister_client(ClientKey(ClientKey::OSC_URL, url)); @@ -357,7 +351,7 @@ OSCEngineReceiver::_unregister_client_cb(const char* path, const char* types, lo /** \page engine_osc_namespace - * <p> \b /om/engine/load_plugins - Locates all available plugins, making them available for use. + * <p> \b /ingen/load_plugins - Locates all available plugins, making them available for use. * \arg \b response-id (integer) </p> \n \n */ int @@ -369,7 +363,7 @@ OSCEngineReceiver::_load_plugins_cb(const char* path, const char* types, lo_arg* /** \page engine_osc_namespace - * <p> \b /om/engine/activate - Activate the engine (MIDI, audio, everything) + * <p> \b /ingen/activate - Activate the engine (MIDI, audio, everything) * \arg \b response-id (integer) </p> * * \li Note that you <b>must</b> send this message first if you want the engine to do @@ -384,7 +378,7 @@ OSCEngineReceiver::_engine_activate_cb(const char* path, const char* types, lo_a /** \page engine_osc_namespace - * <p> \b /om/engine/deactivate - Deactivate the engine completely. + * <p> \b /ingen/deactivate - Deactivate the engine completely. * \arg \b response-id (integer) </p> \n \n */ int @@ -396,7 +390,7 @@ OSCEngineReceiver::_engine_deactivate_cb(const char* path, const char* types, lo /** \page engine_osc_namespace - * <p> \b /om/synth/create_patch - Creates a new, empty, toplevel patch. + * <p> \b /ingen/create_patch - Creates a new, empty, toplevel patch. * \arg \b response-id (integer) * \arg \b patch-path (string) - Patch path (complete, ie /master/parent/new_patch) * \arg \b poly (integer) - Patch's (internal) polyphony </p> \n \n @@ -413,7 +407,7 @@ OSCEngineReceiver::_create_patch_cb(const char* path, const char* types, lo_arg* /** \page engine_osc_namespace - * <p> \b /om/synth/rename - Rename an Object (only Nodes, for now) + * <p> \b /ingen/rename - Rename an Object (only Nodes, for now) * \arg \b response-id (integer) * \arg \b path - Object's path * \arg \b name - New name for object </p> \n \n @@ -430,9 +424,9 @@ OSCEngineReceiver::_rename_cb(const char* path, const char* types, lo_arg** argv /** \page engine_osc_namespace - * <p> \b /om/synth/enable_patch - Enable DSP processing of a patch + * <p> \b /ingen/enable_patch - Enable DSP processing of a patch * \arg \b response-id (integer) - * \arg \b patch-path - Patch's path + * \arg \b patch-path - Patch's path </p> \n \n */ int OSCEngineReceiver::_enable_patch_cb(const char* path, const char* types, lo_arg** argv, int argc, lo_message msg) @@ -445,9 +439,9 @@ OSCEngineReceiver::_enable_patch_cb(const char* path, const char* types, lo_arg* /** \page engine_osc_namespace - * <p> \b /om/synth/disable_patch - Disable DSP processing of a patch + * <p> \b /ingen/disable_patch - Disable DSP processing of a patch * \arg \b response-id (integer) - * \arg \b patch-path - Patch's path + * \arg \b patch-path - Patch's path </p> \n \n */ int OSCEngineReceiver::_disable_patch_cb(const char* path, const char* types, lo_arg** argv, int argc, lo_message msg) @@ -460,9 +454,9 @@ OSCEngineReceiver::_disable_patch_cb(const char* path, const char* types, lo_arg /** \page engine_osc_namespace - * <p> \b /om/synth/clear_patch - Remove all nodes from a patch + * <p> \b /ingen/clear_patch - Remove all nodes from a patch * \arg \b response-id (integer) - * \arg \b patch-path - Patch's path + * \arg \b patch-path - Patch's path </p> \n \n */ int OSCEngineReceiver::_clear_patch_cb(const char* path, const char* types, lo_arg** argv, int argc, lo_message msg) @@ -475,7 +469,7 @@ OSCEngineReceiver::_clear_patch_cb(const char* path, const char* types, lo_arg** /** \page engine_osc_namespace - * <p> \b /om/synth/create_port - Add a port into a given patch (load a plugin by URI) + * <p> \b /ingen/create_port - Add a port into a given patch (load a plugin by URI) * \arg \b response-id (integer) * \arg \b path (string) - Full path of the new port (ie. /patch2/subpatch/newport) * \arg \b data-type (string) - Data type for port to contain ("ingen:audio", "ingen:control", or "ingen:midi") @@ -493,7 +487,7 @@ OSCEngineReceiver::_create_port_cb(const char* path, const char* types, lo_arg** } /** \page engine_osc_namespace - * <p> \b /om/synth/create_node - Add a node into a given patch (load a plugin by URI) + * <p> \b /ingen/create_node - Add a node into a given patch (load a plugin by URI) * \arg \b response-id (integer) * \arg \b node-path (string) - Full path of the new node (ie. /patch2/subpatch/newnode) * \arg \b plug-uri (string) - URI of the plugin to load @@ -514,7 +508,7 @@ OSCEngineReceiver::_create_node_by_uri_cb(const char* path, const char* types, l /** \page engine_osc_namespace - * <p> \b /om/synth/create_node - Add a node into a given patch (load a plugin by libname, label) \b DEPRECATED + * <p> \b /ingen/create_node - Add a node into a given patch (load a plugin by libname, label) \b DEPRECATED * \arg \b response-id (integer) * \arg \b node-path (string) - Full path of the new node (ie. /patch2/subpatch/newnode) * \arg \b type (string) - Plugin type ("LADSPA" or "Internal") @@ -541,7 +535,7 @@ OSCEngineReceiver::_create_node_cb(const char* path, const char* types, lo_arg** /** \page engine_osc_namespace - * <p> \b /om/synth/destroy - Removes (destroys) a Patch or a Node + * <p> \b /ingen/destroy - Removes (destroys) a Patch or a Node * \arg \b response-id (integer) * \arg \b node-path (string) - Full path of the object </p> \n \n */ @@ -556,7 +550,7 @@ OSCEngineReceiver::_destroy_cb(const char* path, const char* types, lo_arg** arg /** \page engine_osc_namespace - * <p> \b /om/synth/connect - Connects two ports (must be in the same patch) + * <p> \b /ingen/connect - Connects two ports (must be in the same patch) * \arg \b response-id (integer) * \arg \b src-port-path (string) - Full path of source port * \arg \b dst-port-path (string) - Full path of destination port </p> \n \n @@ -573,7 +567,7 @@ OSCEngineReceiver::_connect_cb(const char* path, const char* types, lo_arg** arg /** \page engine_osc_namespace - * <p> \b /om/synth/disconnect - Disconnects two ports. + * <p> \b /ingen/disconnect - Disconnects two ports. * \arg \b response-id (integer) * \arg \b src-port-path (string) - Full path of source port * \arg \b dst-port-path (string) - Full path of destination port </p> \n \n @@ -590,7 +584,7 @@ OSCEngineReceiver::_disconnect_cb(const char* path, const char* types, lo_arg** /** \page engine_osc_namespace - * <p> \b /om/synth/disconnect_all - Disconnect all connections to/from a node. + * <p> \b /ingen/disconnect_all - Disconnect all connections to/from a node. * \arg \b response-id (integer) * \arg \b node-path (string) - Full path of node. </p> \n \n */ @@ -605,7 +599,7 @@ OSCEngineReceiver::_disconnect_all_cb(const char* path, const char* types, lo_ar /** \page engine_osc_namespace - * <p> \b /om/synth/set_port_value - Sets the value of a port for all voices (both AR and CR) + * <p> \b /ingen/set_port_value - Sets the value of a port for all voices (both AR and CR) * \arg \b response-id (integer) * \arg \b port-path (string) - Name of port * \arg \b value (float) - Value to set port to @@ -622,7 +616,7 @@ OSCEngineReceiver::_set_port_value_cb(const char* path, const char* types, lo_ar /** \page engine_osc_namespace - * <p> \b /om/synth/set_port_value - Sets the value of a port for a specific voice (both AR and CR) + * <p> \b /ingen/set_port_value - Sets the value of a port for a specific voice (both AR and CR) * \arg \b response-id (integer) * \arg \b port-path (string) - Name of port * \arg \b voice (integer) - Voice to set port value for @@ -641,14 +635,14 @@ OSCEngineReceiver::_set_port_value_voice_cb(const char* path, const char* types, /** \page engine_osc_namespace - * <p> \b /om/synth/set_port_value_slow - Sets the value of a port for all voices (as a QueuedEvent) + * <p> \b /ingen/set_port_value_queued - Sets the value of a port for all voices (as a QueuedEvent) * \arg \b response-id (integer) * \arg \b port-path (string) - Name of port * \arg \b value (float) - Value to set port to * * \li This version exists so you can send it immediately after a QueuedEvent it may depend on (ie a * node creation) and be sure it happens after the event (a normal set_port_value could beat the - * slow event and arrive out of order). </p> \n \n + * queued event and arrive out of order). </p> \n \n */ int OSCEngineReceiver::_set_port_value_slow_cb(const char* path, const char* types, lo_arg** argv, int argc, lo_message msg) @@ -662,7 +656,7 @@ OSCEngineReceiver::_set_port_value_slow_cb(const char* path, const char* types, /** \page engine_osc_namespace - * <p> \b /om/synth/note_on - Triggers a note-on, just as if it came from MIDI + * <p> \b /ingen/note_on - Triggers a note-on, just as if it came from MIDI * \arg \b response-id (integer) * \arg \b node-path (string) - Patch of Node to trigger (must be a trigger or note node) * \arg \b note-num (int) - MIDI style note number (0-127) @@ -684,7 +678,7 @@ OSCEngineReceiver::_note_on_cb(const char* path, const char* types, lo_arg** arg /** \page engine_osc_namespace - * <p> \b /om/synth/note_off - Triggers a note-off, just as if it came from MIDI + * <p> \b /ingen/note_off - Triggers a note-off, just as if it came from MIDI * \arg \b response-id (integer) * \arg \b node-path (string) - Patch of Node to trigger (must be a trigger or note node) * \arg \b note-num (int) - MIDI style note number (0-127)</p> \n \n @@ -704,7 +698,7 @@ OSCEngineReceiver::_note_off_cb(const char* path, const char* types, lo_arg** ar /** \page engine_osc_namespace - * <p> \b /om/synth/all_notes_off - Triggers a note-off for all voices, just as if it came from MIDI + * <p> \b /ingen/all_notes_off - Triggers a note-off for all voices, just as if it came from MIDI * \arg \b response-id (integer) * \arg \b patch-path (string) - Patch of patch to send event to </p> \n \n */ @@ -722,7 +716,7 @@ OSCEngineReceiver::_all_notes_off_cb(const char* path, const char* types, lo_arg /** \page engine_osc_namespace - * <p> \b /om/synth/midi_learn - Initiate MIDI learn for a given (MIDI Control) Node + * <p> \b /ingen/midi_learn - Initiate MIDI learn for a given (MIDI Control) Node * \arg \b response-id (integer) * \arg \b node-path (string) - Patch of the Node that should learn the next MIDI event. * @@ -742,26 +736,12 @@ OSCEngineReceiver::_midi_learn_cb(const char* path, const char* types, lo_arg** } -#ifdef HAVE_LASH /** \page engine_osc_namespace - * <p> \b /om/lash/restore_done - Notify LASH restoring is finished and connections can be made. - * \arg \b response-id (integer) - */ -int -OSCEngineReceiver::_lash_restore_done_cb(const char* path, const char* types, lo_arg** argv, int argc, lo_message msg) -{ - lash_restore_done(); - return 0; -} -#endif // HAVE_LASH - - -/** \page engine_osc_namespace - * <p> \b /om/metadata/set - Sets a piece of metadata, associated with a synth-space object (node, etc) + * <p> \b /ingen/set_metadata - Sets a piece of metadata, associated with a synth-space object (node, etc) * \arg \b response-id (integer) * \arg \b object-path (string) - Full path of object to associate metadata with * \arg \b key (string) - Key (index) for new piece of metadata - * \arg \b value (string) - Value of new piece of metadata + * \arg \b value (string) - Value of new piece of metadata </p> \n \n */ int OSCEngineReceiver::_metadata_set_cb(const char* path, const char* types, lo_arg** argv, int argc, lo_message msg) @@ -781,7 +761,7 @@ OSCEngineReceiver::_metadata_set_cb(const char* path, const char* types, lo_arg* /** \page engine_osc_namespace - * <p> \b /om/metadata/responder - Requests the engine send a piece of metadata, associated with a synth-space object (node, etc) + * <p> \b /ingen/request_metadata - Requests the engine send a piece of metadata, associated with a synth-space object (node, etc) * \arg \b response-id (integer) * \arg \b object-path (string) - Full path of object metadata is associated with * \arg \b key (string) - Key (index) for piece of metadata @@ -808,11 +788,10 @@ OSCEngineReceiver::_metadata_get_cb(const char* path, const char* types, lo_arg* /** \page engine_osc_namespace - * <p> \b /om/responder/plugin - Requests the engine send the value of a port. + * <p> \b /ingen/request_plugin - Requests the engine send the value of a port. * \arg \b response-id (integer) - * \arg \b port-path (string) - Full path of port to send the value of </p> \n \n - * - * \li Reply will be sent to client registered with the source address of this message.</p> \n \n + * \arg \b port-path (string) - Full path of port to send the value of \n\n + * \li Reply will be sent to client registered with the source address of this message.</p>\n\n */ int OSCEngineReceiver::_request_plugin_cb(const char* path, const char* types, lo_arg** argv, int argc, lo_message msg) @@ -826,11 +805,10 @@ OSCEngineReceiver::_request_plugin_cb(const char* path, const char* types, lo_ar /** \page engine_osc_namespace - * <p> \b /om/responder/object - Requests the engine send the value of a port. + * <p> \b /ingen/request_object - Requests the engine send the value of a port. * \arg \b response-id (integer) - * \arg \b port-path (string) - Full path of port to send the value of </p> \n \n - * - * \li Reply will be sent to client registered with the source address of this message.</p> \n \n + * \arg \b port-path (string) - Full path of port to send the value of \n\n + * \li Reply will be sent to client registered with the source address of this message.</p>\n\n */ int OSCEngineReceiver::_request_object_cb(const char* path, const char* types, lo_arg** argv, int argc, lo_message msg) @@ -844,11 +822,10 @@ OSCEngineReceiver::_request_object_cb(const char* path, const char* types, lo_ar /** \page engine_osc_namespace - * <p> \b /om/responder/port_value - Requests the engine send the value of a port. + * <p> \b /ingen/request_port_value - Requests the engine send the value of a port. * \arg \b response-id (integer) - * \arg \b port-path (string) - Full path of port to send the value of </p> \n \n - * - * \li Reply will be sent to client registered with the source address of this message.</p> \n \n + * \arg \b port-path (string) - Full path of port to send the value of \n\n + * \li Reply will be sent to client registered with the source address of this message.</p>\n\n */ int OSCEngineReceiver::_request_port_value_cb(const char* path, const char* types, lo_arg** argv, int argc, lo_message msg) @@ -861,10 +838,9 @@ OSCEngineReceiver::_request_port_value_cb(const char* path, const char* types, l /** \page engine_osc_namespace - * <p> \b /om/responder/plugins - Requests the engine send a list of all known plugins. - * \arg \b response-id (integer) - * - * \li Reply will be sent to client registered with the source address of this message.</p> \n \n + * <p> \b /ingen/request_plugins - Requests the engine send a list of all known plugins. + * \arg \b response-id (integer) \n\n + * \li Reply will be sent to client registered with the source address of this message.</p>\n\n */ int OSCEngineReceiver::_request_plugins_cb(const char* path, const char* types, lo_arg** argv, int argc, lo_message msg) @@ -875,9 +851,8 @@ OSCEngineReceiver::_request_plugins_cb(const char* path, const char* types, lo_a /** \page engine_osc_namespace - * <p> \b /om/responder/all_objects - Requests the engine send information about \em all objects (patches, nodes, etc) - * \arg \b response-id (integer) - * + * <p> \b /ingen/request_all_objects - Requests the engine send information about \em all objects (patches, nodes, etc) + * \arg \b response-id (integer)\n\n * \li Reply will be sent to client registered with the source address of this message.</p> \n \n */ int diff --git a/src/libs/engine/OSCEngineReceiver.h b/src/libs/engine/OSCEngineReceiver.h index 62e854e3..15fae6cd 100644 --- a/src/libs/engine/OSCEngineReceiver.h +++ b/src/libs/engine/OSCEngineReceiver.h @@ -113,9 +113,6 @@ private: #ifdef HAVE_DSSI LO_HANDLER(dssi); #endif -#ifdef HAVE_LASH - LO_HANDLER(lash_restore_done); -#endif const char* const _port; lo_server _server; diff --git a/src/libs/engine/OSCResponder.cpp b/src/libs/engine/OSCResponder.cpp index b1fd90de..dcec4641 100644 --- a/src/libs/engine/OSCResponder.cpp +++ b/src/libs/engine/OSCResponder.cpp @@ -62,7 +62,7 @@ OSCResponder::respond_ok() _addr = lo_address_new_from_url(_url); //cerr << "OK " << _id << endl; - if (lo_send(_addr, "/om/response", "iis", _id, 1, "") < 0) { + if (lo_send(_addr, "/ingen/response", "iis", _id, 1, "") < 0) { cerr << "Unable to send response " << _id << "! (" << lo_address_errstr(_addr) << ")" << endl; } @@ -79,7 +79,7 @@ OSCResponder::respond_error(const string& msg) _addr = lo_address_new_from_url(_url); //cerr << "ERR " << _id << endl; - if (lo_send(_addr, "/om/response", "iis",_id, 0, msg.c_str()) < 0) { + if (lo_send(_addr, "/ingen/response", "iis",_id, 0, msg.c_str()) < 0) { cerr << "Unable to send response " << _id << "! (" << lo_address_errstr(_addr) << endl; } diff --git a/src/progs/ingenuity/Configuration.cpp b/src/progs/ingenuity/Configuration.cpp index 25840073..4d2b8e07 100644 --- a/src/progs/ingenuity/Configuration.cpp +++ b/src/progs/ingenuity/Configuration.cpp @@ -37,7 +37,7 @@ using namespace Ingen::Client; Configuration::Configuration() -: _patch_path("/usr/share/om/patches:/usr/local/share/om/patches"), +: _patch_path("/usr/share/ingen/patches:/usr/local/share/ingen/patches"), _audio_port_color( 0x394f66B0), _control_port_color(0x396639B0), _midi_port_color( 0x663939B0) |