From 3593abd69807674d9949134f1ad2b7f5a9f69dc2 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Sun, 28 Sep 2008 22:04:26 +0000 Subject: Merge weird split set_port_value / set_port_value_immediately API (whether a command is queued or 'immediate' is a property of the engine interface, really). git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@1532 a436a847-0d15-0410-975c-d299462d15a1 --- src/libs/engine/OSCEngineReceiver.cpp | 87 +++---------------------------- src/libs/engine/OSCEngineReceiver.hpp | 1 - src/libs/engine/QueuedEngineInterface.cpp | 17 ------ src/libs/engine/QueuedEngineInterface.hpp | 7 --- 4 files changed, 6 insertions(+), 106 deletions(-) (limited to 'src/libs/engine') diff --git a/src/libs/engine/OSCEngineReceiver.cpp b/src/libs/engine/OSCEngineReceiver.cpp index f71bdb83..dbdb388d 100644 --- a/src/libs/engine/OSCEngineReceiver.cpp +++ b/src/libs/engine/OSCEngineReceiver.cpp @@ -70,7 +70,7 @@ OSCEngineReceiver::OSCEngineReceiver(Engine& engine, size_t queue_size, uint16_t } // For debugging, print all incoming OSC messages - //lo_server_add_method(_server, NULL, NULL, generic_cb, NULL); + lo_server_add_method(_server, NULL, NULL, generic_cb, NULL); // Set response address for this message. // It's important this is first and returns nonzero. @@ -102,7 +102,6 @@ OSCEngineReceiver::OSCEngineReceiver(Engine& engine, size_t queue_size, uint16_t lo_server_add_method(_server, "/ingen/disconnect", "iss", disconnect_cb, this); lo_server_add_method(_server, "/ingen/disconnect_all", "iss", disconnect_all_cb, this); lo_server_add_method(_server, "/ingen/set_port_value", NULL, set_port_value_cb, this); - lo_server_add_method(_server, "/ingen/set_port_value_immediate", NULL, set_port_value_immediate_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); @@ -579,85 +578,11 @@ OSCEngineReceiver::_disconnect_all_cb(const char* path, const char* types, lo_ar } -/** \page engine_osc_namespace - *

\b /ingen/set_port_value_immediate - 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 type (string (URI or QName)) - Type of value being set (ingen:Float or ingen:EventBuffer) - * \arg \b value (float or blob) - Value to set port to

\n \n - */ -/** \page engine_osc_namespace - *

\b /ingen/set_port_value_immediate - 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 type (string (URI or QName)) - Type of value being set (ingen:Float or ingen:Event) - * \arg \b voice (integer) - Voice to set port value for - * \arg \b value (float or blob) - Value to set port to

\n \n - * - * See documentation for set_port_value for the distinction between these two messages. - */ -int -OSCEngineReceiver::_set_port_value_immediate_cb(const char* path, const char* types, lo_arg** argv, int argc, lo_message msg) -{ - if (argc < 3 || argc > 5 || strncmp(types, "is", 2)) - return 1; - - const char* port_path = &argv[1]->s; - using Raul::Atom; - - if (!strcmp(types, "isf")) { // float, all voices - const float value = argv[2]->f; - set_port_value_immediate(port_path, Atom(value)); - } else if (!strcmp(types, "isif")) { // float, specific voice - const float value = argv[3]->f; - set_voice_value_immediate(port_path, argv[2]->i, Atom(value)); - } else if (!strcmp(types, "issb")) { // blob (event), all voices - const char* type = &argv[2]->s; - lo_blob b = argv[3]; - size_t data_size = lo_blob_datasize(b); - void* data = lo_blob_dataptr(b); - set_port_value_immediate(port_path, Atom(type, data_size, data)); - } else if (!strcmp(types, "isisb")) { // blob (event), specific voice - const char* type = &argv[3]->s; - lo_blob b = argv[4]; - size_t data_size = lo_blob_datasize(b); - void* data = lo_blob_dataptr(b); - set_voice_value_immediate(port_path, argv[2]->i, Atom(type, data_size, data)); - } else { - return 1; - } - - return 0; -} - - -/** \page engine_osc_namespace - *

\b /ingen/set_port_value - 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 is the queued way to set a port value (it is in the same threading class as e.g. - * node creation). This way the client can stream a sequence of events which depend on each - * other (e.g. a node creation followed by several set_port_value messages to set the node's - * controls) without needing to wait on a response to the first (node creation) message. - * - * There is also a fast "immediate" version of this message, set_port_value_immediate, which - * does not have this ordering guarantee.

\n \n - */ /** \page engine_osc_namespace *

\b /ingen/set_port_value - 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 is the queued way to set a port value (it is in the same threading class as e.g. - * node creation). This way the client can stream a sequence of events which depend on each - * other (e.g. a node creation followed by several set_port_value messages to set the node's - * controls) without needing to wait on a response to the first (node creation) message. - * - * There is also a fast "immediate" version of this message, set_port_value_immediate, which - * does not have this ordering guarantee.

\n \n + * \arg \b value (float) - Value to set port to.

\n \n */ int OSCEngineReceiver::_set_port_value_cb(const char* path, const char* types, lo_arg** argv, int argc, lo_message msg) @@ -671,22 +596,22 @@ OSCEngineReceiver::_set_port_value_cb(const char* path, const char* types, lo_ar if (!strcmp(types, "isf")) { // float, all voices const float value = argv[2]->f; - set_port_value_immediate(port_path, Atom(value)); + set_port_value(port_path, Atom(value)); } else if (!strcmp(types, "isif")) { // float, specific voice const float value = argv[3]->f; - set_voice_value_immediate(port_path, argv[2]->i, Atom(value)); + set_voice_value(port_path, argv[2]->i, Atom(value)); } else if (!strcmp(types, "issb")) { // blob (event), all voices const char* type = &argv[2]->s; lo_blob b = argv[3]; size_t data_size = lo_blob_datasize(b); void* data = lo_blob_dataptr(b); - set_port_value_immediate(port_path, Atom(type, data_size, data)); + set_port_value(port_path, Atom(type, data_size, data)); } else if (!strcmp(types, "isisb")) { // blob (event), specific voice const char* type = &argv[3]->s; lo_blob b = argv[4]; size_t data_size = lo_blob_datasize(b); void* data = lo_blob_dataptr(b); - set_voice_value_immediate(port_path, argv[2]->i, Atom(type, data_size, data)); + set_voice_value(port_path, argv[2]->i, Atom(type, data_size, data)); } else { return 1; } diff --git a/src/libs/engine/OSCEngineReceiver.hpp b/src/libs/engine/OSCEngineReceiver.hpp index 5c54ac7f..c6e0bf59 100644 --- a/src/libs/engine/OSCEngineReceiver.hpp +++ b/src/libs/engine/OSCEngineReceiver.hpp @@ -106,7 +106,6 @@ private: LO_HANDLER(disconnect); LO_HANDLER(disconnect_all); LO_HANDLER(set_port_value); - LO_HANDLER(set_port_value_immediate); LO_HANDLER(note_on); LO_HANDLER(note_off); LO_HANDLER(all_notes_off); diff --git a/src/libs/engine/QueuedEngineInterface.cpp b/src/libs/engine/QueuedEngineInterface.cpp index 6be0bf96..962410b2 100644 --- a/src/libs/engine/QueuedEngineInterface.cpp +++ b/src/libs/engine/QueuedEngineInterface.cpp @@ -252,23 +252,6 @@ QueuedEngineInterface::set_voice_value(const string& port_path, } -void -QueuedEngineInterface::set_port_value_immediate(const string& port_path, - const Raul::Atom& value) -{ - push_stamped(new SetPortValueEvent(_engine, _responder, false, now(), port_path, value)); -} - - -void -QueuedEngineInterface::set_voice_value_immediate(const string& port_path, - uint32_t voice, - const Raul::Atom& value) -{ - push_stamped(new SetPortValueEvent(_engine, _responder, false, now(), voice, port_path, value)); -} - - void QueuedEngineInterface::set_program(const string& node_path, uint32_t bank, diff --git a/src/libs/engine/QueuedEngineInterface.hpp b/src/libs/engine/QueuedEngineInterface.hpp index 3aba9c7e..73c790c8 100644 --- a/src/libs/engine/QueuedEngineInterface.hpp +++ b/src/libs/engine/QueuedEngineInterface.hpp @@ -126,13 +126,6 @@ public: uint32_t voice, const Raul::Atom& value); - virtual void set_port_value_immediate(const string& port_path, - const Raul::Atom& value); - - virtual void set_voice_value_immediate(const string& port_path, - uint32_t voice, - const Raul::Atom& value); - virtual void set_program(const string& node_path, uint32_t bank, uint32_t program); -- cgit v1.2.1