Diff
Modified: freeswitch/trunk/libs/esl/ESL.i (14158 => 14159)
--- freeswitch/trunk/libs/esl/ESL.i 2009-07-08 15:20:55 UTC (rev 14158)
+++ freeswitch/trunk/libs/esl/ESL.i 2009-07-08 16:35:22 UTC (rev 14159)
@@ -3,5 +3,12 @@
#include "esl_oop.h"
%}
+%newobject ESLconnection::sendRecv;
+%newobject ESLconnection::api;
+%newobject ESLconnection::bgapi;
+%newobject ESLconnection::getInfo;
+%newobject ESLconnection::filter;
+%newobject ESLconnection::recvEvent;
+%newobject ESLconnection::recvEventTimed;
%include "esl_oop.h"
Modified: freeswitch/trunk/libs/esl/java/org/freeswitch/esl/ESLconnection.java (14158 => 14159)
--- freeswitch/trunk/libs/esl/java/org/freeswitch/esl/ESLconnection.java 2009-07-08 15:20:55 UTC (rev 14158)
+++ freeswitch/trunk/libs/esl/java/org/freeswitch/esl/ESLconnection.java 2009-07-08 16:35:22 UTC (rev 14159)
@@ -51,7 +51,7 @@
public ESLevent getInfo() {
long cPtr = eslJNI.ESLconnection_getInfo(swigCPtr, this);
- return (cPtr == 0) ? null : new ESLevent(cPtr, false);
+ return (cPtr == 0) ? null : new ESLevent(cPtr, true);
}
public int send(String cmd) {
@@ -60,17 +60,17 @@
public ESLevent sendRecv(String cmd) {
long cPtr = eslJNI.ESLconnection_sendRecv(swigCPtr, this, cmd);
- return (cPtr == 0) ? null : new ESLevent(cPtr, false);
+ return (cPtr == 0) ? null : new ESLevent(cPtr, true);
}
public ESLevent api(String cmd, String arg) {
long cPtr = eslJNI.ESLconnection_api(swigCPtr, this, cmd, arg);
- return (cPtr == 0) ? null : new ESLevent(cPtr, false);
+ return (cPtr == 0) ? null : new ESLevent(cPtr, true);
}
public ESLevent bgapi(String cmd, String arg) {
long cPtr = eslJNI.ESLconnection_bgapi(swigCPtr, this, cmd, arg);
- return (cPtr == 0) ? null : new ESLevent(cPtr, false);
+ return (cPtr == 0) ? null : new ESLevent(cPtr, true);
}
public int sendEvent(ESLevent send_me) {
@@ -79,17 +79,17 @@
public ESLevent recvEvent() {
long cPtr = eslJNI.ESLconnection_recvEvent(swigCPtr, this);
- return (cPtr == 0) ? null : new ESLevent(cPtr, false);
+ return (cPtr == 0) ? null : new ESLevent(cPtr, true);
}
public ESLevent recvEventTimed(int ms) {
long cPtr = eslJNI.ESLconnection_recvEventTimed(swigCPtr, this, ms);
- return (cPtr == 0) ? null : new ESLevent(cPtr, false);
+ return (cPtr == 0) ? null : new ESLevent(cPtr, true);
}
public ESLevent filter(String header, String value) {
long cPtr = eslJNI.ESLconnection_filter(swigCPtr, this, header, value);
- return (cPtr == 0) ? null : new ESLevent(cPtr, false);
+ return (cPtr == 0) ? null : new ESLevent(cPtr, true);
}
public int events(String etype, String value) {
Modified: freeswitch/trunk/libs/esl/lua/esl_wrap.cpp (14158 => 14159)
--- freeswitch/trunk/libs/esl/lua/esl_wrap.cpp 2009-07-08 15:20:55 UTC (rev 14158)
+++ freeswitch/trunk/libs/esl/lua/esl_wrap.cpp 2009-07-08 16:35:22 UTC (rev 14159)
@@ -2339,7 +2339,7 @@
result = (ESLevent *)(arg1)->getInfo();
SWIG_arg=0;
- SWIG_NewPointerObj(L,result,SWIGTYPE_p_ESLevent,0); SWIG_arg++;
+ SWIG_NewPointerObj(L,result,SWIGTYPE_p_ESLevent,1); SWIG_arg++;
return SWIG_arg;
if(0) SWIG_fail;
@@ -2395,7 +2395,7 @@
arg2 = (char *)lua_tostring(L, 2);
result = (ESLevent *)(arg1)->sendRecv((char const *)arg2);
SWIG_arg=0;
- SWIG_NewPointerObj(L,result,SWIGTYPE_p_ESLevent,0); SWIG_arg++;
+ SWIG_NewPointerObj(L,result,SWIGTYPE_p_ESLevent,1); SWIG_arg++;
return SWIG_arg;
if(0) SWIG_fail;
@@ -2428,7 +2428,7 @@
}
result = (ESLevent *)(arg1)->api((char const *)arg2,(char const *)arg3);
SWIG_arg=0;
- SWIG_NewPointerObj(L,result,SWIGTYPE_p_ESLevent,0); SWIG_arg++;
+ SWIG_NewPointerObj(L,result,SWIGTYPE_p_ESLevent,1); SWIG_arg++;
return SWIG_arg;
if(0) SWIG_fail;
@@ -2461,7 +2461,7 @@
}
result = (ESLevent *)(arg1)->bgapi((char const *)arg2,(char const *)arg3);
SWIG_arg=0;
- SWIG_NewPointerObj(L,result,SWIGTYPE_p_ESLevent,0); SWIG_arg++;
+ SWIG_NewPointerObj(L,result,SWIGTYPE_p_ESLevent,1); SWIG_arg++;
return SWIG_arg;
if(0) SWIG_fail;
@@ -2518,7 +2518,7 @@
result = (ESLevent *)(arg1)->recvEvent();
SWIG_arg=0;
- SWIG_NewPointerObj(L,result,SWIGTYPE_p_ESLevent,0); SWIG_arg++;
+ SWIG_NewPointerObj(L,result,SWIGTYPE_p_ESLevent,1); SWIG_arg++;
return SWIG_arg;
if(0) SWIG_fail;
@@ -2546,7 +2546,7 @@
arg2 = (int)lua_tonumber(L, 2);
result = (ESLevent *)(arg1)->recvEventTimed(arg2);
SWIG_arg=0;
- SWIG_NewPointerObj(L,result,SWIGTYPE_p_ESLevent,0); SWIG_arg++;
+ SWIG_NewPointerObj(L,result,SWIGTYPE_p_ESLevent,1); SWIG_arg++;
return SWIG_arg;
if(0) SWIG_fail;
@@ -2577,7 +2577,7 @@
arg3 = (char *)lua_tostring(L, 3);
result = (ESLevent *)(arg1)->filter((char const *)arg2,(char const *)arg3);
SWIG_arg=0;
- SWIG_NewPointerObj(L,result,SWIGTYPE_p_ESLevent,0); SWIG_arg++;
+ SWIG_NewPointerObj(L,result,SWIGTYPE_p_ESLevent,1); SWIG_arg++;
return SWIG_arg;
if(0) SWIG_fail;
Modified: freeswitch/trunk/libs/esl/perl/esl_wrap.cpp (14158 => 14159)
--- freeswitch/trunk/libs/esl/perl/esl_wrap.cpp 2009-07-08 15:20:55 UTC (rev 14158)
+++ freeswitch/trunk/libs/esl/perl/esl_wrap.cpp 2009-07-08 16:35:22 UTC (rev 14159)
@@ -2819,7 +2819,7 @@
}
arg1 = reinterpret_cast< ESLconnection * >(argp1);
result = (ESLevent *)(arg1)->getInfo();
- ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ESLevent, 0 | SWIG_SHADOW); argvi++ ;
+ ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ESLevent, SWIG_OWNER | SWIG_SHADOW); argvi++ ;
XSRETURN(argvi);
fail:
@@ -2895,7 +2895,7 @@
}
arg2 = reinterpret_cast< char * >(buf2);
result = (ESLevent *)(arg1)->sendRecv((char const *)arg2);
- ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ESLevent, 0 | SWIG_SHADOW); argvi++ ;
+ ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ESLevent, SWIG_OWNER | SWIG_SHADOW); argvi++ ;
if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
XSRETURN(argvi);
@@ -2945,7 +2945,7 @@
arg3 = reinterpret_cast< char * >(buf3);
}
result = (ESLevent *)(arg1)->api((char const *)arg2,(char const *)arg3);
- ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ESLevent, 0 | SWIG_SHADOW); argvi++ ;
+ ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ESLevent, SWIG_OWNER | SWIG_SHADOW); argvi++ ;
if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
if (alloc3 == SWIG_NEWOBJ) delete[] buf3;
@@ -2997,7 +2997,7 @@
arg3 = reinterpret_cast< char * >(buf3);
}
result = (ESLevent *)(arg1)->bgapi((char const *)arg2,(char const *)arg3);
- ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ESLevent, 0 | SWIG_SHADOW); argvi++ ;
+ ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ESLevent, SWIG_OWNER | SWIG_SHADOW); argvi++ ;
if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
if (alloc3 == SWIG_NEWOBJ) delete[] buf3;
@@ -3067,7 +3067,7 @@
}
arg1 = reinterpret_cast< ESLconnection * >(argp1);
result = (ESLevent *)(arg1)->recvEvent();
- ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ESLevent, 0 | SWIG_SHADOW); argvi++ ;
+ ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ESLevent, SWIG_OWNER | SWIG_SHADOW); argvi++ ;
XSRETURN(argvi);
fail:
@@ -3103,7 +3103,7 @@
}
arg2 = static_cast< int >(val2);
result = (ESLevent *)(arg1)->recvEventTimed(arg2);
- ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ESLevent, 0 | SWIG_SHADOW); argvi++ ;
+ ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ESLevent, SWIG_OWNER | SWIG_SHADOW); argvi++ ;
XSRETURN(argvi);
@@ -3151,7 +3151,7 @@
}
arg3 = reinterpret_cast< char * >(buf3);
result = (ESLevent *)(arg1)->filter((char const *)arg2,(char const *)arg3);
- ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ESLevent, 0 | SWIG_SHADOW); argvi++ ;
+ ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ESLevent, SWIG_OWNER | SWIG_SHADOW); argvi++ ;
if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
if (alloc3 == SWIG_NEWOBJ) delete[] buf3;
Modified: freeswitch/trunk/libs/esl/php/ESL.php (14158 => 14159)
--- freeswitch/trunk/libs/esl/php/ESL.php 2009-07-08 15:20:55 UTC (rev 14158)
+++ freeswitch/trunk/libs/esl/php/ESL.php 2009-07-08 16:35:22 UTC (rev 14159)
@@ -129,53 +129,48 @@
return ESLconnection_connected($this->_cPtr);
}
- function getInfo() {
- $r=ESLconnection_getInfo($this->_cPtr);
- return is_resource($r) ? new ESLevent($r) : $r;
+ function __construct() {
+ $this->_cPtr=ESLconnection_getInfo($this->_cPtr);
}
function send($cmd) {
return ESLconnection_send($this->_cPtr,$cmd);
}
- function sendRecv($cmd) {
- $r=ESLconnection_sendRecv($this->_cPtr,$cmd);
- return is_resource($r) ? new ESLevent($r) : $r;
+ function __construct($cmd) {
+ $this->_cPtr=ESLconnection_sendRecv($this->_cPtr,$cmd);
}
- function api($cmd,$arg=null) {
+ function __construct($cmd,$arg=null) {
switch (func_num_args()) {
case 1: $r=ESLconnection_api($this->_cPtr,$cmd); break;
default: $r=ESLconnection_api($this->_cPtr,$cmd,$arg);
}
- return is_resource($r) ? new ESLevent($r) : $r;
+ $this->_cPtr=$r;
}
- function bgapi($cmd,$arg=null) {
+ function __construct($cmd,$arg=null) {
switch (func_num_args()) {
case 1: $r=ESLconnection_bgapi($this->_cPtr,$cmd); break;
default: $r=ESLconnection_bgapi($this->_cPtr,$cmd,$arg);
}
- return is_resource($r) ? new ESLevent($r) : $r;
+ $this->_cPtr=$r;
}
function sendEvent($send_me) {
return ESLconnection_sendEvent($this->_cPtr,$send_me);
}
- function recvEvent() {
- $r=ESLconnection_recvEvent($this->_cPtr);
- return is_resource($r) ? new ESLevent($r) : $r;
+ function __construct() {
+ $this->_cPtr=ESLconnection_recvEvent($this->_cPtr);
}
- function recvEventTimed($ms) {
- $r=ESLconnection_recvEventTimed($this->_cPtr,$ms);
- return is_resource($r) ? new ESLevent($r) : $r;
+ function __construct($ms) {
+ $this->_cPtr=ESLconnection_recvEventTimed($this->_cPtr,$ms);
}
- function filter($header,$value) {
- $r=ESLconnection_filter($this->_cPtr,$header,$value);
- return is_resource($r) ? new ESLevent($r) : $r;
+ function __construct($header,$value) {
+ $this->_cPtr=ESLconnection_filter($this->_cPtr,$header,$value);
}
function events($etype,$value) {
Modified: freeswitch/trunk/libs/esl/php/esl_wrap.cpp (14158 => 14159)
--- freeswitch/trunk/libs/esl/php/esl_wrap.cpp 2009-07-08 15:20:55 UTC (rev 14158)
+++ freeswitch/trunk/libs/esl/php/esl_wrap.cpp 2009-07-08 16:35:22 UTC (rev 14159)
@@ -1091,7 +1091,7 @@
}
if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- /*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
+ /*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
convert_to_string_ex(args[1]);
arg2 = (char *) Z_STRVAL_PP(args[1]);
/*@SWIG@*/;
@@ -1159,7 +1159,7 @@
}
if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- /*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,7,CONVERT_INT_IN@*/
+ /*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,7,CONVERT_INT_IN@*/
convert_to_long_ex(args[1]);
arg2 = (int) Z_LVAL_PP(args[1]);
/*@SWIG@*/;
@@ -1213,13 +1213,13 @@
WRONG_PARAM_COUNT;
- /*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
+ /*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
convert_to_string_ex(args[0]);
arg1 = (char *) Z_STRVAL_PP(args[0]);
/*@SWIG@*/;
if(arg_count > 1) {
- /*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
+ /*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
convert_to_string_ex(args[1]);
arg2 = (char *) Z_STRVAL_PP(args[1]);
/*@SWIG@*/;
@@ -1254,7 +1254,7 @@
}
}
if(arg_count > 1) {
- /*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,7,CONVERT_INT_IN@*/
+ /*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,7,CONVERT_INT_IN@*/
convert_to_long_ex(args[1]);
arg2 = (int) Z_LVAL_PP(args[1]);
/*@SWIG@*/;
@@ -1384,7 +1384,7 @@
}
if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
if(arg_count > 1) {
- /*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
+ /*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
convert_to_string_ex(args[1]);
arg2 = (char *) Z_STRVAL_PP(args[1]);
/*@SWIG@*/;
@@ -1460,7 +1460,7 @@
}
if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- /*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
+ /*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
convert_to_string_ex(args[1]);
arg2 = (char *) Z_STRVAL_PP(args[1]);
/*@SWIG@*/;
@@ -1557,7 +1557,7 @@
}
if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- /*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
+ /*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
convert_to_string_ex(args[1]);
arg2 = (char *) Z_STRVAL_PP(args[1]);
/*@SWIG@*/;
@@ -1591,13 +1591,13 @@
}
if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- /*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
+ /*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
convert_to_string_ex(args[1]);
arg2 = (char *) Z_STRVAL_PP(args[1]);
/*@SWIG@*/;
- /*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
+ /*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
convert_to_string_ex(args[2]);
arg3 = (char *) Z_STRVAL_PP(args[2]);
/*@SWIG@*/;
@@ -1630,7 +1630,7 @@
}
if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- /*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
+ /*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
convert_to_string_ex(args[1]);
arg2 = (char *) Z_STRVAL_PP(args[1]);
/*@SWIG@*/;
@@ -1718,19 +1718,19 @@
}
- /*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
+ /*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
convert_to_string_ex(args[0]);
arg1 = (char *) Z_STRVAL_PP(args[0]);
/*@SWIG@*/;
- /*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
+ /*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
convert_to_string_ex(args[1]);
arg2 = (char *) Z_STRVAL_PP(args[1]);
/*@SWIG@*/;
- /*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
+ /*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
convert_to_string_ex(args[2]);
arg3 = (char *) Z_STRVAL_PP(args[2]);
/*@SWIG@*/;
@@ -1756,7 +1756,7 @@
}
- /*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,7,CONVERT_INT_IN@*/
+ /*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,7,CONVERT_INT_IN@*/
convert_to_long_ex(args[0]);
arg1 = (int) Z_LVAL_PP(args[0]);
/*@SWIG@*/;
@@ -1891,7 +1891,7 @@
if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
result = (ESLevent *)(arg1)->getInfo();
{
- SWIG_SetPointerZval(return_value, (void *)result, SWIGTYPE_p_ESLevent, 0);
+ SWIG_SetPointerZval(return_value, (void *)result, SWIGTYPE_p_ESLevent, 1);
}
return;
fail:
@@ -1917,7 +1917,7 @@
}
if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- /*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
+ /*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
convert_to_string_ex(args[1]);
arg2 = (char *) Z_STRVAL_PP(args[1]);
/*@SWIG@*/;
@@ -1950,14 +1950,14 @@
}
if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- /*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
+ /*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
convert_to_string_ex(args[1]);
arg2 = (char *) Z_STRVAL_PP(args[1]);
/*@SWIG@*/;
result = (ESLevent *)(arg1)->sendRecv((char const *)arg2);
{
- SWIG_SetPointerZval(return_value, (void *)result, SWIGTYPE_p_ESLevent, 0);
+ SWIG_SetPointerZval(return_value, (void *)result, SWIGTYPE_p_ESLevent, 1);
}
return;
fail:
@@ -1986,13 +1986,13 @@
}
if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- /*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
+ /*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
convert_to_string_ex(args[1]);
arg2 = (char *) Z_STRVAL_PP(args[1]);
/*@SWIG@*/;
if(arg_count > 2) {
- /*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
+ /*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
convert_to_string_ex(args[2]);
arg3 = (char *) Z_STRVAL_PP(args[2]);
/*@SWIG@*/;
@@ -2000,7 +2000,7 @@
}
result = (ESLevent *)(arg1)->api((char const *)arg2,(char const *)arg3);
{
- SWIG_SetPointerZval(return_value, (void *)result, SWIGTYPE_p_ESLevent, 0);
+ SWIG_SetPointerZval(return_value, (void *)result, SWIGTYPE_p_ESLevent, 1);
}
return;
fail:
@@ -2029,13 +2029,13 @@
}
if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- /*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
+ /*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
convert_to_string_ex(args[1]);
arg2 = (char *) Z_STRVAL_PP(args[1]);
/*@SWIG@*/;
if(arg_count > 2) {
- /*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
+ /*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
convert_to_string_ex(args[2]);
arg3 = (char *) Z_STRVAL_PP(args[2]);
/*@SWIG@*/;
@@ -2043,7 +2043,7 @@
}
result = (ESLevent *)(arg1)->bgapi((char const *)arg2,(char const *)arg3);
{
- SWIG_SetPointerZval(return_value, (void *)result, SWIGTYPE_p_ESLevent, 0);
+ SWIG_SetPointerZval(return_value, (void *)result, SWIGTYPE_p_ESLevent, 1);
}
return;
fail:
@@ -2101,7 +2101,7 @@
if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
result = (ESLevent *)(arg1)->recvEvent();
{
- SWIG_SetPointerZval(return_value, (void *)result, SWIGTYPE_p_ESLevent, 0);
+ SWIG_SetPointerZval(return_value, (void *)result, SWIGTYPE_p_ESLevent, 1);
}
return;
fail:
@@ -2127,14 +2127,14 @@
}
if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- /*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,7,CONVERT_INT_IN@*/
+ /*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,7,CONVERT_INT_IN@*/
convert_to_long_ex(args[1]);
arg2 = (int) Z_LVAL_PP(args[1]);
/*@SWIG@*/;
result = (ESLevent *)(arg1)->recvEventTimed(arg2);
{
- SWIG_SetPointerZval(return_value, (void *)result, SWIGTYPE_p_ESLevent, 0);
+ SWIG_SetPointerZval(return_value, (void *)result, SWIGTYPE_p_ESLevent, 1);
}
return;
fail:
@@ -2161,20 +2161,20 @@
}
if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- /*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
+ /*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
convert_to_string_ex(args[1]);
arg2 = (char *) Z_STRVAL_PP(args[1]);
/*@SWIG@*/;
- /*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
+ /*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
convert_to_string_ex(args[2]);
arg3 = (char *) Z_STRVAL_PP(args[2]);
/*@SWIG@*/;
result = (ESLevent *)(arg1)->filter((char const *)arg2,(char const *)arg3);
{
- SWIG_SetPointerZval(return_value, (void *)result, SWIGTYPE_p_ESLevent, 0);
+ SWIG_SetPointerZval(return_value, (void *)result, SWIGTYPE_p_ESLevent, 1);
}
return;
fail:
@@ -2201,13 +2201,13 @@
}
if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- /*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
+ /*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
convert_to_string_ex(args[1]);
arg2 = (char *) Z_STRVAL_PP(args[1]);
/*@SWIG@*/;
- /*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
+ /*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
convert_to_string_ex(args[2]);
arg3 = (char *) Z_STRVAL_PP(args[2]);
/*@SWIG@*/;
@@ -2244,20 +2244,20 @@
}
if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- /*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
+ /*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
convert_to_string_ex(args[1]);
arg2 = (char *) Z_STRVAL_PP(args[1]);
/*@SWIG@*/;
if(arg_count > 2) {
- /*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
+ /*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
convert_to_string_ex(args[2]);
arg3 = (char *) Z_STRVAL_PP(args[2]);
/*@SWIG@*/;
}
if(arg_count > 3) {
- /*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
+ /*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
convert_to_string_ex(args[3]);
arg4 = (char *) Z_STRVAL_PP(args[3]);
/*@SWIG@*/;
@@ -2295,20 +2295,20 @@
}
if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- /*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
+ /*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
convert_to_string_ex(args[1]);
arg2 = (char *) Z_STRVAL_PP(args[1]);
/*@SWIG@*/;
if(arg_count > 2) {
- /*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
+ /*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
convert_to_string_ex(args[2]);
arg3 = (char *) Z_STRVAL_PP(args[2]);
/*@SWIG@*/;
}
if(arg_count > 3) {
- /*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
+ /*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
convert_to_string_ex(args[3]);
arg4 = (char *) Z_STRVAL_PP(args[3]);
/*@SWIG@*/;
@@ -2342,7 +2342,7 @@
}
if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- /*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
+ /*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
convert_to_string_ex(args[1]);
arg2 = (char *) Z_STRVAL_PP(args[1]);
/*@SWIG@*/;
@@ -2375,7 +2375,7 @@
}
if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- /*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
+ /*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
convert_to_string_ex(args[1]);
arg2 = (char *) Z_STRVAL_PP(args[1]);
/*@SWIG@*/;
@@ -2426,7 +2426,7 @@
}
- /*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,7,CONVERT_INT_IN@*/
+ /*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,7,CONVERT_INT_IN@*/
convert_to_long_ex(args[0]);
arg1 = (int) Z_LVAL_PP(args[0]);
/*@SWIG@*/;
Modified: freeswitch/trunk/libs/esl/python/esl_wrap.cpp (14158 => 14159)
--- freeswitch/trunk/libs/esl/python/esl_wrap.cpp 2009-07-08 15:20:55 UTC (rev 14158)
+++ freeswitch/trunk/libs/esl/python/esl_wrap.cpp 2009-07-08 16:35:22 UTC (rev 14159)
@@ -3718,7 +3718,7 @@
}
arg1 = reinterpret_cast< ESLconnection * >(argp1);
result = (ESLevent *)(arg1)->getInfo();
- resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ESLevent, 0 | 0 );
+ resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ESLevent, SWIG_POINTER_OWN | 0 );
return resultobj;
fail:
return NULL;
@@ -3784,7 +3784,7 @@
}
arg2 = reinterpret_cast< char * >(buf2);
result = (ESLevent *)(arg1)->sendRecv((char const *)arg2);
- resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ESLevent, 0 | 0 );
+ resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ESLevent, SWIG_POINTER_OWN | 0 );
if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
return resultobj;
fail:
@@ -3830,7 +3830,7 @@
arg3 = reinterpret_cast< char * >(buf3);
}
result = (ESLevent *)(arg1)->api((char const *)arg2,(char const *)arg3);
- resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ESLevent, 0 | 0 );
+ resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ESLevent, SWIG_POINTER_OWN | 0 );
if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
if (alloc3 == SWIG_NEWOBJ) delete[] buf3;
return resultobj;
@@ -3878,7 +3878,7 @@
arg3 = reinterpret_cast< char * >(buf3);
}
result = (ESLevent *)(arg1)->bgapi((char const *)arg2,(char const *)arg3);
- resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ESLevent, 0 | 0 );
+ resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ESLevent, SWIG_POINTER_OWN | 0 );
if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
if (alloc3 == SWIG_NEWOBJ) delete[] buf3;
return resultobj;
@@ -3935,7 +3935,7 @@
}
arg1 = reinterpret_cast< ESLconnection * >(argp1);
result = (ESLevent *)(arg1)->recvEvent();
- resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ESLevent, 0 | 0 );
+ resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ESLevent, SWIG_POINTER_OWN | 0 );
return resultobj;
fail:
return NULL;
@@ -3966,7 +3966,7 @@
}
arg2 = static_cast< int >(val2);
result = (ESLevent *)(arg1)->recvEventTimed(arg2);
- resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ESLevent, 0 | 0 );
+ resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ESLevent, SWIG_POINTER_OWN | 0 );
return resultobj;
fail:
return NULL;
@@ -4008,7 +4008,7 @@
}
arg3 = reinterpret_cast< char * >(buf3);
result = (ESLevent *)(arg1)->filter((char const *)arg2,(char const *)arg3);
- resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ESLevent, 0 | 0 );
+ resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ESLevent, SWIG_POINTER_OWN | 0 );
if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
if (alloc3 == SWIG_NEWOBJ) delete[] buf3;
return resultobj;
Modified: freeswitch/trunk/libs/esl/ruby/esl_wrap.cpp (14158 => 14159)
--- freeswitch/trunk/libs/esl/ruby/esl_wrap.cpp 2009-07-08 15:20:55 UTC (rev 14158)
+++ freeswitch/trunk/libs/esl/ruby/esl_wrap.cpp 2009-07-08 16:35:22 UTC (rev 14159)
@@ -1902,7 +1902,7 @@
}
-/*@SWIG:/usr/local/share/swig/1.3.35/ruby/rubyprimtypes.swg,23,%ruby_aux_method@*/
+/*@SWIG:/usr/share/swig/1.3.35/ruby/rubyprimtypes.swg,23,%ruby_aux_method@*/
SWIGINTERN VALUE SWIG_AUX_NUM2LONG(VALUE *args)
{
VALUE obj = args[0];
@@ -2845,7 +2845,7 @@
}
arg1 = reinterpret_cast< ESLconnection * >(argp1);
result = (ESLevent *)(arg1)->getInfo();
- vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ESLevent, 0 | 0 );
+ vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ESLevent, SWIG_POINTER_OWN | 0 );
return vresult;
fail:
return Qnil;
@@ -2913,7 +2913,7 @@
}
arg2 = reinterpret_cast< char * >(buf2);
result = (ESLevent *)(arg1)->sendRecv((char const *)arg2);
- vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ESLevent, 0 | 0 );
+ vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ESLevent, SWIG_POINTER_OWN | 0 );
if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
return vresult;
fail:
@@ -2959,7 +2959,7 @@
arg3 = reinterpret_cast< char * >(buf3);
}
result = (ESLevent *)(arg1)->api((char const *)arg2,(char const *)arg3);
- vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ESLevent, 0 | 0 );
+ vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ESLevent, SWIG_POINTER_OWN | 0 );
if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
if (alloc3 == SWIG_NEWOBJ) delete[] buf3;
return vresult;
@@ -3007,7 +3007,7 @@
arg3 = reinterpret_cast< char * >(buf3);
}
result = (ESLevent *)(arg1)->bgapi((char const *)arg2,(char const *)arg3);
- vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ESLevent, 0 | 0 );
+ vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ESLevent, SWIG_POINTER_OWN | 0 );
if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
if (alloc3 == SWIG_NEWOBJ) delete[] buf3;
return vresult;
@@ -3067,7 +3067,7 @@
}
arg1 = reinterpret_cast< ESLconnection * >(argp1);
result = (ESLevent *)(arg1)->recvEvent();
- vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ESLevent, 0 | 0 );
+ vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ESLevent, SWIG_POINTER_OWN | 0 );
return vresult;
fail:
return Qnil;
@@ -3099,7 +3099,7 @@
}
arg2 = static_cast< int >(val2);
result = (ESLevent *)(arg1)->recvEventTimed(arg2);
- vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ESLevent, 0 | 0 );
+ vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ESLevent, SWIG_POINTER_OWN | 0 );
return vresult;
fail:
return Qnil;
@@ -3141,7 +3141,7 @@
}
arg3 = reinterpret_cast< char * >(buf3);
result = (ESLevent *)(arg1)->filter((char const *)arg2,(char const *)arg3);
- vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ESLevent, 0 | 0 );
+ vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ESLevent, SWIG_POINTER_OWN | 0 );
if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
if (alloc3 == SWIG_NEWOBJ) delete[] buf3;
return vresult;
Modified: freeswitch/trunk/libs/esl/src/esl_oop.cpp (14158 => 14159)
--- freeswitch/trunk/libs/esl/src/esl_oop.cpp 2009-07-08 15:20:55 UTC (rev 14158)
+++ freeswitch/trunk/libs/esl/src/esl_oop.cpp 2009-07-08 16:35:22 UTC (rev 14159)
@@ -1,7 +1,7 @@
#include <esl.h>
#include <esl_oop.h>
-#define connection_construct_common() memset(&handle, 0, sizeof(handle)); last_event_obj = NULL
+#define connection_construct_common() memset(&handle, 0, sizeof(handle))
#define event_construct_common() event = NULL; serialized_string = NULL; mine = 0; hp = NULL
void eslSetLogLevel(int level)
@@ -182,39 +182,27 @@
ESLevent *ESLconnection::recvEvent()
{
- if (last_event_obj) {
- delete last_event_obj;
- }
-
if (esl_recv_event(&handle, 1, NULL) == ESL_SUCCESS) {
esl_event_t *e = handle.last_ievent ? handle.last_ievent : handle.last_event;
if (e) {
esl_event_t *event;
esl_event_dup(&event, e);
- last_event_obj = new ESLevent(event, 1);
- return last_event_obj;
+ return new ESLevent(event, 1);
}
}
- last_event_obj = new ESLevent("server_disconnected");
-
- return last_event_obj;
+ return new ESLevent("server_disconnected");
}
ESLevent *ESLconnection::recvEventTimed(int ms)
{
- if (last_event_obj) {
- delete last_event_obj;
- last_event_obj = NULL;
- }
if (esl_recv_event_timed(&handle, ms, 1, NULL) == ESL_SUCCESS) {
esl_event_t *e = handle.last_ievent ? handle.last_ievent : handle.last_event;
if (e) {
esl_event_t *event;
esl_event_dup(&event, e);
- last_event_obj = new ESLevent(event, 1);
- return last_event_obj;
+ return new ESLevent(event, 1);
}
}
Modified: freeswitch/trunk/libs/esl/src/include/esl_oop.h (14158 => 14159)
--- freeswitch/trunk/libs/esl/src/include/esl_oop.h 2009-07-08 15:20:55 UTC (rev 14158)
+++ freeswitch/trunk/libs/esl/src/include/esl_oop.h 2009-07-08 16:35:22 UTC (rev 14159)
@@ -71,7 +71,6 @@
class ESLconnection {
private:
esl_handle_t handle;
- ESLevent *last_event_obj;
public:
ESLconnection(const char *host, const char *port, const char *password);
ESLconnection(int socket);
Modified: freeswitch/trunk/src/mod/languages/mod_java/mod_java.i (14158 => 14159)
--- freeswitch/trunk/src/mod/languages/mod_java/mod_java.i 2009-07-08 15:20:55 UTC (rev 14158)
+++ freeswitch/trunk/src/mod/languages/mod_java/mod_java.i 2009-07-08 16:35:22 UTC (rev 14159)
@@ -7,9 +7,9 @@
%}
%ignore SwitchToMempool;
+%newobject EventConsumer::pop;
-
// I thought we were using swig because it's easier than the alternatives :-)
%typemap(jtype) jobject dtmfCallback "org.freeswitch.DTMFCallback"
Modified: freeswitch/trunk/src/mod/languages/mod_java/src/org/freeswitch/swig/EventConsumer.java (14158 => 14159)
--- freeswitch/trunk/src/mod/languages/mod_java/src/org/freeswitch/swig/EventConsumer.java 2009-07-08 15:20:55 UTC (rev 14158)
+++ freeswitch/trunk/src/mod/languages/mod_java/src/org/freeswitch/swig/EventConsumer.java 2009-07-08 16:35:22 UTC (rev 14159)
@@ -93,12 +93,12 @@
public Event pop(int block) {
long cPtr = freeswitchJNI.EventConsumer_pop__SWIG_0(swigCPtr, this, block);
- return (cPtr == 0) ? null : new Event(cPtr, false);
+ return (cPtr == 0) ? null : new Event(cPtr, true);
}
public Event pop() {
long cPtr = freeswitchJNI.EventConsumer_pop__SWIG_1(swigCPtr, this);
- return (cPtr == 0) ? null : new Event(cPtr, false);
+ return (cPtr == 0) ? null : new Event(cPtr, true);
}
}
Modified: freeswitch/trunk/src/mod/languages/mod_lua/freeswitch.i (14158 => 14159)
--- freeswitch/trunk/src/mod/languages/mod_lua/freeswitch.i 2009-07-08 15:20:55 UTC (rev 14158)
+++ freeswitch/trunk/src/mod/languages/mod_lua/freeswitch.i 2009-07-08 16:35:22 UTC (rev 14159)
@@ -19,6 +19,7 @@
%ignore SwitchToMempool;
+%newobject EventConsumer::pop;
/**
* tell swig to grok everything defined in these header files and
Modified: freeswitch/trunk/src/mod/languages/mod_lua/mod_lua_wrap.cpp (14158 => 14159)
--- freeswitch/trunk/src/mod/languages/mod_lua/mod_lua_wrap.cpp 2009-07-08 15:20:55 UTC (rev 14158)
+++ freeswitch/trunk/src/mod/languages/mod_lua/mod_lua_wrap.cpp 2009-07-08 16:35:22 UTC (rev 14159)
@@ -3860,7 +3860,7 @@
arg2 = (int)lua_tonumber(L, 2);
result = (Event *)(arg1)->pop(arg2);
SWIG_arg=0;
- SWIG_NewPointerObj(L,result,SWIGTYPE_p_Event,0); SWIG_arg++;
+ SWIG_NewPointerObj(L,result,SWIGTYPE_p_Event,1); SWIG_arg++;
return SWIG_arg;
if(0) SWIG_fail;
@@ -3885,7 +3885,7 @@
result = (Event *)(arg1)->pop();
SWIG_arg=0;
- SWIG_NewPointerObj(L,result,SWIGTYPE_p_Event,0); SWIG_arg++;
+ SWIG_NewPointerObj(L,result,SWIGTYPE_p_Event,1); SWIG_arg++;
return SWIG_arg;
if(0) SWIG_fail;
Modified: freeswitch/trunk/src/mod/languages/mod_managed/freeswitch.i (14158 => 14159)
--- freeswitch/trunk/src/mod/languages/mod_managed/freeswitch.i 2009-07-08 15:20:55 UTC (rev 14158)
+++ freeswitch/trunk/src/mod/languages/mod_managed/freeswitch.i 2009-07-08 16:35:22 UTC (rev 14159)
@@ -10,6 +10,7 @@
%typemap(csclassmodifiers) ManagedSession "public partial class"
%typemap(csclassmodifiers) Event "public partial class"
%typemap(csclassmodifiers) Stream "public partial class"
+%newobject EventConsumer::pop;
// Allow bitwise compare on flag fields
%typemap(csclassmodifiers) session_flag_t "[System.Flags] public enum"
Modified: freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_wrap.cxx (14158 => 14159)
--- freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_wrap.cxx 2009-07-08 15:20:55 UTC (rev 14158)
+++ freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_wrap.cxx 2009-07-08 16:35:22 UTC (rev 14159)
@@ -5312,6 +5312,18 @@
}
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_media_bug_inuse(void * jarg1, void * jarg2, void * jarg3) {
+ switch_media_bug_t *arg1 = (switch_media_bug_t *) 0 ;
+ switch_size_t *arg2 = (switch_size_t *) 0 ;
+ switch_size_t *arg3 = (switch_size_t *) 0 ;
+
+ arg1 = (switch_media_bug_t *)jarg1;
+ arg2 = (switch_size_t *)jarg2;
+ arg3 = (switch_size_t *)jarg3;
+ switch_core_media_bug_inuse(arg1,arg2,arg3);
+}
+
+
SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_media_bug_get_user_data(void * jarg1) {
void * jresult ;
switch_media_bug_t *arg1 = (switch_media_bug_t *) 0 ;
@@ -9391,6 +9403,20 @@
}
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_number_cmp(char * jarg1, int jarg2) {
+ int jresult ;
+ char *arg1 = (char *) 0 ;
+ int arg2 ;
+ int result;
+
+ arg1 = (char *)jarg1;
+ arg2 = (int)jarg2;
+ result = (int)switch_number_cmp((char const *)arg1,arg2);
+ jresult = result;
+ return jresult;
+}
+
+
SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_profile_username_set(void * jarg1, char * jarg2) {
switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
char *arg2 = (char *) 0 ;
Modified: freeswitch/trunk/src/mod/languages/mod_managed/managed/swig.cs ( => )