diff options
author | Steve Block <steveblock@google.com> | 2012-01-04 20:01:45 +0000 |
---|---|---|
committer | Steve Block <steveblock@google.com> | 2012-01-04 20:01:45 +0000 |
commit | 659851c7b5a2d0023266bf34634179ff8d08e3ba (patch) | |
tree | 7fb0726106b63f1f02e098bf2f6fca0c8385638b | |
parent | 9f6a1b7e86f22197609c851a45e99933402a2ff7 (diff) | |
download | external_svox-659851c7b5a2d0023266bf34634179ff8d08e3ba.zip external_svox-659851c7b5a2d0023266bf34634179ff8d08e3ba.tar.gz external_svox-659851c7b5a2d0023266bf34634179ff8d08e3ba.tar.bz2 |
Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGE
See https://android-git.corp.google.com/g/156801
Bug: 5449033
Change-Id: I2de8398913d131042541e344c3f8fa6db44f37aa
-rw-r--r-- | pico/tts/com_svox_picottsengine.cpp | 16 | ||||
-rwxr-xr-x | pico/tts/svox_ssml_parser.cpp | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/pico/tts/com_svox_picottsengine.cpp b/pico/tts/com_svox_picottsengine.cpp index 1ceb40e..704370e 100644 --- a/pico/tts/com_svox_picottsengine.cpp +++ b/pico/tts/com_svox_picottsengine.cpp @@ -313,7 +313,7 @@ static tts_result doLanguageSwitchFromLangIndex( int langIndex ) if (langIndex>=0) { /* If we already have a loaded locale, check whether it is the same one as requested. */ if (picoProp_currLang && (strcmp(picoProp_currLang, picoSupportedLang[langIndex]) == 0)) { - //LOGI("Language already loaded (%s == %s)", picoProp_currLang, + //ALOGI("Language already loaded (%s == %s)", picoProp_currLang, // picoSupportedLang[langIndex]); return TTS_SUCCESS; } @@ -488,7 +488,7 @@ static tts_result doLanguageSwitchFromLangIndex( int langIndex ) /* Set the current locale/voice. */ strcpy( picoProp_currLang, picoSupportedLang[langIndex] ); picoCurrentLangIndex = langIndex; - LOGI("loaded %s successfully", picoProp_currLang); + ALOGI("loaded %s successfully", picoProp_currLang); return TTS_SUCCESS; } @@ -512,7 +512,7 @@ static tts_result doLanguageSwitch( const char * locale ) LOGE("Tried to swith to non-supported locale %s", locale); return TTS_FAILURE; } - //LOGI("Found supported locale %s", picoSupportedLang[loclIndex]); + //ALOGI("Found supported locale %s", picoSupportedLang[loclIndex]); return doLanguageSwitchFromLangIndex( loclIndex ); } @@ -1127,7 +1127,7 @@ tts_result TtsEngine::loadLanguage(const char *lang, const char *country, const */ tts_result TtsEngine::setLanguage( const char * lang, const char * country, const char * variant ) { - //LOGI("TtsEngine::setLanguage %s %s %s", lang, country, variant); + //ALOGI("TtsEngine::setLanguage %s %s %s", lang, country, variant); int langIndex; int countryIndex; int i; @@ -1182,7 +1182,7 @@ tts_result TtsEngine::setLanguage( const char * lang, const char * country, cons { /* We didn't find a match on the country, but we had a match on the language. Use that language. */ - LOGI("TtsEngine::setLanguage found matching language(%s) but not matching country(%s).", + ALOGI("TtsEngine::setLanguage found matching language(%s) but not matching country(%s).", lang, country); } else @@ -1489,7 +1489,7 @@ tts_result TtsEngine::synthesizeText( const char * text, int8_t * buffer, size_t if (err == XML_STATUS_ERROR) { /* Note: for some reason expat always thinks the input document has an error at the end, even when the XML document is perfectly formed */ - LOGI("Warning: SSML document parsed with errors"); + ALOGI("Warning: SSML document parsed with errors"); } char * parsed_text = parser->getParsedDocument(); if (parsed_text) { @@ -1517,7 +1517,7 @@ tts_result TtsEngine::synthesizeText( const char * text, int8_t * buffer, size_t return TTS_FAILURE; } } - //LOGI("No language in SSML, using current language (%s).", picoProp_currLang); + //ALOGI("No language in SSML, using current language (%s).", picoProp_currLang); } delete parser; } else { @@ -1588,7 +1588,7 @@ tts_result TtsEngine::synthesizeText( const char * text, int8_t * buffer, size_t cbret = picoSynthDoneCBPtr(userdata, 16000, TTS_AUDIO_FORMAT_PCM_16_BIT, 1, buffer, bufused, TTS_SYNTH_PENDING); if (cbret == TTS_CALLBACK_HALT) { - LOGI("Halt requested by caller. Halting."); + ALOGI("Halt requested by caller. Halting."); picoSynthAbort = 1; ret = pico_resetEngine( picoEngine, PICO_RESET_SOFT ); break; diff --git a/pico/tts/svox_ssml_parser.cpp b/pico/tts/svox_ssml_parser.cpp index d5c9399..b696614 100755 --- a/pico/tts/svox_ssml_parser.cpp +++ b/pico/tts/svox_ssml_parser.cpp @@ -85,7 +85,7 @@ int SvoxSsmlParser::parseDocument(const char* ssmldoc, int isFinal) if (status == XML_STATUS_ERROR) { /* Note: for some reason Expat almost always complains about invalid tokens, even when document is well formed */ - LOGI("Parser error at line %d: %s\n", (int)XML_GetCurrentLineNumber(mParser), XML_ErrorString(XML_GetErrorCode(mParser))); + ALOGI("Parser error at line %d: %s\n", (int)XML_GetCurrentLineNumber(mParser), XML_ErrorString(XML_GetErrorCode(mParser))); } return status; } |