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 /rbutil/rbutilqt | |
parent | 21e7a089501142795749db68e664640987d0c749 (diff) |
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
Diffstat (limited to 'rbutil/rbutilqt')
-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 Bryan Childs Dave Hooper Dominik Riebeling +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) wavfilename = QDir::tempPath()+ "/"+ filename + ".wav"; - QFileInfo filenameInf(filepath+filename); + QFileInfo filenameInf(filepath+"/"+filename); QFileInfo wavfilenameInf(wavfilename); //! the actual generation of the .talk files @@ -154,7 +154,7 @@ bool TalkFileCreator::createTalkFiles(ProgressloggerInterface* logger) QCoreApplication::processEvents(); } m_logger->addItem(tr("Encoding of %1").arg(toSpeak),LOGINFO); - if(!m_enc->encode(wavfilename,filepath+filename)) + if(!m_enc->encode(wavfilename,filepath+"/"+filename)) { m_logger->addItem(tr("Encoding of %1 failed").arg(wavfilename),LOGERROR); m_logger->abort(); @@ -178,7 +178,7 @@ bool TalkFileCreator::createTalkFiles(ProgressloggerInterface* logger) installlog.setValue(wavfilename.remove(0,m_mountpoint.length()),now); //! add the .talk file to the install log - installlog.setValue(QString(filepath+filename).remove(0,m_mountpoint.length()),now); + installlog.setValue(QString(filepath+"/"+filename).remove(0,m_mountpoint.length()),now); it.next(); } |