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

6 files changed, 173 insertions, 28 deletions

diff --git a/src/libs/engine/events/DisablePortMonitoringEvent.cpp b/src/libs/engine/events/DisablePortMonitoringEvent.cpp
new file mode 100644
index 00000000..334970ae
--- /dev/null
+++ b/src/libs/engine/events/DisablePortMonitoringEvent.cpp
@@ -0,0 +1,87 @@
+/* This file is part of Ingen.
+ * Copyright (C) 2007 Dave Robillard <http://drobilla.net>
+ * 
+ * Ingen is free software; you can redistribute it and/or modify it under the
+ * terms of the GNU General Public License as published by the Free Software
+ * Foundation; either version 2 of the License, or (at your option) any later
+ * version.
+ * 
+ * Ingen is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for details.
+ * 
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include <string>
+#include "interface/ClientInterface.hpp"
+#include "events/DisablePortMonitoringEvent.hpp"
+#include "Responder.hpp"
+#include "Engine.hpp"
+#include "Port.hpp"
+#include "ObjectStore.hpp"
+#include "ClientBroadcaster.hpp"
+#include "AudioBuffer.hpp"
+
+using std::string;
+
+namespace Ingen {
+
+
+DisablePortMonitoringEvent::DisablePortMonitoringEvent(Engine&              engine,
+                                                     SharedPtr<Responder> responder,
+                                                     SampleCount          timestamp,
+                                                     const std::string&   port_path)
+: QueuedEvent(engine, responder, timestamp),
+  _port_path(port_path),
+  _port(NULL)
+{
+}
+
+
+void
+DisablePortMonitoringEvent::pre_process()
+{
+	_port = _engine.object_store()->find_port(_port_path);
+
+	QueuedEvent::pre_process();
+}
+
+
+void
+DisablePortMonitoringEvent::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
+DisablePortMonitoringEvent::post_process()
+{
+#if 0
+	string msg;
+	if (!_port) {
+		_responder->respond_error("Unable to find port for get_value responder.");
+	} else if (_responder->client()) {
+		_responder->respond_ok();
+		_responder->client()->control_change(_port_path, _value);
+	} else {
+		_responder->respond_error("Unable to find client to send port value");
+	}
+#endif
+}
+
+
+} // namespace Ingen
+
diff --git a/src/libs/engine/events/DisablePortMonitoringEvent.hpp b/src/libs/engine/events/DisablePortMonitoringEvent.hpp
new file mode 100644
index 00000000..ed10c195
--- /dev/null
+++ b/src/libs/engine/events/DisablePortMonitoringEvent.hpp
@@ -0,0 +1,58 @@
+/* This file is part of Ingen.
+ * Copyright (C) 2007 Dave Robillard <http://drobilla.net>
+ * 
+ * Ingen is free software; you can redistribute it and/or modify it under the
+ * terms of the GNU General Public License as published by the Free Software
+ * Foundation; either version 2 of the License, or (at your option) any later
+ * version.
+ * 
+ * Ingen is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for details.
+ * 
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef DISABLEPORTNOTIFICATIONEVENT_H
+#define DISABLEPORTNOTIFICATIONEVENT_H
+
+#include <string>
+#include "QueuedEvent.hpp"
+#include "types.hpp"
+
+using std::string;
+
+namespace Ingen {
+	
+class Port;
+namespace Shared { class ClientInterface; }
+using Shared::ClientInterface;
+
+
+/** Disable sending of dynamic value change notifications for a port.
+ *
+ * \ingroup engine
+ */
+class DisablePortMonitoringEvent : public QueuedEvent
+{
+public:
+	DisablePortMonitoringEvent(Engine&              engine,
+	                           SharedPtr<Responder> responder,
+	                           SampleCount          timestamp,
+	                           const std::string&   port_path);
+
+	void pre_process();
+	void execute(SampleCount nframes, FrameTime start, FrameTime end);
+	void post_process();
+
+private:
+	const std::string _port_path;
+	Port*             _port;
+};
+
+
+} // namespace Ingen
+
+#endif // DISABLEPORTNOTIFICATIONEVENT_H
diff --git a/src/libs/engine/events/EnablePortNotificationEvent.cpp b/src/libs/engine/events/EnablePortMonitoringEvent.cpp
index 992c1615..1e2d79c0 100644
--- a/src/libs/engine/events/EnablePortNotificationEvent.cpp
+++ b/src/libs/engine/events/EnablePortMonitoringEvent.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/EnablePortMonitoringEvent.hpp"
 #include "Responder.hpp"
 #include "Engine.hpp"
 #include "Port.hpp"
@@ -30,17 +30,19 @@ using std::string;
 namespace Ingen {
 
 
-RequestPortValueEvent::RequestPortValueEvent(Engine& engine, SharedPtr<Responder> responder, SampleCount timestamp, const string& port_path)
+EnablePortMonitoringEvent::EnablePortMonitoringEvent(Engine&              engine,
+                                                     SharedPtr<Responder> responder,
+                                                     SampleCount          timestamp,
+                                                     const std::string&   port_path)
 : QueuedEvent(engine, responder, timestamp),
   _port_path(port_path),
-  _port(NULL),
-  _value(0.0)
+  _port(NULL)
 {
 }
 
 
 void
-RequestPortValueEvent::pre_process()
+EnablePortMonitoringEvent::pre_process()
 {
 	_port = _engine.object_store()->find_port(_port_path);
 
@@ -49,21 +51,25 @@ RequestPortValueEvent::pre_process()
 
 
 void
-RequestPortValueEvent::execute(SampleCount nframes, FrameTime start, FrameTime end)
+EnablePortMonitoringEvent::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
-RequestPortValueEvent::post_process()
+EnablePortMonitoringEvent::post_process()
 {
+#if 0
 	string msg;
 	if (!_port) {
 		_responder->respond_error("Unable to find port for get_value responder.");
@@ -73,6 +79,7 @@ RequestPortValueEvent::post_process()
 	} else {
 		_responder->respond_error("Unable to find client to send port value");
 	}
+#endif
 }
 
 
diff --git a/src/libs/engine/events/EnablePortNotificationEvent.hpp b/src/libs/engine/events/EnablePortMonitoringEvent.hpp
index 522af143..19e19336 100644
--- a/src/libs/engine/events/EnablePortNotificationEvent.hpp
+++ b/src/libs/engine/events/EnablePortMonitoringEvent.hpp
@@ -35,13 +35,13 @@ using Shared::ClientInterface;
  *
  * \ingroup engine
  */
-class EnablePortNotificationEvent : public QueuedEvent
+class EnablePortMonitoringEvent : public QueuedEvent
 {
 public:
-	EnablePortNotificationEvent(Engine&              engine,
-	                            SharedPtr<Responder> responder,
-	                            SampleCount          timestamp,
-	                            const std::string&   port_path);
+	EnablePortMonitoringEvent(Engine&              engine,
+	                          SharedPtr<Responder> responder,
+	                          SampleCount          timestamp,
+	                          const std::string&   port_path);
 
 	void pre_process();
 	void execute(SampleCount nframes, FrameTime start, FrameTime end);
diff --git a/src/libs/engine/events/Makefile.am b/src/libs/engine/events/Makefile.am
index a97c3bba..c9e88099 100644
--- a/src/libs/engine/events/Makefile.am
+++ b/src/libs/engine/events/Makefile.am
@@ -33,8 +33,8 @@ EXTRA_DIST = \
 	DisconnectionEvent.hpp \
 	EnablePatchEvent.cpp \
 	EnablePatchEvent.hpp \
-	EnablePortNotificationEvent.cpp \
-	EnablePortNotificationEvent.hpp \
+	EnablePortMonitoringEvent.cpp \
+	EnablePortMonitoringEvent.hpp \
 	LoadPluginsEvent.cpp \
 	LoadPluginsEvent.hpp \
 	MidiLearnEvent.cpp \
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
 }