Skip to content

Commit 6b713a3

Browse files
committed
Removed unused variables and code related to indexing.
1 parent 005f755 commit 6b713a3

File tree

2 files changed

+1
-42
lines changed

2 files changed

+1
-42
lines changed

ttsengobj.cpp

Lines changed: 1 addition & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -77,28 +77,6 @@ return eciDataAbort;
7777
if (Msg == eciWaveformBuffer && lParam > 0)
7878
{
7979
SAPI->m_OutputSite->Write(SAPI->buffer, lParam*2, NULL);
80-
SAPI->m_AudioOffset += lParam*2;
81-
}
82-
if (Msg == eciIndexReply && lParam < 0x7fffffff && SAPI->m_pCurrFrag != NULL)
83-
{
84-
CSpEvent Event;
85-
Event.eEventId = SPEI_WORD_BOUNDARY;
86-
Event.elParamType = SPET_LPARAM_IS_UNDEFINED;
87-
Event.ullAudioStreamOffset = SAPI->m_AudioOffset;
88-
Event.lParam = SAPI->m_pCurrFrag->ulTextSrcOffset;
89-
Event.wParam = SAPI->m_pCurrFrag->ulTextLen;
90-
SAPI->m_OutputSite->AddEvents( &Event, 1 );
91-
SAPI->m_pCurrFrag = SAPI->m_pCurrFrag->pNext;
92-
}
93-
if (Msg == eciIndexReply && lParam == 0x7fffffff)
94-
{
95-
CSpEvent Event;
96-
Event.eEventId = SPEI_SENTENCE_BOUNDARY;
97-
Event.elParamType = SPET_LPARAM_IS_UNDEFINED;
98-
Event.ullAudioStreamOffset = 0;
99-
Event.lParam = 0;
100-
Event.wParam = SAPI->m_TotalLen;
101-
SAPI->m_OutputSite->AddEvents( &Event, 1 );
10280
}
10381
return eciDataProcessed;
10482
}
@@ -361,10 +339,6 @@ STDMETHODIMP CTTSEngObj::Speak( DWORD dwSpeakFlags,
361339
return hr;
362340
}
363341
m_OutputSite = pOutputSite;
364-
m_pCurrFrag = pTextFragList;
365-
m_AudioOffset = 0;
366-
m_IndexNum = 1;
367-
m_TotalLen = 0;
368342

369343
while(pTextFragList != NULL)
370344
{
@@ -402,6 +376,7 @@ STDMETHODIMP CTTSEngObj::Speak( DWORD dwSpeakFlags,
402376
{
403377
//--- Notify SAPI how many items we skipped. We're returning zero
404378
// because this feature isn't implemented.
379+
hr = pOutputSite->CompleteSkip( 0 );
405380
}
406381
}
407382

@@ -418,10 +393,6 @@ STDMETHODIMP CTTSEngObj::Speak( DWORD dwSpeakFlags,
418393
text2speak[strsize] = 0;
419394
WideCharToMultiByte(CP_ACP, 0, pTextFragList->pTextStart, pTextFragList->ulTextLen, text2speak, strsize, NULL, NULL);
420395
if (text2speak) eciAddText(engine, text2speak);
421-
//Insert an index
422-
//Increment index number and total length
423-
m_IndexNum++;
424-
m_TotalLen += pTextFragList->ulTextLen;
425396
break;
426397
}
427398
case SPVA_Speak:
@@ -434,10 +405,6 @@ STDMETHODIMP CTTSEngObj::Speak( DWORD dwSpeakFlags,
434405
text2speak[strsize] = 0;
435406
WideCharToMultiByte(CP_ACP, 0, pTextFragList->pTextStart, pTextFragList->ulTextLen, text2speak, strsize, NULL, NULL);
436407
if (text2speak) eciAddText(engine, text2speak);
437-
//Insert an index
438-
//Increment index number and total length
439-
m_IndexNum++;
440-
m_TotalLen += pTextFragList->ulTextLen;
441408
break;
442409
}
443410

@@ -473,8 +440,6 @@ STDMETHODIMP CTTSEngObj::Speak( DWORD dwSpeakFlags,
473440
pTextFragList = pTextFragList->pNext;
474441
}
475442

476-
//Mark the end of the text
477-
478443
//Synthesize text
479444
eciSynthesize(engine);
480445

ttsengobj.h

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -103,12 +103,6 @@ class ATL_NO_VTABLE CTTSEngObj :
103103
unsigned long m_voice;
104104
unsigned long m_samplerate;
105105

106-
//ECI indexing
107-
const SPVTEXTFRAG* m_pCurrFrag;
108-
unsigned long m_AudioOffset;
109-
unsigned long m_IndexNum;
110-
unsigned long m_TotalLen;
111-
112106
};
113107

114108
#endif //--- This must be the last line in the file

0 commit comments

Comments
 (0)