From c2398be31b373dd2515aeebaa3d4828337f9dd10 Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Thu, 2 Mar 2006 21:05:07 +0000 Subject: [PATCH] make mac like cepstral git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@734 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- src/include/switch_core.h | 2 +- src/include/switch_module_interfaces.h | 4 ++-- src/mod/asr_tts/mod_cepstral/Makefile | 7 ++++++- src/mod/asr_tts/mod_cepstral/mod_cepstral.c | 12 ++++++------ src/switch_core.c | 6 +++--- src/switch_ivr.c | 2 +- 6 files changed, 19 insertions(+), 14 deletions(-) diff --git a/src/include/switch_core.h b/src/include/switch_core.h index b02ef61d0f..35ec99a5e2 100644 --- a/src/include/switch_core.h +++ b/src/include/switch_core.h @@ -778,7 +778,7 @@ SWITCH_DECLARE(switch_status) switch_core_speech_open(switch_speech_handle *sh, char *module_name, char *voice_name, unsigned int rate, - switch_speech_flag flags, + switch_speech_flag *flags, switch_memory_pool *pool); /*! diff --git a/src/include/switch_module_interfaces.h b/src/include/switch_module_interfaces.h index a8ea0d1819..93bfd4a1f7 100644 --- a/src/include/switch_module_interfaces.h +++ b/src/include/switch_module_interfaces.h @@ -291,8 +291,8 @@ struct switch_speech_interface { /*! function to open the speech interface */ switch_status (*speech_open)(switch_speech_handle *sh, char *voice_name, - unsigned int rate, - switch_speech_flag flags); + int rate, + switch_speech_flag *flags); /*! function to close the speech interface */ switch_status (*speech_close)(switch_speech_handle *, switch_speech_flag *flags); /*! function to feed audio to the ASR*/ diff --git a/src/mod/asr_tts/mod_cepstral/Makefile b/src/mod/asr_tts/mod_cepstral/Makefile index 1fe26e8624..11ce6d0b72 100644 --- a/src/mod/asr_tts/mod_cepstral/Makefile +++ b/src/mod/asr_tts/mod_cepstral/Makefile @@ -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 CFLAGS += -I/opt/swift/include -LINKER=$(CC) +endif +LINKER=$(CC) all: depends $(MODNAME).so diff --git a/src/mod/asr_tts/mod_cepstral/mod_cepstral.c b/src/mod/asr_tts/mod_cepstral/mod_cepstral.c index 278194835b..de3b5e6c2b 100644 --- a/src/mod/asr_tts/mod_cepstral/mod_cepstral.c +++ b/src/mod/asr_tts/mod_cepstral/mod_cepstral.c @@ -75,12 +75,12 @@ static swift_result_t write_audio(swift_event *event, swift_event_t type, void * 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; } - if (flags & SWITCH_SPEECH_FLAG_TTS) { + if (*flags & SWITCH_SPEECH_FLAG_TTS) { cepstral_t *cepstral = switch_core_alloc(sh->memory_pool, sizeof(*cepstral)); 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, void *data, - unsigned int *datalen, - unsigned int *rate, + size_t *datalen, + size_t *rate, switch_speech_flag *flags) { 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, /*.endpoint_interface */ NULL, /*.timer_interface */ NULL, diff --git a/src/switch_core.c b/src/switch_core.c index d95e57e61a..4e0931fd7a 100644 --- a/src/switch_core.c +++ b/src/switch_core.c @@ -481,7 +481,7 @@ SWITCH_DECLARE(switch_status) switch_core_speech_open(switch_speech_handle *sh, char *module_name, char *voice_name, unsigned int rate, - switch_speech_flag flags, + switch_speech_flag *flags, switch_memory_pool *pool) { switch_status status; @@ -491,7 +491,7 @@ SWITCH_DECLARE(switch_status) switch_core_speech_open(switch_speech_handle *sh, return SWITCH_STATUS_GENERR; } - sh->flags = flags; + sh->flags = *flags; if (pool) { sh->memory_pool = pool; } else { @@ -514,7 +514,7 @@ SWITCH_DECLARE(switch_status) switch_core_speech_feed_asr(switch_speech_handle * SWITCH_DECLARE(switch_status) switch_core_speech_interpret_asr(switch_speech_handle *sh, char *buf, unsigned int buflen, switch_speech_flag *flags) { assert(sh != NULL); - + return sh->speech_interface->speech_interpret_asr(sh, buf, buflen, flags); } diff --git a/src/switch_ivr.c b/src/switch_ivr.c index bba651022a..763b74bd1c 100644 --- a/src/switch_ivr.c +++ b/src/switch_ivr.c @@ -513,7 +513,7 @@ SWITCH_DECLARE(switch_status) switch_ivr_speak_text(switch_core_session *session tts_name, voice_name, (unsigned int)rate, - flags, + &flags, switch_core_session_get_pool(session)) != SWITCH_STATUS_SUCCESS) { switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Invalid TTS module!\n"); return SWITCH_STATUS_FALSE;