← Back to branch summary

~misono/nvdajp/MiscellaneousDependencies

« back to all changes in this revision

Viewing changes to include/espeak/src/speak_lib.cpp

  • Committer: Takuya Nishimoto
  • Date: 2012-05-06 14:35:57 UTC
  • Revision ID: nishimotz@gmail.com-20120506143557-1h0itsvl96dsnd4s
imporeted espeak-1.46.17 05.May.2012

Show diffs side-by-side

added added

removed removed

Lines of Context:
include/espeak/src/speak_lib.cpp
66
66
int (* phoneme_callback)(const char *) = NULL;
67
67
 
68
68
char path_home[N_PATH_HOME];   // this is the espeak-data directory
 
69
extern int saved_parameters[N_SPEECH_PARAM]; //Parameters saved on synthesis start
69
70
 
70
71
 
71
72
void WVoiceChanged(voice_t *wvoice)
574
575
        if((type == espeakEVENT_MARK) || (type == espeakEVENT_PLAY))
575
576
                ep->id.name = &namedata[value];
576
577
        else
 
578
//#ifdef deleted
 
579
// temporarily removed, don't introduce until after eSpeak version 1.46.02
577
580
        if(type == espeakEVENT_PHONEME)
578
581
        {
579
582
                int *p;
582
585
                p[1] = value2;
583
586
        }
584
587
        else
 
588
//#endif
585
589
        {
586
590
                ep->id.number = value;
587
591
        }
606
610
        my_unique_identifier = unique_identifier;
607
611
        my_user_data = user_data;
608
612
        
 
613
        for (int i=0; i < N_SPEECH_PARAM; i++)
 
614
                saved_parameters[i] = param_stack[0].parameter[i];
 
615
 
609
616
        switch(position_type)
610
617
                {
611
618
                case POS_CHARACTER:
785
792
//      SetVoiceByName("default");
786
793
        
787
794
        for(param=0; param<N_SPEECH_PARAM; param++)
788
 
                param_stack[0].parameter[param] = param_defaults[param];
 
795
                param_stack[0].parameter[param] = saved_parameters[param] = param_defaults[param];
789
796
        
790
797
        SetParameter(espeakRATE,175,0);
791
798
        SetParameter(espeakVOLUME,100,0);
1167
1174
        SHOW_TIME("espeak_Cancel > LEAVE");
1168
1175
#endif
1169
1176
        embedded_value[EMBED_T] = 0;    // reset echo for pronunciation announcements
 
1177
 
 
1178
        for (int i=0; i < N_SPEECH_PARAM; i++)
 
1179
                SetParameter(i, saved_parameters[i], 0);
 
1180
 
1170
1181
        return EE_OK;
1171
1182
}   //  end of espeak_Cancel
1172
1183