summaryrefslogtreecommitdiffstats
path: root/src/server/Buffer.cpp
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 /src/server/Buffer.cpp
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 'src/server/Buffer.cpp')
-rw-r--r--src/server/Buffer.cpp12
1 files changed, 3 insertions, 9 deletions
diff --git a/src/server/Buffer.cpp b/src/server/Buffer.cpp
index 9bc2572f..79ec3847 100644
--- a/src/server/Buffer.cpp
+++ b/src/server/Buffer.cpp
@@ -31,7 +31,7 @@
#include "ingen/World.hpp"
#include "ingen_config.h"
#include "lv2/lv2plug.in/ns/ext/atom/util.h"
-#include "raul/log.hpp"
+#include "ingen/Log.hpp"
#include "Buffer.hpp"
#include "BufferFactory.hpp"
@@ -55,7 +55,7 @@ Buffer::Buffer(BufferFactory& bufs, LV2_URID type, uint32_t capacity)
#endif
if (ret) {
- Raul::error << "Failed to allocate event buffer." << std::endl;
+ bufs.engine().log().error("Failed to allocate event buffer\n");
throw std::bad_alloc();
}
@@ -129,18 +129,12 @@ Buffer::port_data(PortType port_type)
return (float*)LV2_ATOM_BODY(_atom);
} else if (_atom->type == _factory.uris().atom_Sound) {
return (float*)LV2_ATOM_CONTENTS(LV2_Atom_Vector, _atom);
- } else {
- Raul::warn << "Audio data requested from non-audio buffer " << this << " :: "
- << _atom->type << " - "
- << _factory.engine().world()->uri_map().unmap_uri(_atom->type)
- << std::endl;
- assert(false);
- return NULL;
}
break;
default:
return _atom;
}
+ return NULL;
}
const void*