revert files
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@14277 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
parent
28d8aeaf5c
commit
e693a98ccc
|
@ -12,8 +12,7 @@ LDFLAGS=-L.
|
|||
OBJS=src/esl.o src/esl_event.o src/esl_threadmutex.o src/esl_config.o
|
||||
SRC=src/esl.c src/esl_event.c src/esl_threadmutex.c src/esl_config.c src/esl_oop.cpp
|
||||
HEADERS=src/include/esl_config.h src/include/esl_event.h src/include/esl.h src/include/esl_threadmutex.h src/include/esl_oop.h
|
||||
//SOLINK=-shared -Xlinker -x
|
||||
SOLINK=-dynamiclib -Xlinker -x
|
||||
SOLINK=-shared -Xlinker -x
|
||||
# comment the next line to disable c++ (no swig mods for you then)
|
||||
OBJS += src/esl_oop.o
|
||||
|
||||
|
|
|
@ -1,6 +1,5 @@
|
|||
LOCAL_CFLAGS=-I/usr/include/python2.4
|
||||
LOCAL_LDFLAGS=-framework python
|
||||
#LOCAL_LDFLAGS=-lpython2.4
|
||||
LOCAL_LDFLAGS=-lpython2.4
|
||||
|
||||
all: _ESL.so
|
||||
|
||||
|
|
|
@ -137,8 +137,7 @@ template <typename T> T SwigValueInit() {
|
|||
|
||||
|
||||
/* Python.h has to appear first */
|
||||
//#include <Python.h>
|
||||
#include <Python/Python.h>
|
||||
#include <Python.h>
|
||||
|
||||
/* -----------------------------------------------------------------------------
|
||||
* swigrun.swg
|
||||
|
|
|
@ -501,7 +501,6 @@ static switch_status_t es_say(switch_core_session_t *session, char *tosay, switc
|
|||
}
|
||||
|
||||
if (say_cb) {
|
||||
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Using es callback [tosay: %s, type: %d, method: %d]\n", tosay, type, method);
|
||||
return say_cb(session, tosay, type, method, args);
|
||||
}
|
||||
|
||||
|
|
|
@ -2039,7 +2039,6 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_say(switch_core_session_t *session, c
|
|||
|
||||
if ((si = switch_loadable_module_get_say_interface(module_name))) {
|
||||
/* should go back and proto all the say mods to const.... */
|
||||
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Using SAY Interface %s\n", module_name);
|
||||
status = si->say_function(session, (char *) tosay, switch_ivr_get_say_type_by_name(say_type), switch_ivr_get_say_method_by_name(say_method), args);
|
||||
} else {
|
||||
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid SAY Interface [%s]!\n", module_name);
|
||||
|
|
Loading…
Reference in New Issue