Added port monitoring disable event.

Better port monitoring event names.
Fix accidental nuking of RequestPortValueEvent.


git-svn-id: http://svn.drobilla.net/lad/ingen@785 a436a847-0d15-0410-975c-d299462d15a1

1 files changed, 7 insertions, 14 deletions

diff --git a/src/libs/engine/events/RequestPortValueEvent.cpp b/src/libs/engine/events/RequestPortValueEvent.cpp
index 34545670..992c1615 100644
--- a/src/libs/engine/events/RequestPortValueEvent.cpp
+++ b/src/libs/engine/events/RequestPortValueEvent.cpp
@@ -15,9 +15,9 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "RequestPortValueEvent.hpp"
 #include <string>
 #include "interface/ClientInterface.hpp"
-#include "events/EnablePortNotificationEvent.hpp"
 #include "Responder.hpp"
 #include "Engine.hpp"
 #include "Port.hpp"
@@ -30,19 +30,17 @@ using std::string;
 namespace Ingen {
 
 
-EnablePortNotificationEvent::EnablePortNotificationEvent(Engine&              engine,
-                                                         SharedPtr<Responder> responder,
-                                                         SampleCount          timestamp,
-                                                         const std::string&   port_path)
+RequestPortValueEvent::RequestPortValueEvent(Engine& engine, SharedPtr<Responder> responder, SampleCount timestamp, const string& port_path)
 : QueuedEvent(engine, responder, timestamp),
   _port_path(port_path),
-  _port(NULL)
+  _port(NULL),
+  _value(0.0)
 {
 }
 
 
 void
-EnablePortNotificationEvent::pre_process()
+RequestPortValueEvent::pre_process()
 {
 	_port = _engine.object_store()->find_port(_port_path);
 
@@ -51,25 +49,21 @@ EnablePortNotificationEvent::pre_process()
 
 
 void
-EnablePortNotificationEvent::execute(SampleCount nframes, FrameTime start, FrameTime end)
+RequestPortValueEvent::execute(SampleCount nframes, FrameTime start, FrameTime end)
 {
 	QueuedEvent::execute(nframes, start, end);
-
-#if 0
 	assert(_time >= start && _time <= end);
 
 	if (_port != NULL && _port->type() == DataType::FLOAT)
 		_value = ((AudioBuffer*)_port->buffer(0))->value_at(0/*_time - start*/);
 	else 
 		_port = NULL; // triggers error response
-#endif
 }
 
 
 void
-EnablePortNotificationEvent::post_process()
+RequestPortValueEvent::post_process()
 {
-#if 0
 	string msg;
 	if (!_port) {
 		_responder->respond_error("Unable to find port for get_value responder.");
@@ -79,7 +73,6 @@ EnablePortNotificationEvent::post_process()
 	} else {
 		_responder->respond_error("Unable to find client to send port value");
 	}
-#endif
 }