summaryrefslogtreecommitdiffstats
path: root/ingen/client
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2012-08-17 02:14:07 +0000
committerDavid Robillard <d@drobilla.net>2012-08-17 02:14:07 +0000
commit318b37d8b556add13b3f156f31c9e72eca339a16 (patch)
treeca7b881f8980a41eca77602b474f29964b5c89db /ingen/client
parenta42744e1068a8630d8034df73bb344ca21a53b32 (diff)
downloadingen-318b37d8b556add13b3f156f31c9e72eca339a16.tar.gz
ingen-318b37d8b556add13b3f156f31c9e72eca339a16.tar.bz2
ingen-318b37d8b556add13b3f156f31c9e72eca339a16.zip
Implement real logging system, LV2 log extension support, and purge evil/ugly/untranslatable C++ stream printing.
Remove coloured log stuff from Raul. git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@4717 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'ingen/client')
-rw-r--r--ingen/client/ClientStore.hpp6
-rw-r--r--ingen/client/PortModel.hpp1
-rw-r--r--ingen/client/ThreadedSigClientInterface.hpp2
3 files changed, 4 insertions, 5 deletions
diff --git a/ingen/client/ClientStore.hpp b/ingen/client/ClientStore.hpp
index cfa9df12..42519158 100644
--- a/ingen/client/ClientStore.hpp
+++ b/ingen/client/ClientStore.hpp
@@ -31,9 +31,9 @@ namespace Raul { class Atom; }
namespace Ingen {
-class URIs;
-
class GraphObject;
+class Log;
+class URIs;
namespace Client {
@@ -54,6 +54,7 @@ class ClientStore : public Store
public:
ClientStore(
URIs& uris,
+ Log& log,
SharedPtr<Interface> engine = SharedPtr<Interface>(),
SharedPtr<SigClientInterface> emitter = SharedPtr<SigClientInterface>());
@@ -127,6 +128,7 @@ private:
const Raul::Path& head_path);
URIs& _uris;
+ Log& _log;
SharedPtr<Interface> _engine;
SharedPtr<SigClientInterface> _emitter;
diff --git a/ingen/client/PortModel.hpp b/ingen/client/PortModel.hpp
index a59de578..bfc56a9d 100644
--- a/ingen/client/PortModel.hpp
+++ b/ingen/client/PortModel.hpp
@@ -21,7 +21,6 @@
#include <string>
#include "raul/SharedPtr.hpp"
-#include "raul/log.hpp"
#include "lv2/lv2plug.in/ns/ext/port-props/port-props.h"
#include "lv2/lv2plug.in/ns/lv2core/lv2.h"
diff --git a/ingen/client/ThreadedSigClientInterface.hpp b/ingen/client/ThreadedSigClientInterface.hpp
index a6028cc6..633bd265 100644
--- a/ingen/client/ThreadedSigClientInterface.hpp
+++ b/ingen/client/ThreadedSigClientInterface.hpp
@@ -133,11 +133,9 @@ private:
while (!success) {
success = _sigs.push(ev);
if (!success) {
- Raul::warn << "Client event queue full. Waiting..." << std::endl;
_mutex.lock();
_cond.wait(_mutex);
_mutex.unlock();
- Raul::warn << "Queue drained, continuing" << std::endl;
}
}
}