From 23e753a92e21b76a24224551b6250f650df11957 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Thu, 27 Nov 2008 22:52:58 +0000 Subject: Remove old learn response event junk. git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@1807 a436a847-0d15-0410-975c-d299462d15a1 --- src/engine/events/MidiLearnEvent.cpp | 16 +------------- src/engine/events/MidiLearnEvent.hpp | 42 +++++------------------------------- 2 files changed, 6 insertions(+), 52 deletions(-) (limited to 'src/engine/events') diff --git a/src/engine/events/MidiLearnEvent.cpp b/src/engine/events/MidiLearnEvent.cpp index 68293cb7..b542eccd 100644 --- a/src/engine/events/MidiLearnEvent.cpp +++ b/src/engine/events/MidiLearnEvent.cpp @@ -27,24 +27,11 @@ namespace Ingen { -// MidiLearnResponseEvent - -void -MidiLearnResponseEvent::post_process() -{ - _engine.broadcaster()->send_port_value(_port_path, _value); -} - - - -// MidiLearnEvent - MidiLearnEvent::MidiLearnEvent(Engine& engine, SharedPtr responder, SampleCount timestamp, const string& node_path) : QueuedEvent(engine, responder, timestamp) , _error(NO_ERROR) , _node_path(node_path) , _node(NULL) - , _response_event(NULL) { } @@ -53,7 +40,6 @@ void MidiLearnEvent::pre_process() { _node = _engine.engine_store()->find_node(_node_path); - _response_event = new MidiLearnResponseEvent(_engine, _node_path + "/Controller_Number", _time); QueuedEvent::pre_process(); } @@ -67,7 +53,7 @@ MidiLearnEvent::execute(ProcessContext& context) if (_node != NULL) { if (_node->plugin_impl()->type() == Plugin::Internal && _node->plugin_impl()->uri() == "http://drobilla.net/ns/ingen#control_node") { - ((MidiControlNode*)_node)->learn(_response_event); + ((MidiControlNode*)_node)->learn(); } else { std::cout << "NOT CAPABLE: " << _node->plugin_impl()->uri() << std::endl; _error = INVALID_NODE_TYPE; diff --git a/src/engine/events/MidiLearnEvent.hpp b/src/engine/events/MidiLearnEvent.hpp index 1dceb041..fca96307 100644 --- a/src/engine/events/MidiLearnEvent.hpp +++ b/src/engine/events/MidiLearnEvent.hpp @@ -22,7 +22,6 @@ #include "MidiControlNode.hpp" #include "types.hpp" #include -using std::string; namespace Ingen { @@ -30,42 +29,14 @@ class NodeImpl; class ControlChangeEvent; -/** Response event for a MIDI learn. - * - * This is a trivial event that sends a control change in it's post_process - * method (used by MidiLearnEvent to notify clients when the learn happens) - */ -class MidiLearnResponseEvent : public Event -{ -public: - MidiLearnResponseEvent(Engine& engine, const string& port_path, SampleCount timestamp) - : Event(engine, SharedPtr(), timestamp), - _port_path(port_path), - _value(0.0f) - {} - - void set_value(Sample val) { _value = val; } - void post_process(); - -private: - string _port_path; - Sample _value; -}; - - - -/** A MIDI learn event. - * - * This creates a MidiLearnResponseEvent and passes it to the learning node, which - * will push it to the post-processor once the learn happens in order to reply - * to the client with the new port (learned controller) value. +/** A MIDI learn event (used by control node to learn controller number). * * \ingroup engine */ class MidiLearnEvent : public QueuedEvent { public: - MidiLearnEvent(Engine& engine, SharedPtr responder, SampleCount timestamp, const string& node_path); + MidiLearnEvent(Engine& engine, SharedPtr responder, SampleCount timestamp, const std::string& node_path); void pre_process(); void execute(ProcessContext& context); @@ -77,12 +48,9 @@ private: INVALID_NODE_TYPE }; - ErrorType _error; - const string _node_path; - NodeImpl* _node; - - /// Event to respond with when learned - MidiLearnResponseEvent* _response_event; + ErrorType _error; + const std::string _node_path; + NodeImpl* _node; }; -- cgit v1.2.1