diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2010-02-10 16:53:20 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-02-10 16:53:20 -0800 |
| commit | ffc4e5ee7912b1e05e95661429b0edfa538deb8e (patch) | |
| tree | 087b1aa88769a47272264c17ed6bc26c376c772b /pico/lib/picoapi.c | |
| parent | 97854c75b5cf88fd708f2fb444c6bd5c3a8613b5 (diff) | |
| parent | e9f72c8954f29f10cb4feb16d328a1b5c1fd7169 (diff) | |
| download | external_svox-ffc4e5ee7912b1e05e95661429b0edfa538deb8e.zip external_svox-ffc4e5ee7912b1e05e95661429b0edfa538deb8e.tar.gz external_svox-ffc4e5ee7912b1e05e95661429b0edfa538deb8e.tar.bz2 | |
Merge "Patch from SVOX: 1.1.0.2 Engine Release Issues fixed since 1.1.0.0: - closing tags not interpreted in some cases where enclosed text contains a smaller-then sign - Discontinuities in energy transformation - Lexicon Access: entry with empty phonetic transcription mistaken as :G2P in seldom cases"
Diffstat (limited to 'pico/lib/picoapi.c')
| -rw-r--r-- | pico/lib/picoapi.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/pico/lib/picoapi.c b/pico/lib/picoapi.c index affd780..576100c 100644 --- a/pico/lib/picoapi.c +++ b/pico/lib/picoapi.c @@ -660,7 +660,7 @@ PICO_FUNC pico_getData( /** * pico_resetEngine : Resets the engine * @param engine : pointer to a Pico engine handle - * @param r_mode : reset mode + * @param resetMode : reset mode; one of PICO_RESET_FULL or PICO_RESET_SOFT * @return PICO_OK : successful * @return PICO_ERR_INVALID_HANDLE, PICO_ERR_NULLPTR_ACCESS : errors * @callgraph @@ -668,7 +668,7 @@ PICO_FUNC pico_getData( */ PICO_FUNC pico_resetEngine( pico_Engine engine, - pico_Status r_mode) + pico_Int32 resetMode) { pico_Status status = PICO_OK; @@ -677,10 +677,9 @@ PICO_FUNC pico_resetEngine( } else { picoctrl_engResetExceptionManager((picoctrl_Engine) engine); - if (r_mode<PICO_RESET_FULL) r_mode = PICO_RESET_FULL; - if (r_mode>PICO_RESET_SOFT) r_mode = PICO_RESET_FULL; + resetMode = (PICO_RESET_SOFT == resetMode) ? PICO_RESET_SOFT : PICO_RESET_FULL; - status = picoctrl_engReset((picoctrl_Engine) engine, (picoos_int32)r_mode); + status = picoctrl_engReset((picoctrl_Engine) engine, (picoos_int32)resetMode); } return status; |