← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/synthesize.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Luke Yelavich
  • Date: 2011-05-04 11:25:46 UTC
  • mfrom: (1.1.24 upstream) (5.1.10 sid)
  • Revision ID: james.westby@ubuntu.com-20110504112546-ykijzihgc7ybgzn2
Tags: 1.45.04-1ubuntu1
* Merge from debian unstable, remaining changes:
  - Add gbp.conf for use with git buildpackage
  - Update the explanation of the -b command-line flag in the espeak manpage

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/synthesize.cpp
200
200
        else
201
201
                len = (pause * speed.wav_factor)/256;
202
202
 
203
 
        if(len < 5) len = 5;      // mS, limit the amount to which pauses can be shortened
 
203
        if(len < speed.min_pause)
 
204
        {
 
205
                len = speed.min_pause;      // mS, limit the amount to which pauses can be shortened
 
206
        }
204
207
        return(len);
205
208
}
206
209
 
1215
1218
}  // end of DoMarker
1216
1219
 
1217
1220
 
 
1221
void DoSonicSpeed(int value)
 
1222
{//=========================
 
1223
// value, multiplier * 1024
 
1224
        wcmdq[wcmdq_tail][0] = WCMD_SONIC_SPEED;
 
1225
        wcmdq[wcmdq_tail][1] = value;
 
1226
        WcmdqInc();
 
1227
}  // end of DoSonicSpeed
 
1228
 
 
1229
 
1218
1230
void DoVoiceChange(voice_t *v)
1219
1231
{//===========================
1220
1232
// allocate memory for a copy of the voice data, and free it in wavegenfill()
1459
1471
                                }
1460
1472
                        }
1461
1473
 
1462
 
                        if((prev->type==phVOWEL) || (prev->ph->phflags & phVOWEL2))
 
1474
                        if((prev->type==phVOWEL) || (prev->ph->phflags & phVOWEL2) || (ph->phflags & phPREVOICE))
1463
1475
                        {
1464
1476
                                // a period of voicing before the release
1465
1477
                                InterpretPhoneme(NULL, 0x01, p, &phdata);