diff options
Diffstat (limited to 'rbutil/rbutilqt/tts.cpp')
-rw-r--r-- | rbutil/rbutilqt/tts.cpp | 29 |
1 files changed, 12 insertions, 17 deletions
diff --git a/rbutil/rbutilqt/tts.cpp b/rbutil/rbutilqt/tts.cpp index da15497c14..eb78f31006 100644 --- a/rbutil/rbutilqt/tts.cpp +++ b/rbutil/rbutilqt/tts.cpp | |||
@@ -36,18 +36,13 @@ void initTTSList() | |||
36 | } | 36 | } |
37 | 37 | ||
38 | // function to get a specific encoder | 38 | // function to get a specific encoder |
39 | TTSBase* getTTS(QString ttsname) | 39 | TTSBase* getTTS(QString ttsName) |
40 | { | 40 | { |
41 | // init list if its empty | ||
42 | if(ttsList.count() == 0) initTTSList(); | ||
43 | |||
44 | QString ttsName = ttsList.key(ttsname); | ||
45 | |||
46 | // check cache | 41 | // check cache |
47 | if(ttsCache.contains(ttsName)) | 42 | if(ttsCache.contains(ttsName)) |
48 | return ttsCache.value(ttsName); | 43 | return ttsCache.value(ttsName); |
49 | 44 | ||
50 | TTSBase* tts; | 45 | TTSBase* tts; |
51 | if(ttsName == "sapi") | 46 | if(ttsName == "sapi") |
52 | { | 47 | { |
53 | tts = new TTSSapi(); | 48 | tts = new TTSSapi(); |
@@ -66,18 +61,18 @@ TTSBase* getTTS(QString ttsname) | |||
66 | QStringList getTTSList() | 61 | QStringList getTTSList() |
67 | { | 62 | { |
68 | // init list if its empty | 63 | // init list if its empty |
69 | if(ttsList.count() == 0) initTTSList(); | 64 | if(ttsList.count() == 0) |
65 | initTTSList(); | ||
70 | 66 | ||
71 | QStringList ttsNameList; | 67 | return ttsList.keys(); |
72 | QMapIterator<QString, QString> i(ttsList); | ||
73 | while (i.hasNext()) { | ||
74 | i.next(); | ||
75 | ttsNameList << i.value(); | ||
76 | } | ||
77 | |||
78 | return ttsNameList; | ||
79 | } | 68 | } |
80 | 69 | ||
70 | QString getTTSName(QString tts) | ||
71 | { | ||
72 | if(ttsList.isEmpty()) | ||
73 | initTTSList(); | ||
74 | return ttsList.value(tts); | ||
75 | } | ||
81 | 76 | ||
82 | /********************************************************************* | 77 | /********************************************************************* |
83 | * TTS Base | 78 | * TTS Base |