<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[Freeswitch-trunk][16854] </title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<div id="header">FreeSWITCH Subversion</div>
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://fisheye.freeswitch.org/changelog/FreeSWITCH?cs=16854">16854</a></dd>
<dt>Author</dt> <dd>anthm</dd>
<dt>Date</dt> <dd>2010-03-01 14:04:12 -0600 (Mon, 01 Mar 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>add bridged method to scripting langs</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcincludeswitch_cpph">freeswitch/trunk/src/include/switch_cpp.h</a></li>
<li><a href="#freeswitchtrunksrcmodlanguagesmod_javasrcorgfreeswitchswigCoreSessionjava">freeswitch/trunk/src/mod/languages/mod_java/src/org/freeswitch/swig/CoreSession.java</a></li>
<li><a href="#freeswitchtrunksrcmodlanguagesmod_javasrcorgfreeswitchswigfreeswitchJNIjava">freeswitch/trunk/src/mod/languages/mod_java/src/org/freeswitch/swig/freeswitchJNI.java</a></li>
<li><a href="#freeswitchtrunksrcmodlanguagesmod_javaswitch_swig_wrapcpp">freeswitch/trunk/src/mod/languages/mod_java/switch_swig_wrap.cpp</a></li>
<li><a href="#freeswitchtrunksrcmodlanguagesmod_managedfreeswitch_wrapcxx">freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_wrap.cxx</a></li>
<li><a href="#freeswitchtrunksrcmodlanguagesmod_managedmanagedswigcs">freeswitch/trunk/src/mod/languages/mod_managed/managed/swig.cs</a></li>
<li><a href="#freeswitchtrunksrcmodlanguagesmod_perlfreeswitchpm">freeswitch/trunk/src/mod/languages/mod_perl/freeswitch.pm</a></li>
<li><a href="#freeswitchtrunksrcmodlanguagesmod_perlmod_perl_wrapcpp">freeswitch/trunk/src/mod/languages/mod_perl/mod_perl_wrap.cpp</a></li>
<li><a href="#freeswitchtrunksrcmodlanguagesmod_pythonfreeswitchpy">freeswitch/trunk/src/mod/languages/mod_python/freeswitch.py</a></li>
<li><a href="#freeswitchtrunksrcmodlanguagesmod_pythonmod_python_wrapcpp">freeswitch/trunk/src/mod/languages/mod_python/mod_python_wrap.cpp</a></li>
<li><a href="#freeswitchtrunksrcswitch_cppcpp">freeswitch/trunk/src/switch_cpp.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunksrcincludeswitch_cpph"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/include/switch_cpp.h (16853 => 16854)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/include/switch_cpp.h 2010-03-01 19:25:27 UTC (rev 16853)
+++ freeswitch/trunk/src/include/switch_cpp.h 2010-03-01 20:04:12 UTC (rev 16854)
</span><span class="lines">@@ -331,6 +331,7 @@
</span><span class="cx"> SWITCH_DECLARE(void) setHangupHook(void *hangup_func);
</span><span class="cx">
</span><span class="cx"> SWITCH_DECLARE(bool) ready();
</span><ins>+ SWITCH_DECLARE(bool) bridged();
</ins><span class="cx"> SWITCH_DECLARE(bool) answered();
</span><span class="cx"> SWITCH_DECLARE(bool) mediaReady();
</span><span class="cx">
</span></span></pre></div>
<a id="freeswitchtrunksrcmodlanguagesmod_javasrcorgfreeswitchswigCoreSessionjava"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/languages/mod_java/src/org/freeswitch/swig/CoreSession.java (16853 => 16854)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/languages/mod_java/src/org/freeswitch/swig/CoreSession.java 2010-03-01 19:25:27 UTC (rev 16853)
+++ freeswitch/trunk/src/mod/languages/mod_java/src/org/freeswitch/swig/CoreSession.java 2010-03-01 20:04:12 UTC (rev 16854)
</span><span class="lines">@@ -301,6 +301,10 @@
</span><span class="cx"> return freeswitchJNI.CoreSession_ready(swigCPtr, this);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ public boolean bridged() {
+ return freeswitchJNI.CoreSession_bridged(swigCPtr, this);
+ }
+
</ins><span class="cx"> public boolean answered() {
</span><span class="cx"> return freeswitchJNI.CoreSession_answered(swigCPtr, this);
</span><span class="cx"> }
</span></span></pre></div>
<a id="freeswitchtrunksrcmodlanguagesmod_javasrcorgfreeswitchswigfreeswitchJNIjava"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/languages/mod_java/src/org/freeswitch/swig/freeswitchJNI.java (16853 => 16854)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/languages/mod_java/src/org/freeswitch/swig/freeswitchJNI.java 2010-03-01 19:25:27 UTC (rev 16853)
+++ freeswitch/trunk/src/mod/languages/mod_java/src/org/freeswitch/swig/freeswitchJNI.java 2010-03-01 20:04:12 UTC (rev 16854)
</span><span class="lines">@@ -152,6 +152,7 @@
</span><span class="cx"> public final static native int CoreSession_setAutoHangup(long jarg1, CoreSession jarg1_, boolean jarg2);
</span><span class="cx"> public final static native void CoreSession_setHangupHook(long jarg1, CoreSession jarg1_, long jarg2);
</span><span class="cx"> public final static native boolean CoreSession_ready(long jarg1, CoreSession jarg1_);
</span><ins>+ public final static native boolean CoreSession_bridged(long jarg1, CoreSession jarg1_);
</ins><span class="cx"> public final static native boolean CoreSession_answered(long jarg1, CoreSession jarg1_);
</span><span class="cx"> public final static native boolean CoreSession_mediaReady(long jarg1, CoreSession jarg1_);
</span><span class="cx"> public final static native void CoreSession_waitForAnswer(long jarg1, CoreSession jarg1_, long jarg2, CoreSession jarg2_);
</span></span></pre></div>
<a id="freeswitchtrunksrcmodlanguagesmod_javaswitch_swig_wrapcpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/languages/mod_java/switch_swig_wrap.cpp (16853 => 16854)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/languages/mod_java/switch_swig_wrap.cpp 2010-03-01 19:25:27 UTC (rev 16853)
+++ freeswitch/trunk/src/mod/languages/mod_java/switch_swig_wrap.cpp 2010-03-01 20:04:12 UTC (rev 16854)
</span><span class="lines">@@ -2993,6 +2993,21 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><ins>+SWIGEXPORT jboolean JNICALL Java_org_freeswitch_swig_freeswitchJNI_CoreSession_1bridged(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
+ jboolean jresult = 0 ;
+ CoreSession *arg1 = (CoreSession *) 0 ;
+ bool result;
+
+ (void)jenv;
+ (void)jcls;
+ (void)jarg1_;
+ arg1 = *(CoreSession **)&jarg1;
+ result = (bool)(arg1)->bridged();
+ jresult = (jboolean)result;
+ return jresult;
+}
+
+
</ins><span class="cx"> SWIGEXPORT jboolean JNICALL Java_org_freeswitch_swig_freeswitchJNI_CoreSession_1answered(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
</span><span class="cx"> jboolean jresult = 0 ;
</span><span class="cx"> CoreSession *arg1 = (CoreSession *) 0 ;
</span></span></pre></div>
<a id="freeswitchtrunksrcmodlanguagesmod_managedfreeswitch_wrapcxx"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_wrap.cxx (16853 => 16854)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_wrap.cxx 2010-03-01 19:25:27 UTC (rev 16853)
+++ freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_wrap.cxx 2010-03-01 20:04:12 UTC (rev 16854)
</span><span class="lines">@@ -377,6 +377,28 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><ins>+SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_TON_UNDEF_get() {
+ int jresult ;
+ int result;
+
+ result = (int) 255;
+
+ jresult = result;
+ return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_NUMPLAN_UNDEF_get() {
+ int jresult ;
+ int result;
+
+ result = (int) 255;
+
+ jresult = result;
+ return jresult;
+}
+
+
</ins><span class="cx"> SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SEQ_ESC_get() {
</span><span class="cx"> char * jresult ;
</span><span class="cx"> char *result = 0 ;
</span><span class="lines">@@ -21877,11 +21899,17 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_audio_sync(void * jarg1) {
</del><ins>+SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_perform_audio_sync(void * jarg1, char * jarg2, char * jarg3, int jarg4) {
</ins><span class="cx"> switch_channel_t *arg1 = (switch_channel_t *) 0 ;
</span><ins>+ char *arg2 = (char *) 0 ;
+ char *arg3 = (char *) 0 ;
+ int arg4 ;
</ins><span class="cx">
</span><span class="cx"> arg1 = (switch_channel_t *)jarg1;
</span><del>- switch_channel_audio_sync(arg1);
</del><ins>+ arg2 = (char *)jarg2;
+ arg3 = (char *)jarg3;
+ arg4 = (int)jarg4;
+ switch_channel_perform_audio_sync(arg1,(char const *)arg2,(char const *)arg3,arg4);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -22163,6 +22191,28 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><ins>+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_buffer_peek(void * jarg1, void * jarg2, void * jarg3) {
+ void * jresult ;
+ switch_buffer_t *arg1 = (switch_buffer_t *) 0 ;
+ void *arg2 = (void *) 0 ;
+ switch_size_t arg3 ;
+ switch_size_t result;
+ switch_size_t *argp3 ;
+
+ arg1 = (switch_buffer_t *)jarg1;
+ arg2 = (void *)jarg2;
+ argp3 = (switch_size_t *)jarg3;
+ if (!argp3) {
+ SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
+ return 0;
+ }
+ arg3 = *argp3;
+ result = switch_buffer_peek(arg1,arg2,arg3);
+ jresult = new switch_size_t((switch_size_t &)result);
+ return jresult;
+}
+
+
</ins><span class="cx"> SWIGEXPORT void * SWIGSTDCALL CSharp_switch_buffer_read_loop(void * jarg1, void * jarg2, void * jarg3) {
</span><span class="cx"> void * jresult ;
</span><span class="cx"> switch_buffer_t *arg1 = (switch_buffer_t *) 0 ;
</span><span class="lines">@@ -31317,6 +31367,18 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><ins>+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_CoreSession_bridged(void * jarg1) {
+ unsigned int jresult ;
+ CoreSession *arg1 = (CoreSession *) 0 ;
+ bool result;
+
+ arg1 = (CoreSession *)jarg1;
+ result = (bool)(arg1)->bridged();
+ jresult = result;
+ return jresult;
+}
+
+
</ins><span class="cx"> SWIGEXPORT unsigned int SWIGSTDCALL CSharp_CoreSession_answered(void * jarg1) {
</span><span class="cx"> unsigned int jresult ;
</span><span class="cx"> CoreSession *arg1 = (CoreSession *) 0 ;
</span></span></pre></div>
<a id="freeswitchtrunksrcmodlanguagesmod_managedmanagedswigcs"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/languages/mod_managed/managed/swig.cs (16853 => 16854)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/languages/mod_managed/managed/swig.cs 2010-03-01 19:25:27 UTC (rev 16853)
+++ freeswitch/trunk/src/mod/languages/mod_managed/managed/swig.cs 2010-03-01 20:04:12 UTC (rev 16854)
</span><span class="lines">@@ -362,6 +362,11 @@
</span><span class="cx"> return ret;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ public bool bridged() {
+ bool ret = freeswitchPINVOKE.CoreSession_bridged(swigCPtr);
+ return ret;
+ }
+
</ins><span class="cx"> public bool answered() {
</span><span class="cx"> bool ret = freeswitchPINVOKE.CoreSession_answered(swigCPtr);
</span><span class="cx"> return ret;
</span><span class="lines">@@ -3113,8 +3118,8 @@
</span><span class="cx"> return ret;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- public static void switch_channel_audio_sync(SWIGTYPE_p_switch_channel channel) {
- freeswitchPINVOKE.switch_channel_audio_sync(SWIGTYPE_p_switch_channel.getCPtr(channel));
</del><ins>+ public static void switch_channel_perform_audio_sync(SWIGTYPE_p_switch_channel channel, string file, string func, int line) {
+ freeswitchPINVOKE.switch_channel_perform_audio_sync(SWIGTYPE_p_switch_channel.getCPtr(channel), file, func, line);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> public static void switch_channel_set_private_flag(SWIGTYPE_p_switch_channel channel, uint flags) {
</span><span class="lines">@@ -3218,6 +3223,12 @@
</span><span class="cx"> return ret;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ public static SWIGTYPE_p_switch_size_t switch_buffer_peek(SWIGTYPE_p_switch_buffer buffer, SWIGTYPE_p_void data, SWIGTYPE_p_switch_size_t datalen) {
+ SWIGTYPE_p_switch_size_t ret = new SWIGTYPE_p_switch_size_t(freeswitchPINVOKE.switch_buffer_peek(SWIGTYPE_p_switch_buffer.getCPtr(buffer), SWIGTYPE_p_void.getCPtr(data), SWIGTYPE_p_switch_size_t.getCPtr(datalen)), true);
+ if (freeswitchPINVOKE.SWIGPendingException.Pending) throw freeswitchPINVOKE.SWIGPendingException.Retrieve();
+ return ret;
+ }
+
</ins><span class="cx"> public static SWIGTYPE_p_switch_size_t switch_buffer_read_loop(SWIGTYPE_p_switch_buffer buffer, SWIGTYPE_p_void data, SWIGTYPE_p_switch_size_t datalen) {
</span><span class="cx"> SWIGTYPE_p_switch_size_t ret = new SWIGTYPE_p_switch_size_t(freeswitchPINVOKE.switch_buffer_read_loop(SWIGTYPE_p_switch_buffer.getCPtr(buffer), SWIGTYPE_p_void.getCPtr(data), SWIGTYPE_p_switch_size_t.getCPtr(datalen)), true);
</span><span class="cx"> if (freeswitchPINVOKE.SWIGPendingException.Pending) throw freeswitchPINVOKE.SWIGPendingException.Retrieve();
</span><span class="lines">@@ -4673,6 +4684,8 @@
</span><span class="cx"> public static readonly int __BSD_VISIBLE = freeswitchPINVOKE.__BSD_VISIBLE_get();
</span><span class="cx"> public static readonly string SWITCH_ENT_ORIGINATE_DELIM = freeswitchPINVOKE.SWITCH_ENT_ORIGINATE_DELIM_get();
</span><span class="cx"> public static readonly string SWITCH_BLANK_STRING = freeswitchPINVOKE.SWITCH_BLANK_STRING_get();
</span><ins>+ public static readonly int SWITCH_TON_UNDEF = freeswitchPINVOKE.SWITCH_TON_UNDEF_get();
+ public static readonly int SWITCH_NUMPLAN_UNDEF = freeswitchPINVOKE.SWITCH_NUMPLAN_UNDEF_get();
</ins><span class="cx"> public static readonly string SWITCH_SEQ_ESC = freeswitchPINVOKE.SWITCH_SEQ_ESC_get();
</span><span class="cx"> public static readonly char SWITCH_SEQ_HOME_CHAR = freeswitchPINVOKE.SWITCH_SEQ_HOME_CHAR_get();
</span><span class="cx"> public static readonly string SWITCH_SEQ_HOME_CHAR_STR = freeswitchPINVOKE.SWITCH_SEQ_HOME_CHAR_STR_get();
</span><span class="lines">@@ -5062,6 +5075,12 @@
</span><span class="cx"> [DllImport("mod_managed", EntryPoint="CSharp_SWITCH_BLANK_STRING_get")]
</span><span class="cx"> public static extern string SWITCH_BLANK_STRING_get();
</span><span class="cx">
</span><ins>+ [DllImport("mod_managed", EntryPoint="CSharp_SWITCH_TON_UNDEF_get")]
+ public static extern int SWITCH_TON_UNDEF_get();
+
+ [DllImport("mod_managed", EntryPoint="CSharp_SWITCH_NUMPLAN_UNDEF_get")]
+ public static extern int SWITCH_NUMPLAN_UNDEF_get();
+
</ins><span class="cx"> [DllImport("mod_managed", EntryPoint="CSharp_SWITCH_SEQ_ESC_get")]
</span><span class="cx"> public static extern string SWITCH_SEQ_ESC_get();
</span><span class="cx">
</span><span class="lines">@@ -10255,8 +10274,8 @@
</span><span class="cx"> [DllImport("mod_managed", EntryPoint="CSharp_switch_channel_set_timestamps")]
</span><span class="cx"> public static extern int switch_channel_set_timestamps(HandleRef jarg1);
</span><span class="cx">
</span><del>- [DllImport("mod_managed", EntryPoint="CSharp_switch_channel_audio_sync")]
- public static extern void switch_channel_audio_sync(HandleRef jarg1);
</del><ins>+ [DllImport("mod_managed", EntryPoint="CSharp_switch_channel_perform_audio_sync")]
+ public static extern void switch_channel_perform_audio_sync(HandleRef jarg1, string jarg2, string jarg3, int jarg4);
</ins><span class="cx">
</span><span class="cx"> [DllImport("mod_managed", EntryPoint="CSharp_switch_channel_set_private_flag")]
</span><span class="cx"> public static extern void switch_channel_set_private_flag(HandleRef jarg1, uint jarg2);
</span><span class="lines">@@ -10321,6 +10340,9 @@
</span><span class="cx"> [DllImport("mod_managed", EntryPoint="CSharp_switch_buffer_read")]
</span><span class="cx"> public static extern IntPtr switch_buffer_read(HandleRef jarg1, HandleRef jarg2, HandleRef jarg3);
</span><span class="cx">
</span><ins>+ [DllImport("mod_managed", EntryPoint="CSharp_switch_buffer_peek")]
+ public static extern IntPtr switch_buffer_peek(HandleRef jarg1, HandleRef jarg2, HandleRef jarg3);
+
</ins><span class="cx"> [DllImport("mod_managed", EntryPoint="CSharp_switch_buffer_read_loop")]
</span><span class="cx"> public static extern IntPtr switch_buffer_read_loop(HandleRef jarg1, HandleRef jarg2, HandleRef jarg3);
</span><span class="cx">
</span><span class="lines">@@ -12370,6 +12392,9 @@
</span><span class="cx"> [DllImport("mod_managed", EntryPoint="CSharp_CoreSession_Ready")]
</span><span class="cx"> public static extern bool CoreSession_Ready(HandleRef jarg1);
</span><span class="cx">
</span><ins>+ [DllImport("mod_managed", EntryPoint="CSharp_CoreSession_bridged")]
+ public static extern bool CoreSession_bridged(HandleRef jarg1);
+
</ins><span class="cx"> [DllImport("mod_managed", EntryPoint="CSharp_CoreSession_answered")]
</span><span class="cx"> public static extern bool CoreSession_answered(HandleRef jarg1);
</span><span class="cx">
</span><span class="lines">@@ -21004,7 +21029,7 @@
</span><span class="cx"> SCF_USE_AUTO_NAT = (1 << 6),
</span><span class="cx"> SCF_EARLY_HANGUP = (1 << 7),
</span><span class="cx"> SCF_CALIBRATE_CLOCK = (1 << 8),
</span><del>- SCF_USE_COND_TIMING = (1 << 9),
</del><ins>+ SCF_USE_HEAVY_TIMING = (1 << 9),
</ins><span class="cx"> SCF_USE_CLOCK_RT = (1 << 10)
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="freeswitchtrunksrcmodlanguagesmod_perlfreeswitchpm"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/languages/mod_perl/freeswitch.pm (16853 => 16854)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/languages/mod_perl/freeswitch.pm 2010-03-01 19:25:27 UTC (rev 16853)
+++ freeswitch/trunk/src/mod/languages/mod_perl/freeswitch.pm 2010-03-01 20:04:12 UTC (rev 16854)
</span><span class="lines">@@ -432,6 +432,7 @@
</span><span class="cx"> *setAutoHangup = *freeswitchc::CoreSession_setAutoHangup;
</span><span class="cx"> *setHangupHook = *freeswitchc::CoreSession_setHangupHook;
</span><span class="cx"> *ready = *freeswitchc::CoreSession_ready;
</span><ins>+*bridged = *freeswitchc::CoreSession_bridged;
</ins><span class="cx"> *answered = *freeswitchc::CoreSession_answered;
</span><span class="cx"> *mediaReady = *freeswitchc::CoreSession_mediaReady;
</span><span class="cx"> *waitForAnswer = *freeswitchc::CoreSession_waitForAnswer;
</span></span></pre></div>
<a id="freeswitchtrunksrcmodlanguagesmod_perlmod_perl_wrapcpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/languages/mod_perl/mod_perl_wrap.cpp (16853 => 16854)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/languages/mod_perl/mod_perl_wrap.cpp 2010-03-01 19:25:27 UTC (rev 16853)
+++ freeswitch/trunk/src/mod/languages/mod_perl/mod_perl_wrap.cpp 2010-03-01 20:04:12 UTC (rev 16854)
</span><span class="lines">@@ -9367,6 +9367,34 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><ins>+XS(_wrap_CoreSession_bridged) {
+ {
+ CoreSession *arg1 = (CoreSession *) 0 ;
+ bool result;
+ void *argp1 = 0 ;
+ int res1 = 0 ;
+ int argvi = 0;
+ dXSARGS;
+
+ if ((items < 1) || (items > 1)) {
+ SWIG_croak("Usage: CoreSession_bridged(self);");
+ }
+ res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_CoreSession, 0 | 0 );
+ if (!SWIG_IsOK(res1)) {
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CoreSession_bridged" "', argument " "1"" of type '" "CoreSession *""'");
+ }
+ arg1 = reinterpret_cast< CoreSession * >(argp1);
+ result = (bool)(arg1)->bridged();
+ ST(argvi) = SWIG_From_bool SWIG_PERL_CALL_ARGS_1(static_cast< bool >(result)); argvi++ ;
+
+ XSRETURN(argvi);
+ fail:
+
+ SWIG_croak_null();
+ }
+}
+
+
</ins><span class="cx"> XS(_wrap_CoreSession_answered) {
</span><span class="cx"> {
</span><span class="cx"> CoreSession *arg1 = (CoreSession *) 0 ;
</span><span class="lines">@@ -11734,6 +11762,7 @@
</span><span class="cx"> {"freeswitchc::CoreSession_setAutoHangup", _wrap_CoreSession_setAutoHangup},
</span><span class="cx"> {"freeswitchc::CoreSession_setHangupHook", _wrap_CoreSession_setHangupHook},
</span><span class="cx"> {"freeswitchc::CoreSession_ready", _wrap_CoreSession_ready},
</span><ins>+{"freeswitchc::CoreSession_bridged", _wrap_CoreSession_bridged},
</ins><span class="cx"> {"freeswitchc::CoreSession_answered", _wrap_CoreSession_answered},
</span><span class="cx"> {"freeswitchc::CoreSession_mediaReady", _wrap_CoreSession_mediaReady},
</span><span class="cx"> {"freeswitchc::CoreSession_waitForAnswer", _wrap_CoreSession_waitForAnswer},
</span><span class="lines">@@ -12073,17 +12102,17 @@
</span><span class="cx"> SWIG_TypeClientData(SWIGTYPE_p_IVRMenu, (void*) "freeswitch::IVRMenu");
</span><span class="cx"> SWIG_TypeClientData(SWIGTYPE_p_API, (void*) "freeswitch::API");
</span><span class="cx"> SWIG_TypeClientData(SWIGTYPE_p_input_callback_state, (void*) "freeswitch::input_callback_state_t");
</span><del>- /*@SWIG:/usr/share/swig/1.3.35/perl5/perltypemaps.swg,64,%set_constant@*/ do {
</del><ins>+ /*@SWIG:/usr/local/share/swig/1.3.35/perl5/perltypemaps.swg,64,%set_constant@*/ do {
</ins><span class="cx"> SV *sv = get_sv((char*) SWIG_prefix "S_HUP", TRUE | 0x2 | GV_ADDMULTI);
</span><span class="cx"> sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(S_HUP)));
</span><span class="cx"> SvREADONLY_on(sv);
</span><span class="cx"> } while(0) /*@SWIG@*/;
</span><del>- /*@SWIG:/usr/share/swig/1.3.35/perl5/perltypemaps.swg,64,%set_constant@*/ do {
</del><ins>+ /*@SWIG:/usr/local/share/swig/1.3.35/perl5/perltypemaps.swg,64,%set_constant@*/ do {
</ins><span class="cx"> SV *sv = get_sv((char*) SWIG_prefix "S_FREE", TRUE | 0x2 | GV_ADDMULTI);
</span><span class="cx"> sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(S_FREE)));
</span><span class="cx"> SvREADONLY_on(sv);
</span><span class="cx"> } while(0) /*@SWIG@*/;
</span><del>- /*@SWIG:/usr/share/swig/1.3.35/perl5/perltypemaps.swg,64,%set_constant@*/ do {
</del><ins>+ /*@SWIG:/usr/local/share/swig/1.3.35/perl5/perltypemaps.swg,64,%set_constant@*/ do {
</ins><span class="cx"> SV *sv = get_sv((char*) SWIG_prefix "S_RDLOCK", TRUE | 0x2 | GV_ADDMULTI);
</span><span class="cx"> sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(S_RDLOCK)));
</span><span class="cx"> SvREADONLY_on(sv);
</span></span></pre></div>
<a id="freeswitchtrunksrcmodlanguagesmod_pythonfreeswitchpy"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/languages/mod_python/freeswitch.py (16853 => 16854)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/languages/mod_python/freeswitch.py 2010-03-01 19:25:27 UTC (rev 16853)
+++ freeswitch/trunk/src/mod/languages/mod_python/freeswitch.py 2010-03-01 20:04:12 UTC (rev 16854)
</span><span class="lines">@@ -290,6 +290,7 @@
</span><span class="cx"> def setAutoHangup(*args): return _freeswitch.CoreSession_setAutoHangup(*args)
</span><span class="cx"> def setHangupHook(*args): return _freeswitch.CoreSession_setHangupHook(*args)
</span><span class="cx"> def ready(*args): return _freeswitch.CoreSession_ready(*args)
</span><ins>+ def bridged(*args): return _freeswitch.CoreSession_bridged(*args)
</ins><span class="cx"> def answered(*args): return _freeswitch.CoreSession_answered(*args)
</span><span class="cx"> def mediaReady(*args): return _freeswitch.CoreSession_mediaReady(*args)
</span><span class="cx"> def waitForAnswer(*args): return _freeswitch.CoreSession_waitForAnswer(*args)
</span></span></pre></div>
<a id="freeswitchtrunksrcmodlanguagesmod_pythonmod_python_wrapcpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/languages/mod_python/mod_python_wrap.cpp (16853 => 16854)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/languages/mod_python/mod_python_wrap.cpp 2010-03-01 19:25:27 UTC (rev 16853)
+++ freeswitch/trunk/src/mod/languages/mod_python/mod_python_wrap.cpp 2010-03-01 20:04:12 UTC (rev 16854)
</span><span class="lines">@@ -8914,6 +8914,28 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><ins>+SWIGINTERN PyObject *_wrap_CoreSession_bridged(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *resultobj = 0;
+ CoreSession *arg1 = (CoreSession *) 0 ;
+ bool result;
+ void *argp1 = 0 ;
+ int res1 = 0 ;
+ PyObject * obj0 = 0 ;
+
+ if (!PyArg_ParseTuple(args,(char *)"O:CoreSession_bridged",&obj0)) SWIG_fail;
+ res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CoreSession, 0 | 0 );
+ if (!SWIG_IsOK(res1)) {
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CoreSession_bridged" "', argument " "1"" of type '" "CoreSession *""'");
+ }
+ arg1 = reinterpret_cast< CoreSession * >(argp1);
+ result = (bool)(arg1)->bridged();
+ resultobj = SWIG_From_bool(static_cast< bool >(result));
+ return resultobj;
+fail:
+ return NULL;
+}
+
+
</ins><span class="cx"> SWIGINTERN PyObject *_wrap_CoreSession_answered(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
</span><span class="cx"> PyObject *resultobj = 0;
</span><span class="cx"> CoreSession *arg1 = (CoreSession *) 0 ;
</span><span class="lines">@@ -10472,6 +10494,7 @@
</span><span class="cx"> { (char *)"CoreSession_setAutoHangup", _wrap_CoreSession_setAutoHangup, METH_VARARGS, NULL},
</span><span class="cx"> { (char *)"CoreSession_setHangupHook", _wrap_CoreSession_setHangupHook, METH_VARARGS, NULL},
</span><span class="cx"> { (char *)"CoreSession_ready", _wrap_CoreSession_ready, METH_VARARGS, NULL},
</span><ins>+ { (char *)"CoreSession_bridged", _wrap_CoreSession_bridged, METH_VARARGS, NULL},
</ins><span class="cx"> { (char *)"CoreSession_answered", _wrap_CoreSession_answered, METH_VARARGS, NULL},
</span><span class="cx"> { (char *)"CoreSession_mediaReady", _wrap_CoreSession_mediaReady, METH_VARARGS, NULL},
</span><span class="cx"> { (char *)"CoreSession_waitForAnswer", _wrap_CoreSession_waitForAnswer, METH_VARARGS, NULL},
</span></span></pre></div>
<a id="freeswitchtrunksrcswitch_cppcpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_cpp.cpp (16853 => 16854)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_cpp.cpp 2010-03-01 19:25:27 UTC (rev 16853)
+++ freeswitch/trunk/src/switch_cpp.cpp 2010-03-01 20:04:12 UTC (rev 16854)
</span><span class="lines">@@ -896,6 +896,19 @@
</span><span class="cx"> return switch_channel_ready(channel) != 0;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+
+SWITCH_DECLARE(bool) CoreSession::bridged() {
+
+ this_check(false);
+
+ if (!session) {
+ return false;
+ }
+ sanity_check(false);
+
+ return (switch_channel_up(channel) && switch_channel_test_flag(channel, CF_BRIDGED));
+}
+
</ins><span class="cx"> SWITCH_DECLARE(bool) CoreSession::mediaReady() {
</span><span class="cx">
</span><span class="cx"> this_check(false);
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>