summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2011-10-21 21:54:12 +0000
committerDavid Robillard <d@drobilla.net>2011-10-21 21:54:12 +0000
commite928751490386d4ec028a3314ebc89cdd25ea45d (patch)
tree36a6e9c1419dfe989f25870df1d8e512c36f6e6b
parent0d4792af695d94a1e476adcdb65eed8a501ddbd4 (diff)
downloadingen-e928751490386d4ec028a3314ebc89cdd25ea45d.tar.gz
ingen-e928751490386d4ec028a3314ebc89cdd25ea45d.tar.bz2
ingen-e928751490386d4ec028a3314ebc89cdd25ea45d.zip
Remove unnecessary calls to EventSource::whip().
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@3571 a436a847-0d15-0410-975c-d299462d15a1
-rw-r--r--src/server/EventSource.cpp10
-rw-r--r--src/server/EventSource.hpp1
-rw-r--r--src/server/HTTPEngineReceiver.cpp6
-rw-r--r--src/server/HTTPEngineReceiver.hpp1
-rw-r--r--src/server/OSCEngineReceiver.cpp2
-rw-r--r--src/server/OSCEngineReceiver.hpp3
-rw-r--r--src/server/Request.hpp3
7 files changed, 5 insertions, 21 deletions
diff --git a/src/server/EventSource.cpp b/src/server/EventSource.cpp
index 0b7a0a79..2711451e 100644
--- a/src/server/EventSource.cpp
+++ b/src/server/EventSource.cpp
@@ -63,16 +63,6 @@ EventSource::push_queued(Event* const ev)
whip();
}
-/** Prepare all unprepared events.
- */
-void
-EventSource::prepare_all()
-{
- while (unprepared_events()) {
- whip();
- }
-}
-
/** Process all events for a cycle.
*
* Executed events will be pushed to @a dest.
diff --git a/src/server/EventSource.hpp b/src/server/EventSource.hpp
index 8a72184e..137c7152 100644
--- a/src/server/EventSource.hpp
+++ b/src/server/EventSource.hpp
@@ -41,7 +41,6 @@ public:
explicit EventSource();
virtual ~EventSource();
- void prepare_all();
void process(PostProcessor& dest, ProcessContext& context, bool limit=true);
inline bool unprepared_events() const { return (_prepared_back.get() != NULL); }
diff --git a/src/server/HTTPEngineReceiver.cpp b/src/server/HTTPEngineReceiver.cpp
index 62882bf2..69859ad2 100644
--- a/src/server/HTTPEngineReceiver.cpp
+++ b/src/server/HTTPEngineReceiver.cpp
@@ -86,12 +86,6 @@ HTTPEngineReceiver::~HTTPEngineReceiver()
}
void
-HTTPEngineReceiver::ReceiveThread::whip()
-{
- _receiver._interface->prepare_all();
-}
-
-void
HTTPEngineReceiver::message_callback(SoupServer* server,
SoupMessage* msg,
const char* path_str,
diff --git a/src/server/HTTPEngineReceiver.hpp b/src/server/HTTPEngineReceiver.hpp
index 67e47ec4..9e38a0f0 100644
--- a/src/server/HTTPEngineReceiver.hpp
+++ b/src/server/HTTPEngineReceiver.hpp
@@ -47,7 +47,6 @@ private:
struct ReceiveThread : public Raul::Thread {
explicit ReceiveThread(HTTPEngineReceiver& receiver) : _receiver(receiver) {}
virtual void _run();
- virtual void whip();
private:
HTTPEngineReceiver& _receiver;
};
diff --git a/src/server/OSCEngineReceiver.cpp b/src/server/OSCEngineReceiver.cpp
index cac49524..3151255c 100644
--- a/src/server/OSCEngineReceiver.cpp
+++ b/src/server/OSCEngineReceiver.cpp
@@ -161,8 +161,6 @@ OSCEngineReceiver::ReceiveThread::_run()
// Enqueue every other message that is here "now"
// (would this provide truly atomic bundles?)
while (lo_server_recv_noblock(_receiver._server, 0) > 0) {}
-
- _receiver._interface->prepare_all();;
}
}
diff --git a/src/server/OSCEngineReceiver.hpp b/src/server/OSCEngineReceiver.hpp
index a165afc0..66e0542a 100644
--- a/src/server/OSCEngineReceiver.hpp
+++ b/src/server/OSCEngineReceiver.hpp
@@ -19,8 +19,11 @@
#define INGEN_ENGINE_OSCENGINERECEIVER_HPP
#include <stdint.h>
+
#include <lo/lo.h>
+#include "raul/Thread.hpp"
+
#include "Request.hpp"
#include "ingen-config.h"
diff --git a/src/server/Request.hpp b/src/server/Request.hpp
index 0e0b60b8..98c224ad 100644
--- a/src/server/Request.hpp
+++ b/src/server/Request.hpp
@@ -19,9 +19,10 @@
#define INGEN_ENGINE_REQUEST_HPP
#include <inttypes.h>
+
#include <string>
+
#include "ingen/ClientInterface.hpp"
-#include "EventSource.hpp"
namespace Ingen {
namespace Server {