diff options
author | Dominik Wenger <domonoky@googlemail.com> | 2008-07-03 20:03:17 +0000 |
---|---|---|
committer | Dominik Wenger <domonoky@googlemail.com> | 2008-07-03 20:03:17 +0000 |
commit | d97131240ee7ac46470541227f1119ab9b30cb8e (patch) | |
tree | 2c96dac5113fb6e12205694c7a2c22053a4a189c | |
parent | 21e7a089501142795749db68e664640987d0c749 (diff) | |
download | rockbox-d97131240ee7ac46470541227f1119ab9b30cb8e.tar.gz rockbox-d97131240ee7ac46470541227f1119ab9b30cb8e.zip |
rbutil: commit FS#9147, fixes another talkfile generation bug. Thanks to Tomer Shalev
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17930 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | rbutil/rbutilqt/CREDITS | 1 | ||||
-rw-r--r-- | rbutil/rbutilqt/talkfile.cpp | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/rbutil/rbutilqt/CREDITS b/rbutil/rbutilqt/CREDITS index 6351fcd85c..97210088be 100644 --- a/rbutil/rbutilqt/CREDITS +++ b/rbutil/rbutilqt/CREDITS | |||
@@ -4,3 +4,4 @@ Dominik Wenger | |||
4 | Bryan Childs | 4 | Bryan Childs |
5 | Dave Hooper | 5 | Dave Hooper |
6 | Dominik Riebeling | 6 | Dominik Riebeling |
7 | Tomer Shalev | ||
diff --git a/rbutil/rbutilqt/talkfile.cpp b/rbutil/rbutilqt/talkfile.cpp index 77f68ac8cb..4aa86fa21a 100644 --- a/rbutil/rbutilqt/talkfile.cpp +++ b/rbutil/rbutilqt/talkfile.cpp | |||
@@ -133,7 +133,7 @@ bool TalkFileCreator::createTalkFiles(ProgressloggerInterface* logger) | |||
133 | 133 | ||
134 | wavfilename = QDir::tempPath()+ "/"+ filename + ".wav"; | 134 | wavfilename = QDir::tempPath()+ "/"+ filename + ".wav"; |
135 | 135 | ||
136 | QFileInfo filenameInf(filepath+filename); | 136 | QFileInfo filenameInf(filepath+"/"+filename); |
137 | QFileInfo wavfilenameInf(wavfilename); | 137 | QFileInfo wavfilenameInf(wavfilename); |
138 | 138 | ||
139 | //! the actual generation of the .talk files | 139 | //! the actual generation of the .talk files |
@@ -154,7 +154,7 @@ bool TalkFileCreator::createTalkFiles(ProgressloggerInterface* logger) | |||
154 | QCoreApplication::processEvents(); | 154 | QCoreApplication::processEvents(); |
155 | } | 155 | } |
156 | m_logger->addItem(tr("Encoding of %1").arg(toSpeak),LOGINFO); | 156 | m_logger->addItem(tr("Encoding of %1").arg(toSpeak),LOGINFO); |
157 | if(!m_enc->encode(wavfilename,filepath+filename)) | 157 | if(!m_enc->encode(wavfilename,filepath+"/"+filename)) |
158 | { | 158 | { |
159 | m_logger->addItem(tr("Encoding of %1 failed").arg(wavfilename),LOGERROR); | 159 | m_logger->addItem(tr("Encoding of %1 failed").arg(wavfilename),LOGERROR); |
160 | m_logger->abort(); | 160 | m_logger->abort(); |
@@ -178,7 +178,7 @@ bool TalkFileCreator::createTalkFiles(ProgressloggerInterface* logger) | |||
178 | installlog.setValue(wavfilename.remove(0,m_mountpoint.length()),now); | 178 | installlog.setValue(wavfilename.remove(0,m_mountpoint.length()),now); |
179 | 179 | ||
180 | //! add the .talk file to the install log | 180 | //! add the .talk file to the install log |
181 | installlog.setValue(QString(filepath+filename).remove(0,m_mountpoint.length()),now); | 181 | installlog.setValue(QString(filepath+"/"+filename).remove(0,m_mountpoint.length()),now); |
182 | it.next(); | 182 | it.next(); |
183 | } | 183 | } |
184 | 184 | ||