mjohnson/espeak-ng
1
0
Fork 0
mirror of https://github.com/rhasspy/espeak-ng.git synced 2026-11-12 00:46:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move the MBROLA API definitions for Windows to mbrowrap.h,

Browse Source
This commit is contained in:
Reece H. Dunn
2016-01-09 17:45:34 +00:00
parent 461f3fcc86
commit 706d546182
4 changed files with 36 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libespeak-ng/mbrowrap.h
+30
View File
@@ -3,6 +3,7 @@
* providing a subset of the API from the Windows mbrola DLL.
*
* Copyright (C) 2010 by Nicolas Pitre <nico@fluxnic.net>
* Copyright (C) 2016 Reece H. Dunn
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -23,6 +24,33 @@ extern "C"
{
#endif
#if defined(_WIN32) || defined(_WIN64)
typedef void (WINAPI *PROCVV)(void);
typedef void (WINAPI *PROCVI)(int);
typedef void (WINAPI *PROCVF)(float);
typedef int (WINAPI *PROCIV)();
typedef int (WINAPI *PROCIC)(char *);
typedef int (WINAPI *PROCISI)(short *, int);
typedef char * (WINAPI *PROCVCI)(char *, int);
PROCIC init_MBR;
PROCIC write_MBR;
PROCIV flush_MBR;
PROCISI read_MBR;
PROCVV close_MBR;
PROCVV reset_MBR;
PROCIV lastError_MBR;
PROCVCI lastErrorStr_MBR;
PROCVI setNoError_MBR;
PROCIV getFreq_MBR;
PROCVF setVolumeRatio_MBR;
BOOL load_MBR();
void unload_MBR();
#else
/*
* Initialize mbrola. The 'voice_path' argument must contain the
* path and file name to the mbrola voice database to be used. Returned
@@ -104,6 +132,8 @@ static inline void setNoError_MBR(int no_error)
(void)no_error; // unused
}
#endif
#ifdef __cplusplus
}
#endif
src/libespeak-ng/synth_mbrola.c
+2 -19
View File
@@ -48,26 +48,9 @@ extern unsigned char *outbuf;
#include "mbrowrap.h"
#else
#include <windows.h>
typedef void (WINAPI *PROCVV)(void);
typedef void (WINAPI *PROCVI)(int);
typedef void (WINAPI *PROCVF)(float);
typedef int (WINAPI *PROCIV)();
typedef int (WINAPI *PROCIC)(char *);
typedef int (WINAPI *PROCISI)(short *, int);
typedef char * (WINAPI *PROCVCI)(char *, int);
PROCIC init_MBR;
PROCIC write_MBR;
PROCIV flush_MBR;
PROCISI read_MBR;
PROCVV close_MBR;
PROCVV reset_MBR;
PROCIV lastError_MBR;
PROCVCI lastErrorStr_MBR;
PROCVI setNoError_MBR;
PROCIV getFreq_MBR;
PROCVF setVolumeRatio_MBR;
#include <windows.h>
#include "mbrowrap.h"
HINSTANCE hinstDllMBR = NULL;
src/windows/libespeak-ng.vcxproj
+1
View File
@@ -178,6 +178,7 @@
<ClInclude Include="..\include\espeak\speak_lib.h" />
<ClInclude Include="..\libespeak-ng\error.h" />
<ClInclude Include="..\libespeak-ng\klatt.h" />
<ClInclude Include="..\libespeak-ng\mbrowrap.h" />
<ClInclude Include="..\libespeak-ng\phoneme.h" />
<ClInclude Include="..\libespeak-ng\sintab.h" />
<ClInclude Include="..\libespeak-ng\spect.h" />
src/windows/libespeak-ng.vcxproj.filters
+3
View File
@@ -122,5 +122,8 @@
<ClInclude Include="..\libespeak-ng\klatt.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\libespeak-ng\mbrowrap.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
</Project>