diff options
36 files changed, 29 insertions, 196 deletions
diff --git a/src/bindings/Client.hpp b/src/bindings/Client.hpp index d23166e9..956b51d4 100644 --- a/src/bindings/Client.hpp +++ b/src/bindings/Client.hpp @@ -24,7 +24,6 @@ public: void move(const Raul::Path& old_path, const Raul::Path& new_path) {} void disconnect(const Raul::Path& src_port_path, const Raul::Path& dst_port_path) {} void set_property(const Raul::URI& subject, const Raul::URI& key, const Raul::Atom& value) {} - void set_port_value(const Raul::Path& port_path, const Raul::Atom& value) {} void set_voice_value(const Raul::Path& port_path, uint32_t voice, const Raul::Atom& value) {} void activity(const Raul::Path& port_path) {} void binding(const Raul::Path& path, const MessageType& type) {} diff --git a/src/client/ClientStore.cpp b/src/client/ClientStore.cpp index 40c11323..762bb2e6 100644 --- a/src/client/ClientStore.cpp +++ b/src/client/ClientStore.cpp @@ -51,7 +51,6 @@ ClientStore::ClientStore(SharedPtr<EngineInterface> engine, SharedPtr<SigClientI emitter->signal_connection.connect(sigc::mem_fun(this, &ClientStore::connect)); emitter->signal_disconnection.connect(sigc::mem_fun(this, &ClientStore::disconnect)); emitter->signal_property_change.connect(sigc::mem_fun(this, &ClientStore::set_property)); - emitter->signal_port_value.connect(sigc::mem_fun(this, &ClientStore::set_port_value)); emitter->signal_voice_value.connect(sigc::mem_fun(this, &ClientStore::set_voice_value)); emitter->signal_activity.connect(sigc::mem_fun(this, &ClientStore::activity)); emitter->signal_binding.connect(sigc::mem_fun(this, &ClientStore::binding)); @@ -353,17 +352,6 @@ ClientStore::set_property(const URI& subject_uri, const URI& predicate, const At void -ClientStore::set_port_value(const Path& port_path, const Atom& value) -{ - SharedPtr<PortModel> port = PtrCast<PortModel>(object(port_path)); - if (port) - port->value(value); - else - LOG(error) << "Control change for non-existent port " << port_path << endl; -} - - -void ClientStore::set_voice_value(const Path& port_path, uint32_t voice, const Atom& value) { SharedPtr<PortModel> port = PtrCast<PortModel>(object(port_path)); diff --git a/src/client/ClientStore.hpp b/src/client/ClientStore.hpp index 1421ca13..309e7795 100644 --- a/src/client/ClientStore.hpp +++ b/src/client/ClientStore.hpp @@ -71,7 +71,6 @@ public: void put(const Raul::URI& path, const Shared::Resource::Properties& properties); void move(const Raul::Path& old_path, const Raul::Path& new_path); void set_property(const Raul::URI& subject_path, const Raul::URI& predicate, const Raul::Atom& value); - void set_port_value(const Raul::Path& port_path, const Raul::Atom& value); void set_voice_value(const Raul::Path& port_path, uint32_t voice, const Raul::Atom& value); void connect(const Raul::Path& src_port_path, const Raul::Path& dst_port_path); void disconnect(const Raul::Path& src_port_path, const Raul::Path& dst_port_path); diff --git a/src/client/DeprecatedLoader.cpp b/src/client/DeprecatedLoader.cpp index 32dd8059..9af1a781 100644 --- a/src/client/DeprecatedLoader.cpp +++ b/src/client/DeprecatedLoader.cpp @@ -339,7 +339,8 @@ DeprecatedLoader::load_patch(const Glib::ustring& filename, list<ControlModel>::const_iterator i = pm->controls().begin(); for ( ; i != pm->controls().end(); ++i) { const float value = i->value(); - _engine->set_port_value(translate_load_path(i->port_path().str()), Atom(value)); + _engine->set_property(translate_load_path(i->port_path().str()), + "ingen:value", Atom(value)); } } else { LOG(warn) << "Unknown preset `" << pm->name() << "'" << endl; diff --git a/src/client/HTTPEngineSender.cpp b/src/client/HTTPEngineSender.cpp index ece89ca0..91c8d76c 100644 --- a/src/client/HTTPEngineSender.cpp +++ b/src/client/HTTPEngineSender.cpp @@ -178,13 +178,6 @@ HTTPEngineSender::disconnect_all(const Path& parent_patch_path, void -HTTPEngineSender::set_port_value(const Path& port_path, - const Atom& value) -{ -} - - -void HTTPEngineSender::set_voice_value(const Path& port_path, uint32_t voice, const Atom& value) diff --git a/src/client/HTTPEngineSender.hpp b/src/client/HTTPEngineSender.hpp index 9d84fc2e..dc0a24c7 100644 --- a/src/client/HTTPEngineSender.hpp +++ b/src/client/HTTPEngineSender.hpp @@ -101,9 +101,6 @@ public: const Raul::URI& predicate, const Raul::Atom& value); - virtual void set_port_value(const Raul::Path& port_path, - const Raul::Atom& value); - virtual void set_voice_value(const Raul::Path& port_path, uint32_t voice, const Raul::Atom& value); diff --git a/src/client/OSCClientReceiver.cpp b/src/client/OSCClientReceiver.cpp index 09687f2c..faccef15 100644 --- a/src/client/OSCClientReceiver.cpp +++ b/src/client/OSCClientReceiver.cpp @@ -150,7 +150,6 @@ OSCClientReceiver::setup_callbacks() lo_server_thread_add_method(_st, "/ingen/disconnection", "ss", disconnection_cb, this); lo_server_thread_add_method(_st, "/ingen/new_port", "sisi", new_port_cb, this); lo_server_thread_add_method(_st, "/ingen/set_property", NULL, set_property_cb, this); - lo_server_thread_add_method(_st, "/ingen/set_port_value", "sf", set_port_value_cb, this); lo_server_thread_add_method(_st, "/ingen/set_voice_value", "sif", set_voice_value_cb, this); lo_server_thread_add_method(_st, "/ingen/activity", "s", activity_cb, this); } @@ -238,18 +237,6 @@ OSCClientReceiver::_set_property_cb(const char* path, const char* types, lo_arg* int -OSCClientReceiver::_set_port_value_cb(const char* path, const char* types, lo_arg** argv, int argc, lo_message msg) -{ - const char* const port_path = &argv[0]->s; - const float value = argv[1]->f; - - _target->set_port_value(port_path, value); - - return 0; -} - - -int OSCClientReceiver::_set_voice_value_cb(const char* path, const char* types, lo_arg** argv, int argc, lo_message msg) { const char* const port_path = &argv[0]->s; diff --git a/src/client/OSCClientReceiver.hpp b/src/client/OSCClientReceiver.hpp index cd955363..8f191f9c 100644 --- a/src/client/OSCClientReceiver.hpp +++ b/src/client/OSCClientReceiver.hpp @@ -92,7 +92,6 @@ private: LO_HANDLER(new_port); LO_HANDLER(put); LO_HANDLER(set_property); - LO_HANDLER(set_port_value); LO_HANDLER(set_voice_value); LO_HANDLER(activity); }; diff --git a/src/client/OSCEngineSender.cpp b/src/client/OSCEngineSender.cpp index e7fc4078..150f8020 100644 --- a/src/client/OSCEngineSender.cpp +++ b/src/client/OSCEngineSender.cpp @@ -208,20 +208,6 @@ OSCEngineSender::disconnect_all(const Path& parent_patch_path, void -OSCEngineSender::set_port_value(const Path& port_path, - const 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", m); -} - - -void OSCEngineSender::set_voice_value(const Path& port_path, uint32_t voice, const Atom& value) diff --git a/src/client/OSCEngineSender.hpp b/src/client/OSCEngineSender.hpp index 04075e39..e3d76b01 100644 --- a/src/client/OSCEngineSender.hpp +++ b/src/client/OSCEngineSender.hpp @@ -98,9 +98,6 @@ public: const Raul::URI& predicate, const Raul::Atom& value); - virtual void set_port_value(const Raul::Path& port_path, - const Raul::Atom& value); - virtual void set_voice_value(const Raul::Path& port_path, uint32_t voice, const Raul::Atom& value); diff --git a/src/client/PluginUI.cpp b/src/client/PluginUI.cpp index f9882be1..4c8016fd 100644 --- a/src/client/PluginUI.cpp +++ b/src/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(port->path(), Atom(*(float*)buffer)); + ui->world()->engine->set_property(port->path(), "ingen:value", Atom(*(float*)buffer)); } else if (format == map->ui_format_events) { LV2_Event_Buffer* buf = (LV2_Event_Buffer*)buffer; @@ -75,7 +75,7 @@ lv2_ui_write(LV2UI_Controller controller, LV2_Event* const ev = lv2_event_get(&iter, &data); if (ev->type == map->midi_event) { // FIXME: bundle multiple events by writing an entire buffer here - ui->world()->engine->set_port_value(port->path(), + ui->world()->engine->set_property(port->path(), "ingen:value", Atom("lv2midi:MidiEvent", ev->size, data)); } else { warn << "Unable to send event type " << ev->type << @@ -89,7 +89,7 @@ lv2_ui_write(LV2UI_Controller controller, LV2_Object* buf = (LV2_Object*)buffer; Raul::Atom val; Shared::LV2Object::to_atom(ui->world(), buf, val); - ui->world()->engine->set_port_value(port->path(), val); + ui->world()->engine->set_property(port->path(), "ingen:value", val); } else { warn << "Unknown value format " << format diff --git a/src/client/PortModel.hpp b/src/client/PortModel.hpp index 8cf0dccb..58f3262e 100644 --- a/src/client/PortModel.hpp +++ b/src/client/PortModel.hpp @@ -59,6 +59,14 @@ public: inline bool operator==(const PortModel& pm) const { return (_path == pm._path); } + Raul::Atom& set_property(const Raul::URI& uri, + const Raul::Atom& value) { + Raul::Atom& ret = ObjectModel::set_property(uri, value); + if (uri.str() == "ingen:value") + this->value(value); + return ret; + } + inline void value(const Raul::Atom& val) { if (val != _current_val) { _current_val = val; diff --git a/src/client/SigClientInterface.hpp b/src/client/SigClientInterface.hpp index f3f572ad..382813d3 100644 --- a/src/client/SigClientInterface.hpp +++ b/src/client/SigClientInterface.hpp @@ -107,9 +107,6 @@ protected: void set_property(const Raul::URI& subject, const Raul::URI& key, const Raul::Atom& value) { EMIT(property_change, subject, key, value); } - void set_port_value(const Raul::Path& port_path, const Raul::Atom& value) - { EMIT(port_value, port_path, value); } - void set_voice_value(const Raul::Path& port_path, uint32_t voice, const Raul::Atom& value) { EMIT(voice_value, port_path, voice, value); } diff --git a/src/client/ThreadedSigClientInterface.hpp b/src/client/ThreadedSigClientInterface.hpp index e0065fab..16eb98c3 100644 --- a/src/client/ThreadedSigClientInterface.hpp +++ b/src/client/ThreadedSigClientInterface.hpp @@ -103,9 +103,6 @@ public: void set_property(const Raul::URI& subject, const Raul::URI& key, const Raul::Atom& value) { push_sig(sigc::bind(property_change_slot, subject, key, value)); } - void set_port_value(const Raul::Path& port_path, const Raul::Atom& value) - { push_sig(sigc::bind(port_value_slot, port_path, value)); } - void set_voice_value(const Raul::Path& port_path, uint32_t voice, const Raul::Atom& value) { push_sig(sigc::bind(voice_value_slot, port_path, voice, value)); } diff --git a/src/common/interface/CommonInterface.hpp b/src/common/interface/CommonInterface.hpp index aa8b404c..d1297aa5 100644 --- a/src/common/interface/CommonInterface.hpp +++ b/src/common/interface/CommonInterface.hpp @@ -63,9 +63,6 @@ public: const Raul::URI& predicate, const Raul::Atom& value) = 0; - virtual void set_port_value(const Raul::Path& port_path, - const Raul::Atom& value) = 0; - virtual void set_voice_value(const Raul::Path& port_path, uint32_t voice, const Raul::Atom& value) = 0; diff --git a/src/engine/ClientBroadcaster.hpp b/src/engine/ClientBroadcaster.hpp index 096b367d..808c861a 100644 --- a/src/engine/ClientBroadcaster.hpp +++ b/src/engine/ClientBroadcaster.hpp @@ -99,11 +99,6 @@ public: BROADCAST(set_property, subject, predicate, value); } - void set_port_value(const Raul::Path& port_path, - const Raul::Atom& value) { - BROADCAST(set_port_value, port_path, value); - } - void set_voice_value(const Raul::Path& port_path, uint32_t voice, const Raul::Atom& value) { diff --git a/src/engine/HTTPClientSender.cpp b/src/engine/HTTPClientSender.cpp index aacf9479..77f4fbad 100644 --- a/src/engine/HTTPClientSender.cpp +++ b/src/engine/HTTPClientSender.cpp @@ -115,17 +115,6 @@ HTTPClientSender::set_property(const URI& subject, const URI& key, const Atom& v void -HTTPClientSender::set_port_value(const Path& port_path, const Atom& value) -{ - Redland::Node node = AtomRDF::atom_to_node(*_engine.world()->rdf_world, value); - const string msg = string( - "@prefix ingen: <http://drobilla.net/ns/ingen#> .\n\n<").append( - port_path.str()).append("> ingen:value ").append(node.to_string()).append(" .\n"); - send_chunk(msg); -} - - -void HTTPClientSender::set_voice_value(const Path& port_path, uint32_t voice, const Atom& value) { warn << "TODO: HTTP set voice value" << endl; diff --git a/src/engine/HTTPClientSender.hpp b/src/engine/HTTPClientSender.hpp index f25e1eeb..4c975304 100644 --- a/src/engine/HTTPClientSender.hpp +++ b/src/engine/HTTPClientSender.hpp @@ -84,9 +84,6 @@ public: const Raul::URI& predicate, const Raul::Atom& value); - virtual void set_port_value(const Raul::Path& port_path, - const Raul::Atom& value); - virtual void set_voice_value(const Raul::Path& port_path, uint32_t voice, const Raul::Atom& value); diff --git a/src/engine/OSCClientSender.cpp b/src/engine/OSCClientSender.cpp index f07668ca..6938b09a 100644 --- a/src/engine/OSCClientSender.cpp +++ b/src/engine/OSCClientSender.cpp @@ -199,23 +199,6 @@ OSCClientSender::set_property(const URI& path, const URI& key, const Atom& value /** \page client_osc_namespace * <h2>/ingen/set_port_value</h2> * \arg \b path (string) - Path of port - * \arg \b value (any) - New value of port - * - * Notification the value of a port has changed. - */ -void -OSCClientSender::set_port_value(const Path& port_path, const Atom& value) -{ - lo_message m = lo_message_new(); - lo_message_add_string(m, port_path.c_str()); - AtomLiblo::lo_message_add_atom(m, value); - send_message("/ingen/set_port_value", m); -} - - -/** \page client_osc_namespace - * <h2>/ingen/set_port_value</h2> - * \arg \b path (string) - Path of port * \arg \b voice (int) - Voice which is set to this value * \arg \b value (any) - New value of port * diff --git a/src/engine/OSCClientSender.hpp b/src/engine/OSCClientSender.hpp index 38cc3187..d7abfed0 100644 --- a/src/engine/OSCClientSender.hpp +++ b/src/engine/OSCClientSender.hpp @@ -84,9 +84,6 @@ public: const Raul::URI& predicate, const Raul::Atom& value); - virtual void set_port_value(const Raul::Path& port_path, - const Raul::Atom& value); - virtual void set_voice_value(const Raul::Path& port_path, uint32_t voice, const Raul::Atom& value); diff --git a/src/engine/OSCEngineReceiver.cpp b/src/engine/OSCEngineReceiver.cpp index ee202c95..404796fd 100644 --- a/src/engine/OSCEngineReceiver.cpp +++ b/src/engine/OSCEngineReceiver.cpp @@ -100,7 +100,6 @@ OSCEngineReceiver::OSCEngineReceiver(Engine& engine, size_t queue_size, uint16_t 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", "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/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); @@ -501,56 +500,6 @@ OSCEngineReceiver::_disconnect_all_cb(const char* path, const char* types, lo_ar /** \page engine_osc_namespace - * <h2>/ingen/set_port_value</h2> - * \arg \b response-id (integer) - * \arg \b port-path (string) - Name of port - * \arg \b value (float) - Value to set port to. - * - * Set the value of a port for all voices. - */ -int -OSCEngineReceiver::_set_port_value_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(port_path, Atom(value)); - } else if (!strcmp(types, "isif")) { // float, specific voice - const float value = argv[3]->f; - 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(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(port_path, argv[2]->i, Atom(type, data_size, data)); - } else if (!strcmp(types, "issN")) { // empty event (type only), all voices - const char* type = &argv[2]->s; - set_port_value(port_path, Atom(type, 0, NULL)); - } else if (!strcmp(types, "isisN")) { // empty event (type only), specific voice - const char* type = &argv[3]->s; - set_voice_value(port_path, argv[2]->i, Atom(type, 0, NULL)); - } else { - return 1; - } - - return 0; -} - - -/** \page engine_osc_namespace * <h2>/ingen/note_on</h2> * \arg \b response-id (integer) * \arg \b node-path (string) - Patch of Node to trigger (must be a trigger or note node) diff --git a/src/engine/OSCEngineReceiver.hpp b/src/engine/OSCEngineReceiver.hpp index 6e2ce08c..c70f680f 100644 --- a/src/engine/OSCEngineReceiver.hpp +++ b/src/engine/OSCEngineReceiver.hpp @@ -96,7 +96,6 @@ private: LO_HANDLER(connect); LO_HANDLER(disconnect); LO_HANDLER(disconnect_all); - LO_HANDLER(set_port_value); LO_HANDLER(note_on); LO_HANDLER(note_off); LO_HANDLER(all_notes_off); diff --git a/src/engine/ObjectSender.cpp b/src/engine/ObjectSender.cpp index 65ad4f8b..198296ec 100644 --- a/src/engine/ObjectSender.cpp +++ b/src/engine/ObjectSender.cpp @@ -144,7 +144,7 @@ ObjectSender::send_port(ClientInterface* client, const PortImpl* port, bool bund if (port->type() == PortType::CONTROL) { //const Sample& value = PtrCast<const AudioBuffer>(port->buffer(0))->value_at(0); const Sample& value = ((const AudioBuffer*)port->buffer(0).get())->value_at(0); - client->set_port_value(port->path(), value); + client->set_property(port->path(), "ingen:value", value); } if (bundle) diff --git a/src/engine/QueuedEngineInterface.cpp b/src/engine/QueuedEngineInterface.cpp index 575fa5d6..42978832 100644 --- a/src/engine/QueuedEngineInterface.cpp +++ b/src/engine/QueuedEngineInterface.cpp @@ -211,14 +211,6 @@ QueuedEngineInterface::disconnect_all(const Path& patch_path, void -QueuedEngineInterface::set_port_value(const Path& port_path, - const Raul::Atom& value) -{ - push_queued(new Events::SetPortValue(_engine, _responder, true, now(), port_path, value)); -} - - -void QueuedEngineInterface::set_voice_value(const Path& port_path, uint32_t voice, const Raul::Atom& value) diff --git a/src/engine/QueuedEngineInterface.hpp b/src/engine/QueuedEngineInterface.hpp index 22c92efa..c1db2ba1 100644 --- a/src/engine/QueuedEngineInterface.hpp +++ b/src/engine/QueuedEngineInterface.hpp @@ -87,9 +87,6 @@ public: const Raul::URI& predicate, const Raul::Atom& value); - virtual void set_port_value(const Raul::Path& port_path, - const Raul::Atom& value); - virtual void set_voice_value(const Raul::Path& port_path, uint32_t voice, const Raul::Atom& value); diff --git a/src/engine/events/RequestMetadata.cpp b/src/engine/events/RequestMetadata.cpp index f51651fc..c773ae3d 100644 --- a/src/engine/events/RequestMetadata.cpp +++ b/src/engine/events/RequestMetadata.cpp @@ -113,7 +113,7 @@ RequestMetadata::post_process() if (_special_type == PORT_VALUE) { if (_resource) { _responder->respond_ok(); - _responder->client()->set_port_value(_uri.str(), _value); + _responder->client()->set_property(_uri.str(), "ingen:value", _value); } else { const string msg = "Get value for non-port " + _uri.str(); _responder->respond_error(msg); diff --git a/src/engine/events/SendPortValue.cpp b/src/engine/events/SendPortValue.cpp index 1052033b..52592d81 100644 --- a/src/engine/events/SendPortValue.cpp +++ b/src/engine/events/SendPortValue.cpp @@ -31,7 +31,7 @@ void SendPortValue::post_process() { if (_omni) { - _engine.broadcaster()->set_port_value(_port->path(), _value); + _engine.broadcaster()->set_property(_port->path(), "ingen:value", _value); } else { _engine.broadcaster()->set_voice_value(_port->path(), _voice_num, _value); } diff --git a/src/engine/events/SetPortValue.cpp b/src/engine/events/SetPortValue.cpp index 6c87ef94..f1abc720 100644 --- a/src/engine/events/SetPortValue.cpp +++ b/src/engine/events/SetPortValue.cpp @@ -231,7 +231,7 @@ SetPortValue::post_process() assert(_port != NULL); _responder->respond_ok(); if (_omni) - _engine.broadcaster()->set_port_value(_port_path, _value); + _engine.broadcaster()->set_property(_port_path, "ingen:value", _value); else _engine.broadcaster()->set_voice_value(_port_path, _voice_num, _value); break; @@ -246,7 +246,7 @@ SetPortValue::post_process() break; case PORT_NOT_FOUND: msg = "Unable to find port "; - msg.append(_port_path.str()).append(" for set_port_value"); + msg.append(_port_path.str()).append(" to set value"); _responder->respond_error(msg); break; case NO_SPACE: diff --git a/src/gui/ControlPanel.cpp b/src/gui/ControlPanel.cpp index 21728d59..e393b7ca 100644 --- a/src/gui/ControlPanel.cpp +++ b/src/gui/ControlPanel.cpp @@ -185,7 +185,7 @@ ControlPanel::value_changed_atom(SharedPtr<PortModel> port, const Raul::Atom& va { if (_callback_enabled) { if (_all_voices_radio->get_active()) { - App::instance().engine()->set_port_value(port->path(), val); + App::instance().engine()->set_property(port->path(), "ingen:value", val); port->value(val); } else { int voice = _voice_spinbutton->get_value_as_int(); diff --git a/src/gui/NodeMenu.cpp b/src/gui/NodeMenu.cpp index 887ef06a..c801d3e7 100644 --- a/src/gui/NodeMenu.cpp +++ b/src/gui/NodeMenu.cpp @@ -145,7 +145,7 @@ NodeMenu::on_menu_randomize() float min = 0.0f, max = 1.0f; nm->port_value_range(*i, min, max); const float val = ((rand() / (float)RAND_MAX) * (max - min) + min); - App::instance().engine()->set_port_value((*i)->path(), val); + App::instance().engine()->set_property((*i)->path(), "ingen:value", val); } } @@ -176,8 +176,9 @@ NodeMenu::on_preset_activated(const std::string uri) for (; !slv2_results_finished(values); slv2_results_next(values)) { SLV2Value sym = slv2_results_get_binding_value(values, 0); SLV2Value val = slv2_results_get_binding_value(values, 1); - App::instance().engine()->set_port_value( + App::instance().engine()->set_property( node->path().base() + slv2_value_as_string(sym), + "ingen:value", slv2_value_as_float(val)); } App::instance().engine()->bundle_end(); diff --git a/src/gui/Port.cpp b/src/gui/Port.cpp index fafac68d..70cade09 100644 --- a/src/gui/Port.cpp +++ b/src/gui/Port.cpp @@ -165,7 +165,7 @@ Port::set_control(float value, bool signal) { if (signal) { if (model()->type() == PortType::CONTROL) { - App::instance().engine()->set_port_value(model()->path(), Atom(value)); + App::instance().engine()->set_property(model()->path(), "ingen:value", Atom(value)); PatchWindow* pw = App::instance().window_factory()->patch_window( PtrCast<PatchModel>(model()->parent())); if (!pw) @@ -175,7 +175,7 @@ Port::set_control(float value, bool signal) pw->show_port_status(model().get(), value); } else if (model()->type() == PortType::EVENTS) { - App::instance().engine()->set_port_value(model()->path(), + App::instance().engine()->set_property(model()->path(), "ingen:value", Atom("<http://example.org/ev#BangEvent>", 0, NULL)); } } diff --git a/src/scripts/python/scripts/flatten.py b/src/scripts/python/scripts/flatten.py index 530e4291..7c311451 100755 --- a/src/scripts/python/scripts/flatten.py +++ b/src/scripts/python/scripts/flatten.py @@ -77,7 +77,7 @@ def cloneNode(om, node, patch): # copy port values for port in node.getPorts(): path = '%s/%s/%s' % (patch.getPath(), name, port.getName()) - om.synth.set_port_value_slow.async(path, port.value) + om.synth.set_property_slow.async(path, "ingen:value", port.value) om.metadata.set.async(path, 'user-min', '%f' % port.minvalue) om.metadata.set.async(path, 'user-max', '%f' % port.maxvalue) return name @@ -124,7 +124,7 @@ def flatten(om, patch): conns = port4.getConnections().keys() if len(conns) == 0: portValue = port4.value - om.synth.set_port_value_slow.async(dst, portValue) + om.synth.set_property_slow.async(dst, "ingen:value", portValue) else: for port3 in port4.getConnections().keys(): src = port3.getPath() diff --git a/src/scripts/python/scripts/sillysinepatch.py b/src/scripts/python/scripts/sillysinepatch.py index dcb37a97..f46c6d46 100644 --- a/src/scripts/python/scripts/sillysinepatch.py +++ b/src/scripts/python/scripts/sillysinepatch.py @@ -29,8 +29,8 @@ def main(om): om.synth.create_patch("/silly_sine", 1) om.synth.create_node("/silly_sine/output", "Internal", "", "audio_output", 0) om.synth.create_node("/silly_sine/sine", "LADSPA", "cmt.so", "sine_fcac", 0) - om.synth.set_port_value("/silly_sine/sine/Frequency", 440.0) - om.synth.set_port_value("/silly_sine/sine/Amplitude", 1.0) + om.synth.set_property("/silly_sine/sine/Frequency", "ingen:value", 440.0) + om.synth.set_property("/silly_sine/sine/Amplitude", "ingen:value", 1.0) om.synth.connect("/silly_sine/sine/Output", "/silly_sine/output/out") om.synth.enable_patch("/silly_sine") om.engine.enable() diff --git a/src/serialisation/Parser.cpp b/src/serialisation/Parser.cpp index 2a65d0c3..24da2567 100644 --- a/src/serialisation/Parser.cpp +++ b/src/serialisation/Parser.cpp @@ -208,7 +208,7 @@ Parser::parse_update( const string obj_path = (*i)["path"].to_string(); const Redland::Node& val_node = (*i)["value"]; const Atom a(AtomRDF::node_to_atom(val_node)); - target->set_port_value(obj_path, a); + target->set_property(obj_path, "ingen:value", a); } return parse(world, target, model, base_uri, data_path, parent, symbol, data); diff --git a/src/shared/ClashAvoider.cpp b/src/shared/ClashAvoider.cpp index 014ce7c1..f5777e04 100644 --- a/src/shared/ClashAvoider.cpp +++ b/src/shared/ClashAvoider.cpp @@ -185,14 +185,6 @@ ClashAvoider::set_property(const Raul::URI& subject, void -ClashAvoider::set_port_value(const Raul::Path& port_path, - const Raul::Atom& value) -{ - _target.set_port_value(map_path(port_path), value); -} - - -void ClashAvoider::set_voice_value(const Raul::Path& port_path, uint32_t voice, const Raul::Atom& value) diff --git a/src/shared/ClashAvoider.hpp b/src/shared/ClashAvoider.hpp index 5160ab2e..50a036da 100644 --- a/src/shared/ClashAvoider.hpp +++ b/src/shared/ClashAvoider.hpp @@ -64,9 +64,6 @@ public: const Raul::URI& predicate, const Raul::Atom& value); - virtual void set_port_value(const Raul::Path& port_path, - const Raul::Atom& value); - virtual void set_voice_value(const Raul::Path& port_path, uint32_t voice, const Raul::Atom& value); |