summaryrefslogtreecommitdiffstats
path: root/src/URIMap.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/URIMap.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/URIMap.cpp')
-rw-r--r--src/URIMap.cpp11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/URIMap.cpp b/src/URIMap.cpp
index 3d55046f..3344b1d0 100644
--- a/src/URIMap.cpp
+++ b/src/URIMap.cpp
@@ -18,22 +18,23 @@
#include <glib.h>
-#include "raul/log.hpp"
#include "ingen/URIMap.hpp"
using namespace std;
namespace Ingen {
-URIMap::URIMap(LV2_URID_Map* map, LV2_URID_Unmap* unmap)
- : _urid_map_feature(new URIDMapFeature(this, map))
+URIMap::URIMap(Log& log, LV2_URID_Map* map, LV2_URID_Unmap* unmap)
+ : _urid_map_feature(new URIDMapFeature(this, map, log))
, _urid_unmap_feature(new URIDUnmapFeature(this, unmap))
{
}
URIMap::URIDMapFeature::URIDMapFeature(URIMap* map,
- LV2_URID_Map* impl)
+ LV2_URID_Map* impl,
+ Log& alog)
: Feature(LV2_URID__map, &urid_map)
+ , log(alog)
{
if (impl) {
urid_map = *impl;
@@ -54,7 +55,7 @@ LV2_URID
URIMap::URIDMapFeature::map(const char* uri)
{
if (!Raul::URI::is_valid(uri)) {
- Raul::warn(Raul::fmt("Attempt to map invalid URI <%1%>\n") % uri);
+ log.error(Raul::fmt("Attempt to map invalid URI <%1%>\n") % uri);
return 0;
}
return urid_map.map(urid_map.handle, uri);