Convert src/spect.cpp to src/libespeak-ng/spect.c.

Makefile.am

 	src/libespeak-ng/readclause.c \
 	src/libespeak-ng/phonemelist.c \
 	src/libespeak-ng/setlengths.c \
+	src/libespeak-ng/spect.c \
 	src/libespeak-ng/synthdata.c \
 	src/libespeak-ng/synthesize.c \
 	src/libespeak-ng/synth_mbrola.c \
 
 espeakedit_SOURCE = \
 	src/compiledata.cpp \
-	src/espeakedit.cpp \
-	src/spect.cpp
+	src/espeakedit.cpp
 
 if OPT_KLATT
 common_FLAGS  += -DINCLUDE_KLATT

src/spect.cpp → src/libespeak-ng/spect.c

 #include <stdlib.h>
 #include <string.h>
 
-extern "C" double ConvertFromIeeeExtended(unsigned char *bytes);
-extern "C" int PeaksToHarmspect(wavegen_peaks_t *peaks, int pitch, int *htab, int control);
+extern double ConvertFromIeeeExtended(unsigned char *bytes);
+extern int PeaksToHarmspect(wavegen_peaks_t *peaks, int pitch, int *htab, int control);
 
 extern unsigned char pk_shape1[];
 extern int pk_select;
 	int  ix;
 	SpectFrame *frame;
 
-	frame = new SpectFrame;
+	frame = malloc(sizeof(SpectFrame));
 	frame->keyframe = 0;
 	frame->spect = NULL;
 	frame->markers = 0;
 static void SpectFrameDestroy(SpectFrame *frame)
 {
 	if(frame->spect != NULL)
-		delete frame->spect;
-	delete frame;
+		free(frame->spect);
+	free(frame);
 }
 
 
 
-int LoadFrame(SpectFrame &frame, FILE *stream, int file_format_type)
+int LoadFrame(SpectFrame *frame, FILE *stream, int file_format_type)
 {//==============================================================
 	short ix;
 	short x;
 	unsigned short *spect_data;
 
-	frame.time = read_double(stream);
-	frame.pitch = read_double(stream);
-	frame.length = read_double(stream);
-	frame.dx = read_double(stream);
-	fread(&frame.nx,sizeof(short),1,stream);
-	fread(&frame.markers,sizeof(short),1,stream);
-	fread(&frame.amp_adjust,sizeof(short),1,stream);
+	frame->time = read_double(stream);
+	frame->pitch = read_double(stream);
+	frame->length = read_double(stream);
+	frame->dx = read_double(stream);
+	fread(&frame->nx,sizeof(short),1,stream);
+	fread(&frame->markers,sizeof(short),1,stream);
+	fread(&frame->amp_adjust,sizeof(short),1,stream);
 
 	if(file_format_type == 2)
 	{
 
 	for(ix=0; ix<N_PEAKS; ix++)
 	{
-		fread(&frame.formants[ix].freq,sizeof(short),1,stream);
-		fread(&frame.formants[ix].bandw,sizeof(short),1,stream);
-		fread(&frame.peaks[ix].pkfreq,sizeof(short),1,stream);
-		fread(&frame.peaks[ix].pkheight,sizeof(short),1,stream);
-		fread(&frame.peaks[ix].pkwidth,sizeof(short),1,stream);
-		fread(&frame.peaks[ix].pkright,sizeof(short),1,stream);
-		if(frame.peaks[ix].pkheight > 0)
-			frame.keyframe = 1;
+		fread(&frame->formants[ix].freq,sizeof(short),1,stream);
+		fread(&frame->formants[ix].bandw,sizeof(short),1,stream);
+		fread(&frame->peaks[ix].pkfreq,sizeof(short),1,stream);
+		fread(&frame->peaks[ix].pkheight,sizeof(short),1,stream);
+		fread(&frame->peaks[ix].pkwidth,sizeof(short),1,stream);
+		fread(&frame->peaks[ix].pkright,sizeof(short),1,stream);
+		if(frame->peaks[ix].pkheight > 0)
+			frame->keyframe = 1;
 
 		if(file_format_type == 2)
 		{
-			fread(&frame.peaks[ix].klt_bw,sizeof(short),1,stream);
-			fread(&frame.peaks[ix].klt_ap,sizeof(short),1,stream);
-			fread(&frame.peaks[ix].klt_bp,sizeof(short),1,stream);
+			fread(&frame->peaks[ix].klt_bw,sizeof(short),1,stream);
+			fread(&frame->peaks[ix].klt_ap,sizeof(short),1,stream);
+			fread(&frame->peaks[ix].klt_bp,sizeof(short),1,stream);
 		}
 	}
 
 	{
 		for(ix=0; ix<N_KLATTP2; ix++)
 		{
-			fread(frame.klatt_param + ix,sizeof(short),1,stream);
+			fread(frame->klatt_param + ix,sizeof(short),1,stream);
 		}
 	}
 
-	spect_data = new USHORT[frame.nx];
+	spect_data = malloc(sizeof(USHORT) * frame->nx);
 
 	if(spect_data == NULL)
 	{
 		return(1);
 	}
 
-	frame.max_y = 0;
-	for(ix=0; ix<frame.nx; ix++)
+	frame->max_y = 0;
+	for(ix=0; ix<frame->nx; ix++)
 	{
 		fread(&x,sizeof(short),1,stream);
 		spect_data[ix] = x;
-		if(x > frame.max_y) frame.max_y = x;
+		if(x > frame->max_y) frame->max_y = x;
 	}
-   frame.spect = spect_data;
+   frame->spect = spect_data;
 
 	return(0);
 }  //  End of SpectFrame::Load
 
 SpectSeq *SpectSeqCreate()
 {
-	SpectSeq *spect = new SpectSeq;
+	SpectSeq *spect = malloc(sizeof(SpectSeq));
 
 	spect->numframes = 0;
 	spect->frames = NULL;
 			if(spect->frames[ix] != NULL)
 				SpectFrameDestroy(spect->frames[ix]);
 		}
-		delete spect->frames;
+		free(spect->frames);
 	}
 	free(spect->name);
-	delete spect;
+	free(spect);
 }
 
 
-static float GetFrameLength(SpectSeq &spect, int frame)
+static float GetFrameLength(SpectSeq *spect, int frame)
 {//===============================================================
 	int  ix;
 	float  adjust=0;
 
-	if(frame >= spect.numframes-1) return(0);
+	if(frame >= spect->numframes-1) return(0);
 	
-	for(ix=frame+1; ix<spect.numframes-1; ix++)
+	for(ix=frame+1; ix<spect->numframes-1; ix++)
 	{
-		if(spect.frames[ix]->keyframe) break;  // reached next keyframe
-		adjust += spect.frames[ix]->length_adjust;
+		if(spect->frames[ix]->keyframe) break;  // reached next keyframe
+		adjust += spect->frames[ix]->length_adjust;
 	}
-	return ((spect.frames[ix]->time - spect.frames[frame]->time) * 1000.0 + adjust);
+	return ((spect->frames[ix]->time - spect->frames[frame]->time) * 1000.0 + adjust);
 }
 
 
 			if(spect->frames[ix] != NULL)
 				SpectFrameDestroy(spect->frames[ix]);
 		}
-		delete spect->frames;
+		free(spect->frames);
 	}
-	spect->frames = new SpectFrame* [n];
+	spect->frames = malloc(sizeof(SpectFrame) * n);
 
 	spect->numframes = 0;
 	spect->max_x = 3000;
 	{
 		SpectFrame *frame = SpectFrameCreate();
 
-		if(LoadFrame(*frame, stream, spect->file_format) != 0)
+		if(LoadFrame(frame, stream, spect->file_format) != 0)
 		{
-			delete frame;
+			free(frame);
 			break;
 		}
 
 
 		if(set_max_y && (frame->max_y > spect->max_y))
 			spect->max_y = frame->max_y;
-		if(frame->nx * frame->dx > spect->max_x) spect->max_x = int(frame->nx * frame->dx);
+		if(frame->nx * frame->dx > spect->max_x) spect->max_x = (int)(frame->nx * frame->dx);
 	}
 spect->max_x = 9000;   // disable auto-xscaling
 
-	frame_width = int((FRAME_WIDTH*spect->max_x)/MAX_DISPLAY_FREQ);
+	frame_width = (int)((FRAME_WIDTH*spect->max_x)/MAX_DISPLAY_FREQ);
 	if(frame_width > FRAME_WIDTH) frame_width = FRAME_WIDTH;
 
 
 
 	spect->pitch1 = spect->pitchenv.pitch1;
 	spect->pitch2 = spect->pitchenv.pitch2;
-	spect->duration = int(spect->frames[spect->numframes-1]->time * 1000);
+	spect->duration = (int)(spect->frames[spect->numframes-1]->time * 1000);
 
 if(spect->max_y < 400)
 	spect->max_y = 200;
 	for(ix=0; ix<spect->numframes; ix++)
 	{
 		if(spect->frames[ix]->keyframe)
-			spect->frames[ix]->length_adjust = spect->frames[ix]->length - GetFrameLength(*spect,ix);
+			spect->frames[ix]->length_adjust = spect->frames[ix]->length - GetFrameLength(spect,ix);
 	}
 	return(0);
 }  // end of SpectSeq::Load

src/spect.h → src/libespeak-ng/spect.h

  *               <http://www.gnu.org/licenses/>.                           *
  ***************************************************************************/
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
 #define FRAME_WIDTH  1000  // max width for 8000kHz frame
 #define MAX_DISPLAY_FREQ 9500
 #define FRAME_HEIGHT 240
 }  peak_t;
 
 
-struct SpectFrame
+typedef struct
 {
 	int keyframe;
 	short amp_adjust;
 
    formant_t formants[N_PEAKS];   // this is just the estimate given by Praat
    peak_t peaks[N_PEAKS];
-};
+} SpectFrame;
 
 double GetFrameRms(SpectFrame *frame, int amp);
 
-struct SpectSeq
+typedef struct
 {
 	int  numframes;
 	short amplitude;
 	int max_x;
 	short max_y;
 	int file_format;
-};
+} SpectSeq;
 
 SpectSeq *SpectSeqCreate();
 void SpectSeqDestroy(SpectSeq *spect);
 int LoadSpectSeq(SpectSeq *spect, const char *filename);
+
+#ifdef __cplusplus
+}
+#endif