diff --git a/src/mod/asr_tts/mod_openmrcp/Makefile b/src/mod/asr_tts/mod_openmrcp/Makefile
index 8d41c0bafe..a18ca9ed4e 100644
--- a/src/mod/asr_tts/mod_openmrcp/Makefile
+++ b/src/mod/asr_tts/mod_openmrcp/Makefile
@@ -6,9 +6,9 @@
OPENMRCP_DIR=../../../../libs/openmrcp
-OPENMRCP_INCLUDE=-I$(OPENMRCP_DIR)/mrcpcore/client/include/ -I$(OPENMRCP_DIR)/platform/openmrcpclient/include/ -I$(OPENMRCP_DIR)/mediaframe/include/ -I$(OPENMRCP_DIR)/mrcpcore/engine/include/ -I$(OPENMRCP_DIR)/mrcpcore/include/ -I$(OPENMRCP_DIR)/mrcpcore/parser/include/ -I$(OPENMRCP_DIR)/mrcpcore/server/include/ -I$(OPENMRCP_DIR)/mrcpcore/media/include/ -I$(OPENMRCP_DIR)/mrcpcore/util/include -I$(OPENMRCP_DIR)/mrcpcore/resource/include/
+OPENMRCP_INCLUDE=-I$(OPENMRCP_DIR)/mrcpcore/client/include/ -I$(OPENMRCP_DIR)/platform/openmrcpclient/include/ -I$(OPENMRCP_DIR)/aprtoolkit/include/ -I$(OPENMRCP_DIR)/mediaframe/include/ -I$(OPENMRCP_DIR)/mrcpcore/engine/include/ -I$(OPENMRCP_DIR)/mrcpcore/include/ -I$(OPENMRCP_DIR)/mrcpcore/parser/include/ -I$(OPENMRCP_DIR)/mrcpcore/server/include/ -I$(OPENMRCP_DIR)/mrcpcore/media/include/ -I$(OPENMRCP_DIR)/mrcpcore/util/include -I$(OPENMRCP_DIR)/mrcpcore/resource/include/
-OPENMRCP_LIBS=$(OPENMRCP_DIR)/platform/openmrcpclient/.libs/libopenmrcpclient.a $(OPENMRCP_DIR)/platform/openmrcpserver/.libs/libopenmrcpserver.a $(OPENMRCP_DIR)/mrcpcore/client/.libs/libmrcpclient.a $(OPENMRCP_DIR)/mediaframe/.libs/libmediaframe.a $(OPENMRCP_DIR)/mrcpcore/engine/.libs/libmrcpengine.a $(OPENMRCP_DIR)/mrcpcore/parser/.libs/libmrcpparser.a $(OPENMRCP_DIR)/mrcpcore/server/.libs/libmrcpserver.a $(OPENMRCP_DIR)/mrcpcore/media/.libs/libmrcpmedia.a $(OPENMRCP_DIR)/mrcpcore/util/.libs/libmrcputil.a $(OPENMRCP_DIR)/mrcpcore/resource/.libs/libmrcpresource.a $(OPENMRCP_DIR)/module/plugin/demo/.libs/libdemoplugin.a $(OPENMRCP_DIR)/module/mrcpv2agent/.libs/libmrcpv2agent.a $(OPENMRCP_DIR)/module/mrcpmediaframe/.libs/libmrcpmediaframe.a $(OPENMRCP_DIR)/module/mrcpsofiasip/.libs/libmrcpsofiasip.a $(OPENMRCP_DIR)/mrcpcore/.libs/libmrcpcore.a
+OPENMRCP_LIBS=$(OPENMRCP_DIR)/platform/openmrcpclient/.libs/libopenmrcpclient.a $(OPENMRCP_DIR)/mrcpcore/client/.libs/libmrcpclient.a $(OPENMRCP_DIR)/mediaframe/.libs/libmediaframe.a $(OPENMRCP_DIR)/mrcpcore/engine/.libs/libmrcpengine.a $(OPENMRCP_DIR)/mrcpcore/parser/.libs/libmrcpparser.a $(OPENMRCP_DIR)/mrcpcore/media/.libs/libmrcpmedia.a $(OPENMRCP_DIR)/mrcpcore/resource/.libs/libmrcpresource.a $(OPENMRCP_DIR)/module/mrcpv2agent/.libs/libmrcpv2agent.a $(OPENMRCP_DIR)/module/mrcpmediaframe/.libs/libmrcpmediaframe.a $(OPENMRCP_DIR)/module/mrcpsofiasip/.libs/libmrcpsofiasip.a $(OPENMRCP_DIR)/mrcpcore/.libs/libmrcpcore.a $(OPENMRCP_DIR)/aprtoolkit/.libs/libaprtoolkit.a
MRCP_APR_INCLUDES = -I../../../../libs/apr/include
MRCP_APU_INCLUDES = -I../../../../libs/apr-util/include
diff --git a/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.2008.vcproj b/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.2008.vcproj
index 3628ce9180..123cc79d11 100644
--- a/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.2008.vcproj
+++ b/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.2008.vcproj
@@ -39,7 +39,7 @@
/>
next) {
const char *var = switch_xml_attr_soft(param, "name");
@@ -794,7 +794,7 @@ static switch_status_t do_config()
} else if (!strcasecmp(var, "tts_default_profile")) {
openmrcp_module.tts_profile_name = switch_core_strdup(openmrcp_module.pool, val);
} else if (!strcasecmp(var, "log_level")) {
- mrcp_logger.priority = atoi(val);
+ apt_log_priority_set(atoi(val));
}
}
}
@@ -902,9 +902,10 @@ static switch_status_t openmrcp_profile_run(openmrcp_profile_t *profile)
static switch_status_t openmrcp_init()
{
/* one-time mrcp global initialization */
- mrcp_global_init();
+ if(apr_pool_create(&openmrcp_module.pool,NULL) != APR_SUCCESS) {
+ return SWITCH_STATUS_FALSE;
+ }
- openmrcp_module.pool = mrcp_global_pool_get();
switch_core_hash_init(&openmrcp_module.profile_hash, openmrcp_module.pool);
/* read config */
@@ -917,6 +918,8 @@ static switch_status_t openmrcp_init()
static switch_status_t openmrcp_destroy()
{
+ /* one-time mrcp global destroy */
+
/* destroy asr/tts profiles */
switch_hash_index_t *hi;
void *val;
@@ -933,8 +936,8 @@ static switch_status_t openmrcp_destroy()
switch_core_hash_destroy(&openmrcp_module.profile_hash);
openmrcp_module.profile_hash = NULL;
- /* one-time mrcp global destroy */
- mrcp_global_destroy();
+ apr_pool_destroy(openmrcp_module.pool);
+ openmrcp_module.pool = NULL;
return SWITCH_STATUS_SUCCESS;
}
diff --git a/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.vcproj b/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.vcproj
index d64b9f3d04..b17e76e628 100644
--- a/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.vcproj
+++ b/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.vcproj
@@ -23,7 +23,7 @@
>