summaryrefslogtreecommitdiff
path: root/rbutil/rbutilqt/base/voicefile.cpp
diff options
context:
space:
mode:
authorDominik Riebeling <Dominik.Riebeling@gmail.com>2012-06-03 16:13:04 +0200
committerDominik Riebeling <Dominik.Riebeling@gmail.com>2012-06-05 23:24:54 +0200
commitb2380b535e99b4bc49d91bb228598f85362446ca (patch)
tree5144a4e0e9ef8b19e43ec9f71312a5b85901e1fe /rbutil/rbutilqt/base/voicefile.cpp
parent7c78963bbb09603e8ceb986b478ae4762a6f427b (diff)
downloadrockbox-b2380b535e99b4bc49d91bb228598f85362446ca.tar.gz
rockbox-b2380b535e99b4bc49d91bb228598f85362446ca.zip
voicefont: make format version a parameter.
Make hardcoded format version a parameter to allow adjusting depending on the installed Rockbox version. Rockbox Utility will read the version from the installed version. Since the command line voicefont tool is only intended for use in the current tree it uses a fixed version. Change-Id: I1ec935d47c71961e93b3c6bc6c5d816cd9fc83ff
Diffstat (limited to 'rbutil/rbutilqt/base/voicefile.cpp')
-rw-r--r--rbutil/rbutilqt/base/voicefile.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/rbutil/rbutilqt/base/voicefile.cpp b/rbutil/rbutilqt/base/voicefile.cpp
index bbb703bc3d..b7a5f8f760 100644
--- a/rbutil/rbutilqt/base/voicefile.cpp
+++ b/rbutil/rbutilqt/base/voicefile.cpp
@@ -59,6 +59,7 @@ bool VoiceFileCreator::createVoiceFile()
59 QString features = info.features(); 59 QString features = info.features();
60 m_targetid = info.targetID().toInt(); 60 m_targetid = info.targetID().toInt();
61 m_versionstring = info.version(); 61 m_versionstring = info.version();
62 m_voiceformat = info.voicefmt();
62 QString version = m_versionstring.left(m_versionstring.indexOf("-")).remove("r"); 63 QString version = m_versionstring.left(m_versionstring.indexOf("-")).remove("r");
63 64
64 //prepare download url 65 //prepare download url
@@ -231,7 +232,8 @@ void VoiceFileCreator::create(void)
231 return; 232 return;
232 } 233 }
233 234
234 voicefont(ids2,m_targetid,m_path.toLocal8Bit().data(), output); 235 qDebug() << "[VoiceFile] Running voicefont, format" << m_voiceformat;
236 voicefont(ids2,m_targetid,m_path.toLocal8Bit().data(), output, m_voiceformat);
235 // ids2 and output are closed by voicefont(). 237 // ids2 and output are closed by voicefont().
236 238
237 //cleanup 239 //cleanup