From eec9ac2b47066acd2b8111e970c30fbaf67e477c Mon Sep 17 00:00:00 2001
From: Tristan Matthews <le.businessman@gmail.com>
Date: Sat, 28 Apr 2012 17:39:16 -0400
Subject: [PATCH] * #9832: codecs: fix logging
---
daemon/src/audio/codecs/audiocodecfactory.cpp | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/daemon/src/audio/codecs/audiocodecfactory.cpp b/daemon/src/audio/codecs/audiocodecfactory.cpp
index 809c6a59dc..b2c7f358d1 100644
--- a/daemon/src/audio/codecs/audiocodecfactory.cpp
+++ b/daemon/src/audio/codecs/audiocodecfactory.cpp
@@ -48,7 +48,7 @@ AudioCodecFactory::AudioCodecFactory() :
CodecVector codecDynamicList(scanCodecDirectory());
if (codecDynamicList.empty())
- ERROR("Error - No codecs available");
+ ERROR("No codecs available");
else {
for (CodecVector::const_iterator iter = codecDynamicList.begin();
iter != codecDynamicList.end() ; ++iter) {
@@ -99,7 +99,7 @@ AudioCodecFactory::getCodec(int payload) const
if (iter != codecsMap_.end())
return iter->second;
else {
- ERROR("CodecDescriptor: cannot find codec %i", payload);
+ ERROR("Cannot find codec %i", payload);
return NULL;
}
}
@@ -166,7 +166,7 @@ std::vector<sfl::Codec*> AudioCodecFactory::scanCodecDirectory()
for (size_t i = 0 ; i < dirToScan.size() ; i++) {
std::string dirStr = dirToScan[i];
- DEBUG("CodecDescriptor: Scanning %s to find audio codecs....", dirStr.c_str());
+ DEBUG("Scanning %s to find audio codecs....", dirStr.c_str());
DIR *dir = opendir(dirStr.c_str());
@@ -202,7 +202,7 @@ sfl::Codec* AudioCodecFactory::loadCodec(const std::string &path)
void * codecHandle = dlopen(path.c_str() , RTLD_LAZY);
if (!codecHandle) {
- ERROR("%s\n", dlerror());
+ ERROR("%s", dlerror());
return NULL;
}
@@ -212,7 +212,7 @@ sfl::Codec* AudioCodecFactory::loadCodec(const std::string &path)
char *error = dlerror();
if (error) {
- ERROR("%s\n", error);
+ ERROR("%s", error);
return NULL;
}
@@ -231,7 +231,7 @@ void AudioCodecFactory::unloadCodec(CodecHandlePointer p)
char *error = dlerror();
if (error) {
- ERROR("%s\n", error);
+ ERROR("%s", error);
return;
}
@@ -251,7 +251,7 @@ sfl::Codec* AudioCodecFactory::instantiateCodec(int payload) const
char *error = dlerror();
if (error)
- ERROR("%s\n", error);
+ ERROR("%s", error);
else
return createCodec();
}
--
GitLab