devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Use cutelogger for Rockbox Utility internal trace.

Browse source 
Change tracing from qDebug() to use cutelogger, which is available under the
LGPL2.1. This allows to automatically add filename and line number to the log,
and also provides multiple log levels.

Change-Id: I5dbdaf902ba54ea99f07ae10a07467c52fdac910
This commit is contained in:
Dominik Riebeling 2013-11-03 11:08:18 +01:00
parent 335ec75d60
commit 4d2ce949b3
65 changed files with 2420 additions and 455 deletions
Download patch file Download diff file Expand all files Collapse all files

13
rbutil/rbutilqt/base/voicefile.cpp
View file

@ -23,6 +23,7 @@
#include "rbsettings.h"
#include "systeminfo.h"
#include "ziputil.h"
#include "Logger.h"
VoiceFileCreator::VoiceFileCreator(QObject* parent) :QObject(parent)
{
@ -65,7 +66,7 @@ bool VoiceFileCreator::createVoiceFile()
// check if voicefile is present on target
QString fn = m_mountpoint + "/.rockbox/langs/voicestrings.zip";
qDebug() << "[VoiceFile] searching for zipped voicestrings at" << fn;
LOG_INFO() << "searching for zipped voicestrings at" << fn;
if(QFileInfo(fn).isFile()) {
// search for binary voice strings file in archive
ZipUtil z(this);
@ -79,7 +80,7 @@ bool VoiceFileCreator::createVoiceFile()
}
}
if(index < contents.size()) {
qDebug() << "[VoiceFile] extracting strings file from zip";
LOG_INFO() << "extracting strings file from zip";
// extract strings
QTemporaryFile stringsfile;
stringsfile.open();
@ -153,7 +154,7 @@ bool VoiceFileCreator::createVoiceFile()
genlang.replace("%REVISION%", version);
genlang.replace("%FEATURES%", features);
QUrl genlangUrl(genlang);
qDebug() << "[VoiceFileCreator] downloading" << genlangUrl;
LOG_INFO() << "downloading" << genlangUrl;
//download the correct genlang output
QTemporaryFile *downloadFile = new QTemporaryFile(this);
@ -175,7 +176,7 @@ bool VoiceFileCreator::createVoiceFile()
void VoiceFileCreator::downloadDone(bool error)
{
qDebug() << "[VoiceFileCreator] download done, error:" << error;
LOG_INFO() << "download done, error:" << error;
// update progress bar
emit logProgress(1,1);
@ -253,7 +254,7 @@ void VoiceFileCreator::create(void)
m_talkList.append(entry);
}
else if(entry.toSpeak.isEmpty()) {
qDebug() << "[Voicefile] Empty voice string for ID" << id;
LOG_WARNING() << "Empty voice string for ID" << id;
}
else {
m_talkList.append(entry);
@ -314,7 +315,7 @@ void VoiceFileCreator::create(void)
return;
}
qDebug() << "[VoiceFile] Running voicefont, format" << m_voiceformat;
LOG_INFO() << "Running voicefont, format" << m_voiceformat;
voicefont(ids2,m_targetid,m_path.toLocal8Bit().data(), output, m_voiceformat);
// ids2 and output are closed by voicefont().