~ubuntu-branches/ubuntu/oneiric/espeak/oneiric

« back to all changes in this revision

Viewing changes to src/speak.cpp

Committer: Bazaar Package Importer
Author(s): Luke Yelavich
Date: 2008-08-26 09:37:23 UTC
mfrom: (1.1.12 upstream)
Revision ID: james.westby@ubuntu.com-20080826093723-lwblp0nwfd93sggb

Tags: 1.38-0ubuntu1

New upstream release.

files added:
espeak-data/mbrola_ph/de2_phtrans

espeak-data/mbrola_ph/ptbr4_phtrans

espeak-data/mbrola_ph/ptbr_phtrans

espeak-data/voices/fr-be

espeak-data/voices/mb/mb-br1

espeak-data/voices/mb/mb-br3

espeak-data/voices/mb/mb-br4

espeak-data/voices/mb/mb-de2

files removed:
espeak-data/voices/!v/wisper

files modified:
ChangeLog

debian/changelog

dictsource/af_list *

dictsource/af_rules *

dictsource/cs_rules

dictsource/cy_list

dictsource/de_list

dictsource/de_rules

dictsource/dict_log

dictsource/dict_phonemes

dictsource/en_list

dictsource/en_rules

dictsource/fi_list *

dictsource/fi_rules *

dictsource/fr_list *

dictsource/fr_rules *

dictsource/hbs_rules *

dictsource/hi_list *

dictsource/hi_rules *

dictsource/hu_list *

dictsource/id_list

dictsource/id_rules

dictsource/is_list *

dictsource/jbo_list

dictsource/la_list *

dictsource/la_rules *

dictsource/mk_list *

dictsource/mk_rules *

dictsource/nl_list

dictsource/nl_rules

dictsource/no_list *

dictsource/pt_list *

dictsource/pt_rules *

dictsource/ro_list *

dictsource/ro_rules *

dictsource/ru_list *

dictsource/ru_rules *

dictsource/sk_list *

dictsource/sk_rules *

dictsource/sv_list *

dictsource/sv_rules *

dictsource/zh_list

dictsource/zh_rules

dictsource/zhy_rules *

docs/index.html

docs/languages.html

docs/voices.html

espeak-data/af_dict *

espeak-data/config *

espeak-data/cs_dict

espeak-data/cy_dict *

espeak-data/de_dict

espeak-data/el_dict *

espeak-data/en_dict

espeak-data/eo_dict *

espeak-data/es_dict *

espeak-data/fi_dict *

espeak-data/fr_dict *

espeak-data/hi_dict *

espeak-data/id_dict

espeak-data/it_dict *

espeak-data/jbo_dict

espeak-data/mk_dict

espeak-data/nl_dict *

espeak-data/no_dict *

espeak-data/phondata *

espeak-data/phonindex *

espeak-data/phontab *

espeak-data/pl_dict *

espeak-data/pt_dict *

espeak-data/ru_dict *

espeak-data/sv_dict *

espeak-data/ta_dict

espeak-data/vi_dict *

espeak-data/voices/!v/croak *

espeak-data/voices/!v/f1 *

espeak-data/voices/!v/f2 *

espeak-data/voices/!v/m1 *

espeak-data/voices/!v/m5 *

espeak-data/voices/!v/m6 *

espeak-data/voices/!v/whisper *

espeak-data/voices/af *

espeak-data/voices/bs *

espeak-data/voices/cs *

espeak-data/voices/cy *

espeak-data/voices/de *

espeak-data/voices/default *

espeak-data/voices/el *

espeak-data/voices/en/en *

espeak-data/voices/en/en-n *

espeak-data/voices/en/en-r *

espeak-data/voices/en/en-rp *

espeak-data/voices/en/en-sc *

espeak-data/voices/en/en-wi *

espeak-data/voices/en/en-wm *

espeak-data/voices/eo *

espeak-data/voices/es *

espeak-data/voices/es-la *

espeak-data/voices/fi *

espeak-data/voices/fr *

espeak-data/voices/grc *

espeak-data/voices/hi *

espeak-data/voices/hr *

espeak-data/voices/hu *

espeak-data/voices/id *

espeak-data/voices/is *

espeak-data/voices/it *

espeak-data/voices/ku *

espeak-data/voices/mb/mb-af1 *

espeak-data/voices/mb/mb-af1-en *

espeak-data/voices/mb/mb-cr1 *

espeak-data/voices/mb/mb-cz2 *

espeak-data/voices/mb/mb-de4 *

espeak-data/voices/mb/mb-de4-en *

espeak-data/voices/mb/mb-de5 *

espeak-data/voices/mb/mb-de5-en *

espeak-data/voices/mb/mb-de7 *

espeak-data/voices/mb/mb-en1 *

espeak-data/voices/mb/mb-es1 *

espeak-data/voices/mb/mb-fr1 *

espeak-data/voices/mb/mb-fr1-en *

espeak-data/voices/mb/mb-fr4 *

espeak-data/voices/mb/mb-fr4-en *

espeak-data/voices/mb/mb-gr2 *

espeak-data/voices/mb/mb-gr2-en *

espeak-data/voices/mb/mb-hu1 *

espeak-data/voices/mb/mb-hu1-en *

espeak-data/voices/mb/mb-id1 *

espeak-data/voices/mb/mb-it3 *

espeak-data/voices/mb/mb-it4 *

espeak-data/voices/mb/mb-la1 *

espeak-data/voices/mb/mb-nl2 *

espeak-data/voices/mb/mb-nl2-en *

espeak-data/voices/mb/mb-pl1 *

espeak-data/voices/mb/mb-pl1-en *

espeak-data/voices/mb/mb-ro1 *

espeak-data/voices/mb/mb-ro1-en *

espeak-data/voices/mb/mb-sw1 *

espeak-data/voices/mb/mb-sw1-en *

espeak-data/voices/mb/mb-sw2 *

espeak-data/voices/mb/mb-sw2-en *

espeak-data/voices/mb/mb-us1 *

espeak-data/voices/mb/mb-us2 *

espeak-data/voices/mb/mb-us3 *

espeak-data/voices/mk *

espeak-data/voices/nl *

espeak-data/voices/no *

espeak-data/voices/pl *

espeak-data/voices/pt *

espeak-data/voices/pt-pt *

espeak-data/voices/ro *

espeak-data/voices/ru *

espeak-data/voices/sk *

espeak-data/voices/sv *

espeak-data/voices/sw *

espeak-data/voices/ta *

espeak-data/voices/tr *

espeak-data/voices/vi *

espeak-data/voices/zhy *

espeak-data/zh_dict

espeak-data/zhy_dict *

platforms/big_endian/phondata-manifest *

platforms/windows/Readme.txt *

platforms/windows/espeakedit/PAStaticWMME.lib *

platforms/windows/espeakedit/ReadMe.txt *

platforms/windows/espeakedit/espeakedit.dsp *

platforms/windows/espeakedit/espeakedit.dsw *

platforms/windows/espeakedit/espeakedit.opt *

platforms/windows/espeakedit/espeakedit.plg *

platforms/windows/espeakedit/mondrian.icns *

platforms/windows/espeakedit/mondros2.ico *

platforms/windows/espeakedit/sample.rc *

platforms/windows/espeakedit/src/StdAfx.h *

platforms/windows/espeakedit/src/speech.h *

platforms/windows/espeakedit/src/stdint.h *

platforms/windows/espeakedit/src_copy/StdAfx.h *

platforms/windows/espeakedit/src_copy/speech.h *

platforms/windows/make_espeak.iss *

platforms/windows/make_espeakedit.iss *

platforms/windows/windows_cmd/!ReadMe.txt *

platforms/windows/windows_cmd/PAStaticWMME.lib *

platforms/windows/windows_cmd/StdAfx.cpp *

platforms/windows/windows_cmd/StdAfx.h *

platforms/windows/windows_cmd/espeak.dsp *

platforms/windows/windows_cmd/espeak.dsw *

platforms/windows/windows_cmd/src/speech.h *

platforms/windows/windows_cmd/src/stdint.h *

platforms/windows/windows_dll/StdAfx.cpp *

platforms/windows/windows_dll/StdAfx.h *

platforms/windows/windows_dll/espeak.dsp *

platforms/windows/windows_dll/espeak.dsw *

platforms/windows/windows_dll/src/StdAfx.h *

platforms/windows/windows_dll/src/speech.h *

platforms/windows/windows_dll/src/stdint.h *

platforms/windows/windows_sapi/TtsEng.aps *

platforms/windows/windows_sapi/TtsEng.h *

platforms/windows/windows_sapi/TtsEng.tlb *

platforms/windows/windows_sapi/TtsEng_i.c *

platforms/windows/windows_sapi/resource.h *

platforms/windows/windows_sapi/sapi.lib *

platforms/windows/windows_sapi/src/StdAfx.h *

platforms/windows/windows_sapi/src/speech.h *

platforms/windows/windows_sapi/src/stdint.h *

platforms/windows/windows_sapi/stdafx.cpp *

platforms/windows/windows_sapi/stdafx.h *

platforms/windows/windows_sapi/ttseng.cpp *

platforms/windows/windows_sapi/ttseng.def *

platforms/windows/windows_sapi/ttseng.dsp *

platforms/windows/windows_sapi/ttseng.dsw *

platforms/windows/windows_sapi/ttseng.idl *

platforms/windows/windows_sapi/ttseng.rc *

platforms/windows/windows_sapi/ttsengobj.cpp *

platforms/windows/windows_sapi/ttsengobj.h *

platforms/windows/windows_sapi/ttsengobj.rgs *

platforms/windows/windows_sapi/ttsengver.h *

platforms/windows/windows_sapi/version.rc2 *

src/Makefile *

src/compiledict.cpp *

src/dictionary.cpp *

src/espeak.cpp

src/fifo.cpp

src/intonation.cpp *

src/numbers.cpp

src/phoneme.h *

src/phonemelist.cpp *

src/portaudio.h *

src/portaudio18.h *

src/readclause.cpp

src/setlengths.cpp *

src/sintab.h *

src/speak.cpp *

src/speech.h *

src/synth_mbrola.cpp *

src/synthdata.cpp *

src/synthesize.cpp *

src/synthesize.h *

src/tr_languages.cpp

src/translate.cpp *

src/translate.h *

src/voices.cpp *

src/wave.cpp *

src/wave_pulse.cpp *

src/wave_sada.cpp *

src/wavegen.cpp *

Show diffs side-by-side

added added

removed removed

src/speak.cpp

101

"\t =<characters> is omitted, all punctuation is spoken.\n"

102

"--split=\"<minutes>\"\n"

103

"\t Starts a new WAV file every <minutes>. Used with -w\n"

104

"--voices=<langauge>\n"

104

"--voices=<language>\n"

105

"\t List the available voices for the specified language.\n"

106

"\t If <language> is omitted, then list all voices.\n"

107

"-k <integer>\n"

212

213

214

215

static void PitchAdjust(int pitch_adjustment)

216

{//==========================================

217

int ix, factor;

218

219

voice->pitch_base = (voice->pitch_base * pitch_adjust_tab[pitch_adjustment])/128;

220

221

// adjust formants to give better results for a different voice pitch

222

factor = 256 + (25 * (pitch_adjustment - 50))/50;

223

for(ix=0; ix<=5; ix++)

224

{

225

voice->freq[ix] = (voice->freq2[ix] * factor)/256;

226

}

227

} // end of PitchAdjustment

228

229

230

231

232

215

static int OpenWaveFile(const char *path, int rate)

233

216

//=================================================

234

217

{

734

717

735

718

if(pitch_adjustment != 50)

736

719

{

737

PitchAdjust(pitch_adjustment);

720

SetParameter(espeakPITCH,pitch_adjustment,0);

738

721

}

739

722

DoVoiceChange(voice);

740

723

Older »