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/picosig.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/picosig.c')
-rw-r--r-- | pico/lib/picosig.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pico/lib/picosig.c b/pico/lib/picosig.c index 4282e24..f224e65 100644 --- a/pico/lib/picosig.c +++ b/pico/lib/picosig.c @@ -114,7 +114,7 @@ typedef struct sig_subobj * @callgraph * @callergraph */ -static pico_status_t sigInitialize(register picodata_ProcessingUnit this, picoos_int32 r_mode) +static pico_status_t sigInitialize(register picodata_ProcessingUnit this, picoos_int32 resetMode) { sig_subobj_t *sig_subObj; if (NULL == this || NULL == this->subObj) { @@ -147,7 +147,7 @@ static pico_status_t sigInitialize(register picodata_ProcessingUnit this, picoos /*----------------------------------------------------------------- * MANAGE LINGWARE INITIALIZATION IF NEEDED ------------------------------------------------------------------*/ - if (r_mode == PICO_RESET_FULL) { + if (resetMode == PICO_RESET_FULL) { /*not done when resetting SOFT*/ sig_subObj->pdfmgc = picokpdf_getPdfMUL( this->voice->kbArray[PICOKNOW_KBID_PDF_MGC]); @@ -166,7 +166,7 @@ static pico_status_t sigInitialize(register picodata_ProcessingUnit this, picoos /*----------------------------------------------------------------- * Initialize memory for DSP * ------------------------------------------------------------------*/ - sigDspInitialize(&(sig_subObj->sig_inner), r_mode); + sigDspInitialize(&(sig_subObj->sig_inner), resetMode); /*----------------------------------------------------------------- * Initialize modifiers * ------------------------------------------------------------------*/ @@ -178,7 +178,7 @@ static pico_status_t sigInitialize(register picodata_ProcessingUnit this, picoos /*----------------------------------------------------------------- * Initialize memory for DSP * ------------------------------------------------------------------*/ - sigDspInitialize(&(sig_subObj->sig_inner), r_mode); + sigDspInitialize(&(sig_subObj->sig_inner), resetMode); } |