Merge branch 'development'

Conflicts:
	phsource/phonemes
	src/Makefile
This commit is contained in:
Reece H. Dunn
2014-05-23 17:16:17 +01:00
55 changed files with 3193 additions and 1092 deletions
+2 -1
View File
@@ -766,6 +766,7 @@ static int adjustPitch(
}
/* Skip over a pitch period, and copy period/speed samples to the output */
/* NOTE: Only called if speed > 1.0f */
static int skipPitchPeriod(
sonicStream stream,
short *samples,
@@ -777,7 +778,7 @@ static int skipPitchPeriod(
if(speed >= 2.0f) {
newSamples = period/(speed - 1.0f);
} else if(speed > 1.0f) {
} else {
newSamples = period;
stream->remainingInputToCopy = period*(2.0f - speed)/(speed - 1.0f);
}