mjohnson/espeak-ng
1
0
Fork 0
mirror of https://github.com/rhasspy/espeak-ng.git synced 2026-11-01 13:54:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'e4854a9cd6' into android

Browse Source 
Conflicts:
	src/voices.cpp
This commit is contained in:
Reece H. Dunn
2013-03-13 20:55:49 +00:00
parent 2c06ab5d7d e4854a9cd6
commit 0e46be1177
38 changed files with 1442 additions and 1169 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/readclause.cpp
+1 -8
View File
@@ -741,7 +741,6 @@ static int LoadSoundFile(const char *fname, int index)
{
int ix;
int fd_temp;
const char *resample;
int header[3];
char command[sizeof(fname2)+sizeof(fname2)+40];
@@ -755,17 +754,11 @@ static int LoadSoundFile(const char *fname, int index)
fclose(f);
f = NULL;
if(header[2] == samplerate)
resample = "";
else
resample = "polyphase";
strcpy(fname_temp,"/tmp/espeakXXXXXX");
if((fd_temp = mkstemp(fname_temp)) >= 0)
{
close(fd_temp);
// sprintf(fname_temp,"%s.wav",tmpnam(NULL));
sprintf(command,"sox \"%s\" -r %d -w -s -c1 %s %s\n", fname, samplerate, fname_temp, resample);
sprintf(command,"sox \"%s\" -r %d -c1 -t wav %s\n", fname, samplerate, fname_temp);
if(system(command) == 0)
{
fname = fname_temp;