Merge pull request #1111

src/libespeak-ng/compiledata.c

 
 	fclose(f_report);
 
+	WavegenFini();
+
 	if (resample_count > 0) {
 		fprintf(f_errors, "\n%d WAV files resampled to %d Hz\n", resample_count, samplerate_native);
 		fprintf(log, "Compiled phonemes: %d errors, %d files resampled to %d Hz.\n", error_count, resample_count, samplerate_native);

src/libespeak-ng/klatt.c

 	}
 }
 
+void KlattFini(void)
+{
+#ifdef INCLUDE_SPEECHPLAYER
+	KlattFiniSP();
+#endif
+}
+
 /*
    function FRAME_INIT
 

src/libespeak-ng/klatt.h

 }  klatt_peaks_t;
 
 void KlattInit(void);
+void KlattFini(void);
 void KlattReset(int control);
 int Wavegen_Klatt(int length, int resume, frame_t *fr1, frame_t *fr2, WGEN_DATA *wdata, voice_t *wvoice);
 

src/libespeak-ng/sPlayer.c

 	speechPlayerHandle=speechPlayer_initialize(22050);
 }
 
-void KlattResetSP() {
+void KlattFiniSP() {
 	speechPlayer_terminate(speechPlayerHandle);
-	speechPlayerHandle=speechPlayer_initialize(22050);
+}
+
+void KlattResetSP() {
+	KlattFiniSP();
+	KlattInitSP();
 }
 
 int Wavegen_KlattSP(WGEN_DATA *wdata, voice_t *wvoice, int length, int resume, frame_t *fr1, frame_t *fr2){

src/libespeak-ng/sPlayer.h

 
 	void KlattInitSP(void);
 	void KlattResetSP(void);
+	void KlattFiniSP(void);
 	int Wavegen_KlattSP(WGEN_DATA *wdata, voice_t *wvoice, int length, int resume, frame_t *fr1, frame_t *fr2);
 
 #ifdef __cplusplus

src/libespeak-ng/wavegen.c

 #endif
 }
 
+void WavegenFini(void)
+{
+#ifdef INCLUDE_KLATT
+	KlattFini();
+#endif
+}
+
 int GetAmplitude(void)
 {
 	int amp;

src/libespeak-ng/wavegen.h

 void WavegenInit(int rate,
 		int wavemult_fact);
 
+void WavegenFini(void);
+
 
 int WavegenFill(void);
 void WavegenSetVoice(voice_t *v);