mjohnson/espeak-ng
1
0
Fork 0
mirror of https://github.com/rhasspy/espeak-ng.git synced 2026-10-31 13:38:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'development'

Browse Source 
Conflicts:
	docs/speak_lib.h
	src/main.h
	src/speak_lib.cpp
	src/spect.h
This commit is contained in:
Reece H. Dunn
2013-11-29 23:43:03 +00:00
parent 72af75701d 6e9bc0e97e
commit 693c9a9966
43 changed files with 8028 additions and 2084 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/spect.cpp
+9 -6
View File
@@ -51,7 +51,7 @@ wxBrush BRUSH_MARKER[N_MARKERS] = {
wxBrush(wxColour(200,0,255),wxSOLID),
wxBrush(wxColour(200,0,255),wxSOLID),
wxBrush(wxColour(255,0,200),wxSOLID) };
#define DRAWPEAKWIDTH 2000
#define PEAKSHAPEW 256
@@ -87,7 +87,7 @@ float SpectTilt(int value, int freq)
}
else
{
return(sqrt(y));
return(sqrt(y));
}
}
@@ -99,6 +99,9 @@ SpectFrame::SpectFrame(SpectFrame *copy)
int ix;
FONT_SMALL = wxFont(8, wxSWISS, wxNORMAL, wxNORMAL); // wxWidgets 3, Font creation needs a GTK+ Window
FONT_MEDIUM = wxFont(9, wxSWISS, wxNORMAL, wxNORMAL);
selected = 0;
keyframe = 0;
spect = NULL;
@@ -213,7 +216,7 @@ int SpectFrame::ImportSPC2(wxInputStream& stream, float &time_acc)
stream.Read(&cy,44);
size = SPC2_size_cycle(&cy);
p = (CYCLE *)malloc(size);
if(p == NULL)
{
@@ -221,14 +224,14 @@ int SpectFrame::ImportSPC2(wxInputStream& stream, float &time_acc)
}
stream.SeekI(-44,wxFromCurrent);
stream.Read(p,size);
time = time_acc;
len = cy.length / 15625.0;
time_acc += len;
pitch = float(cy.pitch) / 16.0;
nx = cy.n_harm;
dx = pitch;
for(ix=0; ix<7; ix++)
{
peaks[ix].pkfreq = cy.peak_data[ix].freq * peak_factor[ix];
@@ -247,7 +250,7 @@ int SpectFrame::ImportSPC2(wxInputStream& stream, float &time_acc)
}
if(((cy.flags & 0x80)==0) && (peaks[1].pkheight > 0))
keyframe = 1;
if(cy.flags & 0x08)
markers |= 4;
if(cy.flags & 0x10)