diff options
| author | David Robillard <d@drobilla.net> | 2011-02-17 03:09:23 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2011-02-17 03:09:23 +0000 |
| commit | 8c6a7c4ad5f5cb6b3b583aefbfe6b0cf57414294 (patch) | |
| tree | 1d84a7e720df80823f0915068125438d6a7037ca | |
| parent | 0eab5bdf19130a4171aa9ce62ad7f969335a0f87 (diff) | |
| download | ingen-8c6a7c4ad5f5cb6b3b583aefbfe6b0cf57414294.tar.gz ingen-8c6a7c4ad5f5cb6b3b583aefbfe6b0cf57414294.tar.bz2 ingen-8c6a7c4ad5f5cb6b3b583aefbfe6b0cf57414294.zip | |
Consistent log output.
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@2972 a436a847-0d15-0410-975c-d299462d15a1
| -rw-r--r-- | src/module/Module.hpp | 8 | ||||
| -rw-r--r-- | src/module/World.cpp | 4 |
2 files changed, 8 insertions, 4 deletions
diff --git a/src/module/Module.hpp b/src/module/Module.hpp index 7c67a310..af5732af 100644 --- a/src/module/Module.hpp +++ b/src/module/Module.hpp @@ -18,8 +18,9 @@ #ifndef INGEN_MODULE_MODULE_HPP #define INGEN_MODULE_MODULE_HPP -#include <string> #include <glibmm/module.h> + +#include "raul/log.hpp" #include "raul/SharedPtr.hpp" namespace Ingen { @@ -32,7 +33,10 @@ class World; * All components of Ingen reside in one of these. */ struct Module { - virtual ~Module() {} + virtual ~Module() { + Raul::info << "[Module] Unloading " << library->get_name() << std::endl; + } + virtual void load(Ingen::Shared::World* world) = 0; SharedPtr<Glib::Module> library; diff --git a/src/module/World.cpp b/src/module/World.cpp index 67bd7aaf..4cdb9272 100644 --- a/src/module/World.cpp +++ b/src/module/World.cpp @@ -62,7 +62,7 @@ load_module(const string& name) if (Glib::file_test(filename, Glib::FILE_TEST_EXISTS)) { module = new Glib::Module(filename, Glib::MODULE_BIND_LAZY); if (*module) { - LOG(info) << "Loaded `" << name << "' from " << filename << endl; + LOG(info) << "Loading " << filename << endl; return SharedPtr<Glib::Module>(module); } else { delete module; @@ -79,7 +79,7 @@ load_module(const string& name) module->make_resident(); if (*module) { - LOG(info) << "Loaded `" << name << "' from " << INGEN_MODULE_DIR << endl; + LOG(info) << "Loading " << Shared::module_path(name) << endl; return SharedPtr<Glib::Module>(module); } else if (!module_path_found) { LOG(error) << "Unable to find " << name |