summaryrefslogtreecommitdiffstats
path: root/rbutil/rbutilqt/base
diff options
context:
space:
mode:
Diffstat (limited to 'rbutil/rbutilqt/base')
-rw-r--r--rbutil/rbutilqt/base/bootloaderinstallmpio.cpp24
-rw-r--r--rbutil/rbutilqt/base/bootloaderinstallsansa.cpp2
-rw-r--r--rbutil/rbutilqt/base/encoderlame.cpp2
-rw-r--r--rbutil/rbutilqt/base/talkfile.cpp7
-rw-r--r--rbutil/rbutilqt/base/talkgenerator.cpp3
-rw-r--r--rbutil/rbutilqt/base/ttssapi.cpp2
-rw-r--r--rbutil/rbutilqt/base/uninstall.cpp4
7 files changed, 23 insertions, 21 deletions
diff --git a/rbutil/rbutilqt/base/bootloaderinstallmpio.cpp b/rbutil/rbutilqt/base/bootloaderinstallmpio.cpp
index 97e96678c9..52a6f351f1 100644
--- a/rbutil/rbutilqt/base/bootloaderinstallmpio.cpp
+++ b/rbutil/rbutilqt/base/bootloaderinstallmpio.cpp
@@ -45,31 +45,31 @@ bool BootloaderInstallMpio::install(void)
{
if(m_offile.isEmpty())
return false;
-
+
qDebug() << "[BootloaderInstallMpio] installing bootloader";
-
+
// download firmware from server
emit logItem(tr("Downloading bootloader file"), LOGINFO);
-
+
connect(this, SIGNAL(downloadDone()), this, SLOT(installStage2()));
downloadBlStart(m_blurl);
-
+
return true;
}
void BootloaderInstallMpio::installStage2(void)
-{
+{
qDebug() << "[BootloaderInstallMpio] installStage2";
-
+
int origin = 0xe0000; /* MPIO HD200 bootloader address */
-
+
m_tempfile.open();
QString bootfile = m_tempfile.fileName();
m_tempfile.close();
-
+
int ret = mkmpioboot(m_offile.toLocal8Bit().data(),
bootfile.toLocal8Bit().data(), m_blfile.toLocal8Bit().data(), origin);
-
+
if(ret != 0)
{
QString error;
@@ -106,13 +106,13 @@ void BootloaderInstallMpio::installStage2(void)
error = tr("Unknown error number: %1").arg(ret);
break;
}
-
- qDebug() << tr("Patching original firmware failed: %1").arg(error);
+
+ qDebug() << "[BootloaderInstallMpio] Patching original firmware failed:" << error;
emit logItem(tr("Patching original firmware failed: %1").arg(error), LOGERROR);
emit done(true);
return;
}
-
+
//end of install
qDebug() << "[BootloaderInstallMpio] install successful";
emit logItem(tr("Success: modified firmware file created"), LOGINFO);
diff --git a/rbutil/rbutilqt/base/bootloaderinstallsansa.cpp b/rbutil/rbutilqt/base/bootloaderinstallsansa.cpp
index ae46df273d..b05839e297 100644
--- a/rbutil/rbutilqt/base/bootloaderinstallsansa.cpp
+++ b/rbutil/rbutilqt/base/bootloaderinstallsansa.cpp
@@ -166,7 +166,7 @@ void BootloaderInstallSansa::installStage3(bool mounted)
emit logItem(tr("Writing log aborted"), LOGERROR);
emit done(true);
}
- qDebug() << "version installed:" << m_blversion.toString(Qt::ISODate);
+ qDebug() << "[BootloaderInstallSansa] version installed:" << m_blversion.toString(Qt::ISODate);
}
diff --git a/rbutil/rbutilqt/base/encoderlame.cpp b/rbutil/rbutilqt/base/encoderlame.cpp
index 6cc93ff742..d545559656 100644
--- a/rbutil/rbutilqt/base/encoderlame.cpp
+++ b/rbutil/rbutilqt/base/encoderlame.cpp
@@ -178,7 +178,7 @@ bool EncoderLame::encode(QString input,QString output)
// input format used should be known. In case some TTS uses a
// different wave encoding some time this needs to get adjusted.
if(chunkdatalen < 16) {
- qDebug() << "fmt chunk too small!";
+ qDebug() << "[EncoderLame] fmt chunk too small!";
}
else {
unsigned char *buf = new unsigned char[chunkdatalen];
diff --git a/rbutil/rbutilqt/base/talkfile.cpp b/rbutil/rbutilqt/base/talkfile.cpp
index d7d0e5be75..b7d080de01 100644
--- a/rbutil/rbutilqt/base/talkfile.cpp
+++ b/rbutil/rbutilqt/base/talkfile.cpp
@@ -160,7 +160,7 @@ bool TalkFileCreator::createTalkList(QDir startDir)
entry.target = dir.path() + "/_dirname.talk";
entry.voiced = false;
entry.encoded = false;
- qDebug() << "toSpeak:" << entry.toSpeak
+ qDebug() << "[TalkFileCreator] toSpeak:" << entry.toSpeak
<< "target:" << entry.target
<< "intermediates:" << entry.wavfilename << entry.talkfilename;
m_talkList.append(entry);
@@ -204,7 +204,7 @@ bool TalkFileCreator::createTalkList(QDir startDir)
entry.target = fileInf.path() + "/" + fileInf.fileName() + ".talk";
entry.voiced = false;
entry.encoded = false;
- qDebug() << "toSpeak:" << entry.toSpeak
+ qDebug() << "[TalkFileCreator] toSpeak:" << entry.toSpeak
<< "target:" << entry.target
<< "intermediates:" <<
entry.wavfilename << entry.talkfilename;
@@ -249,7 +249,8 @@ bool TalkFileCreator::copyTalkFiles(QString* errString)
QFile::remove(m_talkList[i].target);
// copying
- qDebug() << "copying " << m_talkList[i].talkfilename << "to" << m_talkList[i].target;
+ qDebug() << "[TalkFileCreator] copying" << m_talkList[i].talkfilename
+ << "to" << m_talkList[i].target;
if(!QFile::copy(m_talkList[i].talkfilename,m_talkList[i].target))
{
*errString = tr("Copying of %1 to %2 failed").arg(m_talkList[i].talkfilename).arg(m_talkList[i].target);
diff --git a/rbutil/rbutilqt/base/talkgenerator.cpp b/rbutil/rbutilqt/base/talkgenerator.cpp
index ecb39cad2f..16e1b15184 100644
--- a/rbutil/rbutilqt/base/talkgenerator.cpp
+++ b/rbutil/rbutilqt/base/talkgenerator.cpp
@@ -207,7 +207,8 @@ TalkGenerator::Status TalkGenerator::encodeList(QList<TalkEntry>* list)
//skip non-voiced entrys
if(list->at(i).voiced == false)
{
- qDebug() << "non voiced entry" << list->at(i).toSpeak <<"detected";
+ qDebug() << "[TalkGenerator] non voiced entry detected:"
+ << list->at(i).toSpeak;
emit logProgress(++m_progress,progressMax);
continue;
}
diff --git a/rbutil/rbutilqt/base/ttssapi.cpp b/rbutil/rbutilqt/base/ttssapi.cpp
index 09c1dd0588..f726dcf8da 100644
--- a/rbutil/rbutilqt/base/ttssapi.cpp
+++ b/rbutil/rbutilqt/base/ttssapi.cpp
@@ -84,7 +84,7 @@ void TTSSapi::saveSettings()
void TTSSapi::updateVoiceList()
{
- qDebug() << "update voiceList";
+ qDebug() << "[TTSSapi] updating voicelist";
QStringList voiceList = getVoiceList(getSetting(eLANGUAGE)->current().toString());
getSetting(eVOICE)->setList(voiceList);
if(voiceList.size() > 0) getSetting(eVOICE)->setCurrent(voiceList.at(0));
diff --git a/rbutil/rbutilqt/base/uninstall.cpp b/rbutil/rbutilqt/base/uninstall.cpp
index cea0f4da57..ef6eb61ca5 100644
--- a/rbutil/rbutilqt/base/uninstall.cpp
+++ b/rbutil/rbutilqt/base/uninstall.cpp
@@ -66,7 +66,7 @@ void Uninstaller::uninstall(void)
if(installlog.contains(toDeleteList.at(j)))
{
deleteFile = false;
- qDebug() << "file still in use:" << toDeleteList.at(j);
+ qDebug() << "[Uninstaller] file still in use:" << toDeleteList.at(j);
}
installlog.endGroup();
}
@@ -79,7 +79,7 @@ void Uninstaller::uninstall(void)
emit logItem(tr("Could not delete %1")
.arg(toDelete.filePath()), LOGWARNING);
installlog.remove(toDeleteList.at(j));
- qDebug() << "deleted: " << toDelete.filePath() ;
+ qDebug() << "[Uninstaller] deleted:" << toDelete.filePath();
}
else // if it is a dir, remember it for later deletion
{