make mac like cepstral

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@734 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale 2006-03-02 21:05:07 +00:00
parent 9252f0c15b
commit c2398be31b
6 changed files with 19 additions and 14 deletions

View File

@ -778,7 +778,7 @@ SWITCH_DECLARE(switch_status) switch_core_speech_open(switch_speech_handle *sh,
char *module_name, char *module_name,
char *voice_name, char *voice_name,
unsigned int rate, unsigned int rate,
switch_speech_flag flags, switch_speech_flag *flags,
switch_memory_pool *pool); switch_memory_pool *pool);
/*! /*!

View File

@ -291,8 +291,8 @@ struct switch_speech_interface {
/*! function to open the speech interface */ /*! function to open the speech interface */
switch_status (*speech_open)(switch_speech_handle *sh, switch_status (*speech_open)(switch_speech_handle *sh,
char *voice_name, char *voice_name,
unsigned int rate, int rate,
switch_speech_flag flags); switch_speech_flag *flags);
/*! function to close the speech interface */ /*! function to close the speech interface */
switch_status (*speech_close)(switch_speech_handle *, switch_speech_flag *flags); switch_status (*speech_close)(switch_speech_handle *, switch_speech_flag *flags);
/*! function to feed audio to the ASR*/ /*! function to feed audio to the ASR*/

View File

@ -1,7 +1,12 @@
ifeq ($(OSARCH),Darwin)
CFLAGS += -I/Library/Frameworks/swift.framework/Versions/4/Headers
LDFLAGS += -framework swift -lm
else
LDFLAGS += -L/opt/swift/lib -lswift -lceplex_us -lceplang_en -lceplang_de -lceplang_es -lceplang_fr -lceplang_it -lm LDFLAGS += -L/opt/swift/lib -lswift -lceplex_us -lceplang_en -lceplang_de -lceplang_es -lceplang_fr -lceplang_it -lm
CFLAGS += -I/opt/swift/include CFLAGS += -I/opt/swift/include
LINKER=$(CC) endif
LINKER=$(CC)
all: depends $(MODNAME).so all: depends $(MODNAME).so

View File

@ -75,12 +75,12 @@ static swift_result_t write_audio(swift_event *event, swift_event_t type, void *
return rv; return rv;
} }
static switch_status cepstral_speech_open(switch_speech_handle *sh, char *voice_name, unsigned int rate, switch_speech_flag flags) static switch_status cepstral_speech_open(switch_speech_handle *sh, char *voice_name, int rate, switch_speech_flag *flags)
{ {
if (flags & SWITCH_SPEECH_FLAG_ASR) { if (*flags & SWITCH_SPEECH_FLAG_ASR) {
return SWITCH_STATUS_FALSE; return SWITCH_STATUS_FALSE;
} }
if (flags & SWITCH_SPEECH_FLAG_TTS) { if (*flags & SWITCH_SPEECH_FLAG_TTS) {
cepstral_t *cepstral = switch_core_alloc(sh->memory_pool, sizeof(*cepstral)); cepstral_t *cepstral = switch_core_alloc(sh->memory_pool, sizeof(*cepstral));
char srate[25]; char srate[25];
@ -175,8 +175,8 @@ static switch_status cepstral_speech_feed_tts(switch_speech_handle *sh, char *te
static switch_status cepstral_speech_read_tts(switch_speech_handle *sh, static switch_status cepstral_speech_read_tts(switch_speech_handle *sh,
void *data, void *data,
unsigned int *datalen, size_t *datalen,
unsigned int *rate, size_t *rate,
switch_speech_flag *flags) switch_speech_flag *flags)
{ {
cepstral_t *cepstral; cepstral_t *cepstral;
@ -253,7 +253,7 @@ const switch_speech_interface cepstral_speech_interface = {
}; };
static switch_loadable_module_interface cepstral_module_interface = { const switch_loadable_module_interface cepstral_module_interface = {
/*.module_name */ modname, /*.module_name */ modname,
/*.endpoint_interface */ NULL, /*.endpoint_interface */ NULL,
/*.timer_interface */ NULL, /*.timer_interface */ NULL,

View File

@ -481,7 +481,7 @@ SWITCH_DECLARE(switch_status) switch_core_speech_open(switch_speech_handle *sh,
char *module_name, char *module_name,
char *voice_name, char *voice_name,
unsigned int rate, unsigned int rate,
switch_speech_flag flags, switch_speech_flag *flags,
switch_memory_pool *pool) switch_memory_pool *pool)
{ {
switch_status status; switch_status status;
@ -491,7 +491,7 @@ SWITCH_DECLARE(switch_status) switch_core_speech_open(switch_speech_handle *sh,
return SWITCH_STATUS_GENERR; return SWITCH_STATUS_GENERR;
} }
sh->flags = flags; sh->flags = *flags;
if (pool) { if (pool) {
sh->memory_pool = pool; sh->memory_pool = pool;
} else { } else {

View File

@ -513,7 +513,7 @@ SWITCH_DECLARE(switch_status) switch_ivr_speak_text(switch_core_session *session
tts_name, tts_name,
voice_name, voice_name,
(unsigned int)rate, (unsigned int)rate,
flags, &flags,
switch_core_session_get_pool(session)) != SWITCH_STATUS_SUCCESS) { switch_core_session_get_pool(session)) != SWITCH_STATUS_SUCCESS) {
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Invalid TTS module!\n"); switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Invalid TTS module!\n");
return SWITCH_STATUS_FALSE; return SWITCH_STATUS_FALSE;