mjohnson/espeak-ng
1
0
Fork 0
mirror of https://github.com/rhasspy/espeak-ng.git synced 2026-11-07 15:24:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'upstream' into development

Browse Source 
Conflicts:
	dictsource/dict_phonemes
	phsource/compile_report
This commit is contained in:
Reece H. Dunn
2014-11-01 21:58:15 +00:00
parent 1af0afa88c 8165a3029c
commit 8ae9195ac3
36 changed files with 2375 additions and 1392 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/numbers.cpp
+6 -3
View File
@@ -124,11 +124,12 @@ static ACCENTS accents_tab[] = {
#define L_EZH 70 // U+292
#define L_GLOTTAL 71 // U+294
#define L_RTAP 72 // U+27E
#define L_RLONG 73 // U+27C
static const short non_ascii_tab[] = {
0, 0x3b1, 0x259, 0x25b, 0x3b3, 0x3b9, 0x153, 0x3c9,
0x3c6, 0x283, 0x3c5, 0x292, 0x294, 0x27e
0x3c6, 0x283, 0x3c5, 0x292, 0x294, 0x27e, 0x27c
};
@@ -294,6 +295,8 @@ static const unsigned short letter_accents_0e0[] = {
CAPITAL,
LETTER('z',M_CARON,0),
LETTER('s',M_NAME,0), // long-s // U+17f
// LETTER('b',M_STROKE,0),
};
@@ -341,7 +344,7 @@ static const unsigned short letter_accents_250[] = {
0,//LETTER(L_OMEGA,M_CLOSED,0),
LETTER(L_PHI,0,0), // U+278
LETTER('r',M_TURNED,0),
0,//LETTER('r',M_TURNED,M_LEG),
LETTER(L_RLONG,M_TURNED,0),
LETTER('r',M_RETROFLEX,M_TURNED),
0,//LETTER('r',M_LEG,0),
LETTER('r',M_RETROFLEX,0),
@@ -351,7 +354,7 @@ static const unsigned short letter_accents_250[] = {
LETTER('r',M_TURNED,M_SMALLCAP),
LETTER('s',M_RETROFLEX,0),
0, // esh
0,//LETTER('j',M_BAR,L_IMPLOSIVE),
LETTER('j',M_HOOK,0), //LETTER('j',M_HOOK,M_BAR),
LETTER(L_ESH,M_REVERSED,0),
LETTER(L_ESH,M_CURL,0),
LETTER('t',M_TURNED,0),
src/sonic.cpp
+1 -1
View File
@@ -774,7 +774,7 @@ static int skipPitchPeriod(
float speed,
int period)
{
long newSamples;
long newSamples = period;
int numChannels = stream->numChannels;
if(speed >= 2.0f) {
src/synthdata.cpp
+1 -1
View File
@@ -35,7 +35,7 @@
#include "translate.h"
#include "wave.h"
const char *version_string = "1.48.11 31.Aug.14";
const char *version_string = "1.48.12 01.Nov.14";
const int version_phdata = 0x014801;
int option_device_number = -1;
src/voices.cpp
+1 -1
View File
@@ -612,7 +612,7 @@ voice_t *LoadVoice(const char *vname, int control)
static const char *voices_asia =
"az bn fa fa-pin gu hi hy hy-west id ka kn ku ml ms ne pa ta te tr vi vi-hue vi-sgn zh zh-yue ";
static const char *voices_europe =
"an bg bs ca cs cy da de el en en-us es et fi fr fr-be ga hr hu is it lt lv mk nl no pl pt-pt ro ru sk sq sr sv ";
"an bg bs ca cs cy da de el en en-us es et eu fi fr fr-be ga hr hu is it lt lv mk nl no pl pt-pt ro ru sk sq sr sv ";
strncpy0(voicename, vname, sizeof(voicename));