aboutsummaryrefslogtreecommitdiffstats
path: root/src/base/songloading/songloader.cpp
diff options
context:
space:
mode:
authorAlexander Sulfrian <alexander@sulfrian.net>2011-11-29 04:52:52 +0100
committerAlexander Sulfrian <alexander@sulfrian.net>2013-01-05 17:17:50 +0100
commit53bd23d0e679746b78d0bcf9234e7b99983e6071 (patch)
tree51dd89aba98e57c026046fdfbe25ba72aab974a6 /src/base/songloading/songloader.cpp
parenta9c3f18ebc1dbb1de5c7c9d1585347ed25cc2b52 (diff)
downloadusdx-53bd23d0e679746b78d0bcf9234e7b99983e6071.tar.gz
usdx-53bd23d0e679746b78d0bcf9234e7b99983e6071.tar.xz
usdx-53bd23d0e679746b78d0bcf9234e7b99983e6071.zip
ported from log4cxx to log4cpp
log4cxx depends on Apache Portable Runtime Utility Library, so we switch to log4cpp with nearly the same features but with no dependencies for easier porting to other platforms
Diffstat (limited to 'src/base/songloading/songloader.cpp')
-rw-r--r--src/base/songloading/songloader.cpp12
1 files changed, 8 insertions, 4 deletions
diff --git a/src/base/songloading/songloader.cpp b/src/base/songloading/songloader.cpp
index 5562bdc7..5b46601b 100644
--- a/src/base/songloading/songloader.cpp
+++ b/src/base/songloading/songloader.cpp
@@ -30,8 +30,8 @@
namespace usdx
{
- log4cxx::LoggerPtr Songloader::log =
- log4cxx::Logger::getLogger("usdx.base.songloading.Songloader");
+ log4cpp::Category& Songloader::log =
+ log4cpp::Category::getInstance("usdx.base.songloading.Songloader");
Songloader *Songloader::instance = NULL;
@@ -61,7 +61,9 @@ namespace usdx
std::string ext = extension(filename);
std::map<std::string, SongloadingStrategyBaseFactory*>::iterator it = strategies.find(ext);
if (it == strategies.end()) {
- LOG4CXX_WARN(log, "No SongloadingStrategy found for file extension: '" << ext << "'");
+ log << log4cpp::Priority::WARN <<
+ "No SongloadingStrategy found for file extension: '" <<
+ ext << "'";
throw NoStrategyException("Unknown file format.");
}
@@ -73,7 +75,9 @@ namespace usdx
std::string ext = extension(song->get_filename());
std::map<std::string, SongloadingStrategyBaseFactory*>::iterator it = strategies.find(ext);
if (it == strategies.end()) {
- LOG4CXX_WARN(log, "No SongloadingStrategy found for file extension: '" << ext << "'");
+ log << log4cpp::Priority::WARN <<
+ "No SongloadingStrategy found for file extension: '" <<
+ ext << "'";
throw NoStrategyException("Unknown file format.");
}