diff options
Diffstat (limited to 'rbutil/rbutilqt/base')
-rw-r--r-- | rbutil/rbutilqt/base/rockboxinfo.cpp | 5 | ||||
-rw-r--r-- | rbutil/rbutilqt/base/rockboxinfo.h | 2 | ||||
-rw-r--r-- | rbutil/rbutilqt/base/voicefile.cpp | 4 | ||||
-rw-r--r-- | rbutil/rbutilqt/base/voicefile.h | 1 |
4 files changed, 11 insertions, 1 deletions
diff --git a/rbutil/rbutilqt/base/rockboxinfo.cpp b/rbutil/rbutilqt/base/rockboxinfo.cpp index f9c0ea5b23..e5bce09d2c 100644 --- a/rbutil/rbutilqt/base/rockboxinfo.cpp +++ b/rbutil/rbutilqt/base/rockboxinfo.cpp | |||
@@ -26,6 +26,7 @@ RockboxInfo::RockboxInfo(QString mountpoint, QString fname) | |||
26 | qDebug() << "[RockboxInfo] Getting version info from rockbox-info.txt"; | 26 | qDebug() << "[RockboxInfo] Getting version info from rockbox-info.txt"; |
27 | QFile file(mountpoint + "/" + fname); | 27 | QFile file(mountpoint + "/" + fname); |
28 | m_success = false; | 28 | m_success = false; |
29 | m_voicefmt = 400; // default value for compatibility | ||
29 | if(!file.exists()) | 30 | if(!file.exists()) |
30 | return; | 31 | return; |
31 | 32 | ||
@@ -40,6 +41,7 @@ RockboxInfo::RockboxInfo(QString mountpoint, QString fname) | |||
40 | QRegExp features("^Features:\\s+(\\S.*)"); | 41 | QRegExp features("^Features:\\s+(\\S.*)"); |
41 | QRegExp targetid("^Target id:\\s+(\\S.*)"); | 42 | QRegExp targetid("^Target id:\\s+(\\S.*)"); |
42 | QRegExp memory("^Memory:\\s+(\\S.*)"); | 43 | QRegExp memory("^Memory:\\s+(\\S.*)"); |
44 | QRegExp voicefmt("^Voice format:\\s+(\\S.*)"); | ||
43 | while (!file.atEnd()) | 45 | while (!file.atEnd()) |
44 | { | 46 | { |
45 | QString line = file.readLine().trimmed(); | 47 | QString line = file.readLine().trimmed(); |
@@ -68,6 +70,9 @@ RockboxInfo::RockboxInfo(QString mountpoint, QString fname) | |||
68 | else if(memory.indexIn(line) >= 0) { | 70 | else if(memory.indexIn(line) >= 0) { |
69 | m_ram = memory.cap(1).toInt(); | 71 | m_ram = memory.cap(1).toInt(); |
70 | } | 72 | } |
73 | else if(voicefmt.indexIn(line) >= 0) { | ||
74 | m_voicefmt = voicefmt.cap(1).toInt(); | ||
75 | } | ||
71 | } | 76 | } |
72 | 77 | ||
73 | file.close(); | 78 | file.close(); |
diff --git a/rbutil/rbutilqt/base/rockboxinfo.h b/rbutil/rbutilqt/base/rockboxinfo.h index 9ea6e2011f..af5cf227f7 100644 --- a/rbutil/rbutilqt/base/rockboxinfo.h +++ b/rbutil/rbutilqt/base/rockboxinfo.h | |||
@@ -34,6 +34,7 @@ public: | |||
34 | QString targetID() {return m_targetid;} | 34 | QString targetID() {return m_targetid;} |
35 | QString target() {return m_target;} | 35 | QString target() {return m_target;} |
36 | int ram() { return m_ram; } | 36 | int ram() { return m_ram; } |
37 | int voicefmt() { return m_voicefmt; } | ||
37 | bool success() { return m_success; } | 38 | bool success() { return m_success; } |
38 | QString revision(void) { return m_revision; } | 39 | QString revision(void) { return m_revision; } |
39 | QString release(void) { return m_release; } | 40 | QString release(void) { return m_release; } |
@@ -45,6 +46,7 @@ private: | |||
45 | QString m_targetid; | 46 | QString m_targetid; |
46 | QString m_target; | 47 | QString m_target; |
47 | int m_ram; | 48 | int m_ram; |
49 | int m_voicefmt; | ||
48 | bool m_success; | 50 | bool m_success; |
49 | }; | 51 | }; |
50 | 52 | ||
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 |
diff --git a/rbutil/rbutilqt/base/voicefile.h b/rbutil/rbutilqt/base/voicefile.h index f3f6c7a930..d34535e700 100644 --- a/rbutil/rbutilqt/base/voicefile.h +++ b/rbutil/rbutilqt/base/voicefile.h | |||
@@ -67,6 +67,7 @@ private: | |||
67 | QString m_lang; // the language which will be spoken | 67 | QString m_lang; // the language which will be spoken |
68 | QString m_versionstring; // version string to be used for logging | 68 | QString m_versionstring; // version string to be used for logging |
69 | int m_wavtrimThreshold; | 69 | int m_wavtrimThreshold; |
70 | int m_voiceformat; | ||
70 | 71 | ||
71 | bool m_abort; | 72 | bool m_abort; |
72 | QList<TalkGenerator::TalkEntry> m_talkList; | 73 | QList<TalkGenerator::TalkEntry> m_talkList; |