diff options
Diffstat (limited to 'src/libs/client')
| -rw-r--r-- | src/libs/client/HTTPEngineSender.cpp | 15 | ||||
| -rw-r--r-- | src/libs/client/HTTPEngineSender.hpp | 7 | ||||
| -rw-r--r-- | src/libs/client/OSCEngineSender.cpp | 30 | ||||
| -rw-r--r-- | src/libs/client/OSCEngineSender.hpp | 7 | ||||
| -rw-r--r-- | src/libs/client/PluginUI.cpp | 4 |
5 files changed, 2 insertions, 61 deletions
diff --git a/src/libs/client/HTTPEngineSender.cpp b/src/libs/client/HTTPEngineSender.cpp index 882a4bc4..733e0ac7 100644 --- a/src/libs/client/HTTPEngineSender.cpp +++ b/src/libs/client/HTTPEngineSender.cpp @@ -198,21 +198,6 @@ HTTPEngineSender::set_voice_value(const string& port_path, void -HTTPEngineSender::set_port_value_immediate(const string& port_path, - const Raul::Atom& value) -{ -} - - -void -HTTPEngineSender::set_voice_value_immediate(const string& port_path, - uint32_t voice, - const Raul::Atom& value) -{ -} - - -void HTTPEngineSender::set_program(const string& node_path, uint32_t bank, uint32_t program) diff --git a/src/libs/client/HTTPEngineSender.hpp b/src/libs/client/HTTPEngineSender.hpp index f753eea3..411ddfd5 100644 --- a/src/libs/client/HTTPEngineSender.hpp +++ b/src/libs/client/HTTPEngineSender.hpp @@ -115,13 +115,6 @@ public: uint32_t voice, const Raul::Atom& value); - void set_port_value_immediate(const string& port_path, - const Raul::Atom& value); - - void set_voice_value_immediate(const string& port_path, - uint32_t voice, - const Raul::Atom& value); - void set_program(const string& node_path, uint32_t bank, uint32_t program); diff --git a/src/libs/client/OSCEngineSender.cpp b/src/libs/client/OSCEngineSender.cpp index e274f72b..c21d16ce 100644 --- a/src/libs/client/OSCEngineSender.cpp +++ b/src/libs/client/OSCEngineSender.cpp @@ -287,36 +287,6 @@ OSCEngineSender::set_voice_value(const string& port_path, void -OSCEngineSender::set_port_value_immediate(const string& port_path, - const Raul::Atom& value) -{ - lo_message m = lo_message_new(); - lo_message_add_int32(m, next_id()); - lo_message_add_string(m, port_path.c_str()); - if (value.type() == Atom::BLOB) - lo_message_add_string(m, value.get_blob_type()); - Raul::AtomLiblo::lo_message_add_atom(m, value); - send_message("/ingen/set_port_value_immediate", m); -} - - -void -OSCEngineSender::set_voice_value_immediate(const string& port_path, - uint32_t voice, - const Raul::Atom& value) -{ - lo_message m = lo_message_new(); - lo_message_add_int32(m, next_id()); - lo_message_add_string(m, port_path.c_str()); - lo_message_add_int32(m, voice); - if (value.type() == Atom::BLOB) - lo_message_add_string(m, value.get_blob_type()); - Raul::AtomLiblo::lo_message_add_atom(m, value); - send_message("/ingen/set_port_value_immediate", m); -} - - -void OSCEngineSender::set_program(const string& node_path, uint32_t bank, uint32_t program) diff --git a/src/libs/client/OSCEngineSender.hpp b/src/libs/client/OSCEngineSender.hpp index 4c92afdb..ef4a2fa3 100644 --- a/src/libs/client/OSCEngineSender.hpp +++ b/src/libs/client/OSCEngineSender.hpp @@ -116,13 +116,6 @@ public: uint32_t voice, const Raul::Atom& value); - void set_port_value_immediate(const string& port_path, - const Raul::Atom& value); - - void set_voice_value_immediate(const string& port_path, - uint32_t voice, - const Raul::Atom& value); - void set_program(const string& node_path, uint32_t bank, uint32_t program); diff --git a/src/libs/client/PluginUI.cpp b/src/libs/client/PluginUI.cpp index df958f06..9c562135 100644 --- a/src/libs/client/PluginUI.cpp +++ b/src/libs/client/PluginUI.cpp @@ -64,7 +64,7 @@ lv2_ui_write(LV2UI_Controller controller, if (*(float*)buffer == port->value().get_float()) return; // do nothing (handle stupid plugin UIs that feed back) - ui->world()->engine->set_port_value_immediate(port->path(), Atom(*(float*)buffer)); + ui->world()->engine->set_port_value(port->path(), Atom(*(float*)buffer)); // FIXME: slow, need to cache ID } else if (format == map->uri_to_id(NULL, "http://lv2plug.in/ns/extensions/ui#Events")) { @@ -77,7 +77,7 @@ lv2_ui_write(LV2UI_Controller controller, LV2_Event* const ev = lv2_event_get(&iter, &data); if (ev->type == midi_event_type) { // FIXME: bundle multiple events by writing an entire buffer here - ui->world()->engine->set_port_value_immediate(port->path(), + ui->world()->engine->set_port_value(port->path(), Atom("lv2_midi:MidiEvent", ev->size, data)); } else { cerr << "WARNING: Unable to send event type " << ev->type << |