提交 552d2c8f authored 作者: Raul Fragoso's avatar Raul Fragoso

Fixed khomp_pvt to have a *REAL* array of static channels;

Included debug in the makefile;

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk/contrib@14009 d0543943-73ff-0310-b7d9-9358b9ac24b2
上级 d143a502
MODNAME=mod_khomp MODNAME=mod_khomp
VERBOSE=1 VERBOSE=1
LOCAL_CFLAGS=-I./include -I./commons -D_REENTRANT -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -DK3L_HOSTSYSTEM LOCAL_CFLAGS=-I./include -I./commons -D_REENTRANT -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -DK3L_HOSTSYSTEM -g -ggdb
LOCAL_LDFLAGS=-lk3l LOCAL_LDFLAGS=-lk3l
LOCAL_OBJS= ./commons/k3lapi.o ./commons/config_options.o ./commons/format.o ./commons/strings.o LOCAL_OBJS= ./commons/k3lapi.o ./commons/config_options.o ./commons/format.o ./commons/strings.o
LOCAL_OBJS+= ./src/globals.o ./src/opt.o ./src/khomp_pvt.o LOCAL_OBJS+= ./src/globals.o ./src/opt.o ./src/khomp_pvt.o
......
...@@ -43,15 +43,19 @@ struct KhompPvt ...@@ -43,15 +43,19 @@ struct KhompPvt
static void initialize(void) static void initialize(void)
{ {
for (unsigned dev = 0; dev < Globals::_k3lapi.device_count(); dev++)
//// tech_pvt = (private_t *) switch_core_session_alloc(*new_session, sizeof(private_t)) {
//for (unsigned dev = 0; dev < Globals::_k3lapi.device_count(); dev++) // KhompPvt * tech_pvt;
//{ //tech= (KhompPvt *) switch_core_session_alloc(*new_session, sizeof(KhompPvt));
// _pvts.push_back(std::vector<KhompPvt>()); _pvts.push_back(std::vector<KhompPvt*>());
//for (unsigned obj = 0; obj < Globals::_k3lapi.channel_count(obj); obj++) for (unsigned obj = 0; obj < Globals::_k3lapi.channel_count(dev); obj++)
//_pvts.back().push_back(KhompPvt(K3LAPI::target(Globals::_k3lapi, K3LAPI::target::CHANNEL, dev, obj))); {
// } K3LAPI::target tgt(Globals::_k3lapi, K3LAPI::target::CHANNEL, dev, obj);
KhompPvt * pvt = new KhompPvt(tgt);
_pvts.back().push_back(pvt);
}
}
} }
K3LAPI::target _target; K3LAPI::target _target;
......
...@@ -579,6 +579,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_khomp_load) ...@@ -579,6 +579,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_khomp_load)
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Starting K3L...\n"); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Starting K3L...\n");
try { try {
Globals::_k3lapi.start(); Globals::_k3lapi.start();
KhompPvt::initialize();
} catch (K3LAPI::start_failed & e) { } catch (K3LAPI::start_failed & e) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "K3L not started. Reason:%s.\n", e.msg.c_str()); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "K3L not started. Reason:%s.\n", e.msg.c_str());
return SWITCH_STATUS_TERM; return SWITCH_STATUS_TERM;
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论