diff options
| author | Jaromir Wysoglad | 2019-07-24 11:32:31 +0200 |
|---|---|---|
| committer | Filippos Karapetis | 2019-09-01 22:47:55 +0300 |
| commit | c7dbf192ef2122cfaa82ffb3ae3bc05ae10e1e12 (patch) | |
| tree | f8f0a1c90c2bbb7ac85e6caa219ca940ee76ebcd /backends/text-to-speech | |
| parent | 1795206289c0d3c3dd7ad24c8f19ee3700b2ac83 (diff) | |
| download | scummvm-rg350-c7dbf192ef2122cfaa82ffb3ae3bc05ae10e1e12.tar.gz scummvm-rg350-c7dbf192ef2122cfaa82ffb3ae3bc05ae10e1e12.tar.bz2 scummvm-rg350-c7dbf192ef2122cfaa82ffb3ae3bc05ae10e1e12.zip | |
TTS: Remove unneeded code
Remove debuging outputs
Remove commented iconv implementation of text conversion to UTF-8
Diffstat (limited to 'backends/text-to-speech')
| -rw-r--r-- | backends/text-to-speech/linux/linux-text-to-speech.cpp | 30 | ||||
| -rw-r--r-- | backends/text-to-speech/windows/windows-text-to-speech.cpp | 1 |
2 files changed, 0 insertions, 31 deletions
diff --git a/backends/text-to-speech/linux/linux-text-to-speech.cpp b/backends/text-to-speech/linux/linux-text-to-speech.cpp index 8c797d7cb2..828eb877b3 100644 --- a/backends/text-to-speech/linux/linux-text-to-speech.cpp +++ b/backends/text-to-speech/linux/linux-text-to-speech.cpp @@ -31,7 +31,6 @@ //#include <iconv.h> #include "common/translation.h" -#include "common/debug.h" #include "common/system.h" #include "common/ustr.h" #include "common/config-manager.h" @@ -124,33 +123,6 @@ Common::String LinuxTextToSpeechManager::strToUtf8(Common::String str, Common::S warning("Could not convert text to UTF-8"); return result; - - // ICONV implementation (supports more charsets) - /*size_t inbytes = str.size(); - char *inStr = new char[inbytes + 1]; - char *in = inStr; - strcpy(inStr, str.c_str()); - - size_t outbytes = str.size() * 2 - 1; - char *destStr = new char[outbytes + 1]; - char *out = destStr; - iconv_t conv = iconv_open("UTF-8//IGNORE", charset.c_str()); - - if (conv == (iconv_t)-1) { - warning("Could not convert string from: %s to UTF-8", charset.c_str()); - return ""; - } - - if (iconv(conv, &in, &inbytes, &out, &outbytes) == (size_t)-1) { - warning("Could not convert string from: %s to UTF-8", charset.c_str()); - return ""; - } - - destStr[outbytes + 1] = 0; - Common::String result = destStr; - delete[] inStr; - delete[] destStr; - return result; */ #else return Common::String(); #endif @@ -167,13 +139,11 @@ bool LinuxTextToSpeechManager::say(Common::String str, Common::String charset) { charset = "ASCII"; #endif } - debug("charset: %s", charset.c_str()); str = strToUtf8(str, charset); if (isSpeaking()) stop(); - debug("say: %s", str.c_str()); if(spd_say(_connection, SPD_MESSAGE, str.c_str()) == -1) { //restart the connection if (_connection != 0) diff --git a/backends/text-to-speech/windows/windows-text-to-speech.cpp b/backends/text-to-speech/windows/windows-text-to-speech.cpp index f5c88ff12d..21ab0242b1 100644 --- a/backends/text-to-speech/windows/windows-text-to-speech.cpp +++ b/backends/text-to-speech/windows/windows-text-to-speech.cpp @@ -38,7 +38,6 @@ #include "common/translation.h" -#include "common/debug.h" #include "common/system.h" #include "common/ustr.h" #include "common/config-manager.h" |