FS-7670: re-swig

src/mod/languages/mod_java/src/org/freeswitch/swig/API.java

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -26,12 +26,14 @@ public class API {
   }
 
   public synchronized void delete() {
-    if(swigCPtr != 0 && swigCMemOwn) {
+    if (swigCPtr != 0) {
+      if (swigCMemOwn) {
         swigCMemOwn = false;
         freeswitchJNI.delete_API(swigCPtr);
       }
       swigCPtr = 0;
     }
+  }
 
   public API(CoreSession s) {
     this(freeswitchJNI.new_API(CoreSession.getCPtr(s), s), true);

src/mod/languages/mod_java/src/org/freeswitch/swig/CoreSession.java

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -26,12 +26,14 @@ public class CoreSession {
   }
 
   public synchronized void delete() {
-    if(swigCPtr != 0 && swigCMemOwn) {
+    if (swigCPtr != 0) {
+      if (swigCMemOwn) {
         swigCMemOwn = false;
         freeswitchJNI.delete_CoreSession(swigCPtr);
       }
       swigCPtr = 0;
     }
+  }
 
   public void setSession(SWIGTYPE_p_switch_core_session_t value) {
     freeswitchJNI.CoreSession_session_set(swigCPtr, this, SWIGTYPE_p_switch_core_session_t.getCPtr(value));

src/mod/languages/mod_java/src/org/freeswitch/swig/DTMF.java

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -26,12 +26,14 @@ public class DTMF {
   }
 
   public synchronized void delete() {
-    if(swigCPtr != 0 && swigCMemOwn) {
+    if (swigCPtr != 0) {
+      if (swigCMemOwn) {
         swigCMemOwn = false;
         freeswitchJNI.delete_DTMF(swigCPtr);
       }
       swigCPtr = 0;
     }
+  }
 
   public void setDigit(char value) {
     freeswitchJNI.DTMF_digit_set(swigCPtr, this, value);

src/mod/languages/mod_java/src/org/freeswitch/swig/Event.java

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -26,12 +26,14 @@ public class Event {
   }
 
   public synchronized void delete() {
-    if(swigCPtr != 0 && swigCMemOwn) {
+    if (swigCPtr != 0) {
+      if (swigCMemOwn) {
         swigCMemOwn = false;
         freeswitchJNI.delete_Event(swigCPtr);
       }
       swigCPtr = 0;
     }
+  }
 
   public void setEvent(SWIGTYPE_p_switch_event_t value) {
     freeswitchJNI.Event_event_set(swigCPtr, this, SWIGTYPE_p_switch_event_t.getCPtr(value));

src/mod/languages/mod_java/src/org/freeswitch/swig/EventConsumer.java

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -26,12 +26,14 @@ public class EventConsumer {
   }
 
   public synchronized void delete() {
-    if(swigCPtr != 0 && swigCMemOwn) {
+    if (swigCPtr != 0) {
+      if (swigCMemOwn) {
         swigCMemOwn = false;
         freeswitchJNI.delete_EventConsumer(swigCPtr);
       }
       swigCPtr = 0;
     }
+  }
 
   public void setEvents(SWIGTYPE_p_switch_queue_t value) {
     freeswitchJNI.EventConsumer_events_set(swigCPtr, this, SWIGTYPE_p_switch_queue_t.getCPtr(value));

src/mod/languages/mod_java/src/org/freeswitch/swig/IVRMenu.java

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -26,12 +26,14 @@ public class IVRMenu {
   }
 
   public synchronized void delete() {
-    if(swigCPtr != 0 && swigCMemOwn) {
+    if (swigCPtr != 0) {
+      if (swigCMemOwn) {
         swigCMemOwn = false;
         freeswitchJNI.delete_IVRMenu(swigCPtr);
       }
       swigCPtr = 0;
     }
+  }
 
   public IVRMenu(IVRMenu main, String name, String greeting_sound, String short_greeting_sound, String invalid_sound, String exit_sound, String transfer_sound, String confirm_macro, String confirm_key, String tts_engine, String tts_voice, int confirm_attempts, int inter_timeout, int digit_len, int timeout, int max_failures, int max_timeouts) {
     this(freeswitchJNI.new_IVRMenu(IVRMenu.getCPtr(main), main, name, greeting_sound, short_greeting_sound, invalid_sound, exit_sound, transfer_sound, confirm_macro, confirm_key, tts_engine, tts_voice, confirm_attempts, inter_timeout, digit_len, timeout, max_failures, max_timeouts), true);

src/mod/languages/mod_java/src/org/freeswitch/swig/JavaSession.java

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -12,7 +12,7 @@ public class JavaSession extends CoreSession {
   private long swigCPtr;
 
   protected JavaSession(long cPtr, boolean cMemoryOwn) {
-    super(freeswitchJNI.SWIGJavaSessionUpcast(cPtr), cMemoryOwn);
+    super(freeswitchJNI.JavaSession_SWIGUpcast(cPtr), cMemoryOwn);
     swigCPtr = cPtr;
   }
 
@@ -25,11 +25,13 @@ public class JavaSession extends CoreSession {
   }
 
   public synchronized void delete() {
-    if(swigCPtr != 0 && swigCMemOwn) {
+    if (swigCPtr != 0) {
+      if (swigCMemOwn) {
         swigCMemOwn = false;
         freeswitchJNI.delete_JavaSession(swigCPtr);
       }
       swigCPtr = 0;
+    }
     super.delete();
   }
 

src/mod/languages/mod_java/src/org/freeswitch/swig/SWIGTYPE_p_JavaVM.java

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.

src/mod/languages/mod_java/src/org/freeswitch/swig/SWIGTYPE_p_int.java

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.

src/mod/languages/mod_java/src/org/freeswitch/swig/SWIGTYPE_p_p_switch_event_node_t.java

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.

src/mod/languages/mod_java/src/org/freeswitch/swig/SWIGTYPE_p_switch_call_cause_t.java

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.

src/mod/languages/mod_java/src/org/freeswitch/swig/SWIGTYPE_p_switch_channel_state_t.java

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.

src/mod/languages/mod_java/src/org/freeswitch/swig/SWIGTYPE_p_switch_channel_t.java

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.

src/mod/languages/mod_java/src/org/freeswitch/swig/SWIGTYPE_p_switch_core_session_t.java

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.

src/mod/languages/mod_java/src/org/freeswitch/swig/SWIGTYPE_p_switch_event_t.java

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.

src/mod/languages/mod_java/src/org/freeswitch/swig/SWIGTYPE_p_switch_event_types_t.java

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.

src/mod/languages/mod_java/src/org/freeswitch/swig/SWIGTYPE_p_switch_input_args_t.java

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.

src/mod/languages/mod_java/src/org/freeswitch/swig/SWIGTYPE_p_switch_input_type_t.java

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.

src/mod/languages/mod_java/src/org/freeswitch/swig/SWIGTYPE_p_switch_priority_t.java

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.

src/mod/languages/mod_java/src/org/freeswitch/swig/SWIGTYPE_p_switch_queue_t.java

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.

src/mod/languages/mod_java/src/org/freeswitch/swig/SWIGTYPE_p_switch_state_handler_table_t.java

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.

src/mod/languages/mod_java/src/org/freeswitch/swig/SWIGTYPE_p_switch_status_t.java

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.

src/mod/languages/mod_java/src/org/freeswitch/swig/SWIGTYPE_p_switch_stream_handle_t.java

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.

src/mod/languages/mod_java/src/org/freeswitch/swig/SWIGTYPE_p_uint32_t.java

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.

src/mod/languages/mod_java/src/org/freeswitch/swig/SWIGTYPE_p_void.java

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.

src/mod/languages/mod_java/src/org/freeswitch/swig/Stream.java

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -26,12 +26,14 @@ public class Stream {
   }
 
   public synchronized void delete() {
-    if(swigCPtr != 0 && swigCMemOwn) {
+    if (swigCPtr != 0) {
+      if (swigCMemOwn) {
         swigCMemOwn = false;
         freeswitchJNI.delete_Stream(swigCPtr);
       }
       swigCPtr = 0;
     }
+  }
 
   public Stream() {
     this(freeswitchJNI.new_Stream__SWIG_0(), true);

src/mod/languages/mod_java/src/org/freeswitch/swig/freeswitch.java

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.

src/mod/languages/mod_java/src/org/freeswitch/swig/freeswitchJNI.java

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -8,7 +8,7 @@
 
 package org.freeswitch.swig;
 
-class freeswitchJNI {
+public class freeswitchJNI {
   public final static native void setGlobalVariable(String jarg1, String jarg2);
   public final static native String getGlobalVariable(String jarg1);
   public final static native void consoleLog(String jarg1, String jarg2);
@@ -183,5 +183,5 @@ class freeswitchJNI {
   public final static native void JavaSession_check_hangup_hook(long jarg1, JavaSession jarg1_);
   public final static native long JavaSession_run_dtmf_callback(long jarg1, JavaSession jarg1_, long jarg2, long jarg3);
   public final static native int JavaSession_originate(long jarg1, JavaSession jarg1_, long jarg2, JavaSession jarg2_, String jarg3, int jarg4);
-  public final static native long SWIGJavaSessionUpcast(long jarg1);
+  public final static native long JavaSession_SWIGUpcast(long jarg1);
 }

src/mod/languages/mod_java/src/org/freeswitch/swig/input_callback_state_t.java

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -26,12 +26,14 @@ public class input_callback_state_t {
   }
 
   public synchronized void delete() {
-    if(swigCPtr != 0 && swigCMemOwn) {
+    if (swigCPtr != 0) {
+      if (swigCMemOwn) {
         swigCMemOwn = false;
         freeswitchJNI.delete_input_callback_state_t(swigCPtr);
       }
       swigCPtr = 0;
     }
+  }
 
   public void setFunction(SWIGTYPE_p_void value) {
     freeswitchJNI.input_callback_state_t_function_set(swigCPtr, this, SWIGTYPE_p_void.getCPtr(value));

src/mod/languages/mod_java/src/org/freeswitch/swig/session_flag_t.java

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.

src/mod/languages/mod_java/switch_swig_wrap.cpp

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.12
  *
  * This file is not intended to be easily readable and contains a number of
  * coding conventions designed to improve portability and efficiency. Do not make
@@ -8,20 +8,25 @@
  * interface file instead.
  * ----------------------------------------------------------------------------- */
 
+#define SWIGJAVA
+
 
 #ifdef __cplusplus
+/* SwigValueWrapper is described in swig.swg */
 template<typename T> class SwigValueWrapper {
-    T *tt;
+  struct SwigMovePointer {
-public:
+    T *ptr;
-    SwigValueWrapper() : tt(0) { }
+    SwigMovePointer(T *p) : ptr(p) { }
-    SwigValueWrapper(const SwigValueWrapper<T>& rhs) : tt(new T(*rhs.tt)) { }
+    ~SwigMovePointer() { delete ptr; }
-    SwigValueWrapper(const T& t) : tt(new T(t)) { }
+    SwigMovePointer& operator=(SwigMovePointer& rhs) { T* oldptr = ptr; ptr = 0; delete oldptr; ptr = rhs.ptr; rhs.ptr = 0; return *this; }
-    ~SwigValueWrapper() { delete tt; } 
+  } pointer;
-    SwigValueWrapper& operator=(const T& t) { delete tt; tt = new T(t); return *this; }
-    operator T&() const { return *tt; }
-    T *operator&() { return tt; }
-private:
   SwigValueWrapper& operator=(const SwigValueWrapper<T>& rhs);
+  SwigValueWrapper(const SwigValueWrapper<T>& rhs);
+public:
+  SwigValueWrapper() : pointer(0) { }
+  SwigValueWrapper& operator=(const T& t) { SwigMovePointer tmp(new T(t)); pointer = tmp; return *this; }
+  operator T&() const { return *pointer.ptr; }
+  T *operator&() { return pointer.ptr; }
 };
 
 template <typename T> T SwigValueInit() {
@@ -71,6 +76,12 @@ template <typename T> T SwigValueInit() {
 # endif
 #endif
 
+#ifndef SWIG_MSC_UNSUPPRESS_4505
+# if defined(_MSC_VER)
+#   pragma warning(disable : 4505) /* unreferenced local function has been removed */
+# endif
+#endif
+
 #ifndef SWIGUNUSEDPARM
 # ifdef __cplusplus
 #   define SWIGUNUSEDPARM(p)
@@ -134,7 +145,7 @@ template <typename T> T SwigValueInit() {
 
 
 /* Fix for jlong on some versions of gcc on Windows */
-#if defined(__GNUC__) && !defined(__INTELC__)
+#if defined(__GNUC__) && !defined(__INTEL_COMPILER)
   typedef long long __int64;
 #endif
 
@@ -181,7 +192,8 @@ static void SWIGUNUSED SWIG_JavaThrowException(JNIEnv *jenv, SWIG_JavaExceptionC
     { SWIG_JavaNullPointerException, "java/lang/NullPointerException" },
     { SWIG_JavaDirectorPureVirtual, "java/lang/RuntimeException" },
     { SWIG_JavaUnknownError,  "java/lang/UnknownError" },
-    { (SWIG_JavaExceptionCodes)0,  "java/lang/UnknownError" } };
+    { (SWIG_JavaExceptionCodes)0,  "java/lang/UnknownError" }
+  };
   const SWIG_JavaExceptions_t *except_ptr = java_exceptions;
 
   while (except_ptr->code != code && except_ptr->code)
@@ -502,7 +514,6 @@ SWIGEXPORT void JNICALL Java_org_freeswitch_swig_freeswitchJNI_delete_1IVRMenu(J
   (void)jcls;
   arg1 = *(IVRMenu **)&jarg1; 
   delete arg1;
-  
 }
 
 
@@ -581,7 +592,6 @@ SWIGEXPORT void JNICALL Java_org_freeswitch_swig_freeswitchJNI_delete_1API(JNIEn
   (void)jcls;
   arg1 = *(API **)&jarg1; 
   delete arg1;
-  
 }
 
 
@@ -652,28 +662,27 @@ SWIGEXPORT jstring JNICALL Java_org_freeswitch_swig_freeswitchJNI_API_1getTime(J
 
 
 SWIGEXPORT void JNICALL Java_org_freeswitch_swig_freeswitchJNI_input_1callback_1state_1t_1function_1set(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2) {
-  input_callback_state_t *arg1 = (input_callback_state_t *) 0 ;
+  input_callback_state *arg1 = (input_callback_state *) 0 ;
   void *arg2 = (void *) 0 ;
   
   (void)jenv;
   (void)jcls;
   (void)jarg1_;
-  arg1 = *(input_callback_state_t **)&jarg1; 
+  arg1 = *(input_callback_state **)&jarg1; 
   arg2 = *(void **)&jarg2; 
   if (arg1) (arg1)->function = arg2;
-  
 }
 
 
 SWIGEXPORT jlong JNICALL Java_org_freeswitch_swig_freeswitchJNI_input_1callback_1state_1t_1function_1get(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
   jlong jresult = 0 ;
-  input_callback_state_t *arg1 = (input_callback_state_t *) 0 ;
+  input_callback_state *arg1 = (input_callback_state *) 0 ;
   void *result = 0 ;
   
   (void)jenv;
   (void)jcls;
   (void)jarg1_;
-  arg1 = *(input_callback_state_t **)&jarg1; 
+  arg1 = *(input_callback_state **)&jarg1; 
   result = (void *) ((arg1)->function);
   *(void **)&jresult = result; 
   return jresult;
@@ -681,28 +690,27 @@ SWIGEXPORT jlong JNICALL Java_org_freeswitch_swig_freeswitchJNI_input_1callback_
 
 
 SWIGEXPORT void JNICALL Java_org_freeswitch_swig_freeswitchJNI_input_1callback_1state_1t_1threadState_1set(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2) {
-  input_callback_state_t *arg1 = (input_callback_state_t *) 0 ;
+  input_callback_state *arg1 = (input_callback_state *) 0 ;
   void *arg2 = (void *) 0 ;
   
   (void)jenv;
   (void)jcls;
   (void)jarg1_;
-  arg1 = *(input_callback_state_t **)&jarg1; 
+  arg1 = *(input_callback_state **)&jarg1; 
   arg2 = *(void **)&jarg2; 
   if (arg1) (arg1)->threadState = arg2;
-  
 }
 
 
 SWIGEXPORT jlong JNICALL Java_org_freeswitch_swig_freeswitchJNI_input_1callback_1state_1t_1threadState_1get(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
   jlong jresult = 0 ;
-  input_callback_state_t *arg1 = (input_callback_state_t *) 0 ;
+  input_callback_state *arg1 = (input_callback_state *) 0 ;
   void *result = 0 ;
   
   (void)jenv;
   (void)jcls;
   (void)jarg1_;
-  arg1 = *(input_callback_state_t **)&jarg1; 
+  arg1 = *(input_callback_state **)&jarg1; 
   result = (void *) ((arg1)->threadState);
   *(void **)&jresult = result; 
   return jresult;
@@ -710,28 +718,27 @@ SWIGEXPORT jlong JNICALL Java_org_freeswitch_swig_freeswitchJNI_input_1callback_
 
 
 SWIGEXPORT void JNICALL Java_org_freeswitch_swig_freeswitchJNI_input_1callback_1state_1t_1extra_1set(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2) {
-  input_callback_state_t *arg1 = (input_callback_state_t *) 0 ;
+  input_callback_state *arg1 = (input_callback_state *) 0 ;
   void *arg2 = (void *) 0 ;
   
   (void)jenv;
   (void)jcls;
   (void)jarg1_;
-  arg1 = *(input_callback_state_t **)&jarg1; 
+  arg1 = *(input_callback_state **)&jarg1; 
   arg2 = *(void **)&jarg2; 
   if (arg1) (arg1)->extra = arg2;
-  
 }
 
 
 SWIGEXPORT jlong JNICALL Java_org_freeswitch_swig_freeswitchJNI_input_1callback_1state_1t_1extra_1get(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
   jlong jresult = 0 ;
-  input_callback_state_t *arg1 = (input_callback_state_t *) 0 ;
+  input_callback_state *arg1 = (input_callback_state *) 0 ;
   void *result = 0 ;
   
   (void)jenv;
   (void)jcls;
   (void)jarg1_;
-  arg1 = *(input_callback_state_t **)&jarg1; 
+  arg1 = *(input_callback_state **)&jarg1; 
   result = (void *) ((arg1)->extra);
   *(void **)&jresult = result; 
   return jresult;
@@ -739,20 +746,20 @@ SWIGEXPORT jlong JNICALL Java_org_freeswitch_swig_freeswitchJNI_input_1callback_
 
 
 SWIGEXPORT void JNICALL Java_org_freeswitch_swig_freeswitchJNI_input_1callback_1state_1t_1funcargs_1set(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jstring jarg2) {
-  input_callback_state_t *arg1 = (input_callback_state_t *) 0 ;
+  input_callback_state *arg1 = (input_callback_state *) 0 ;
   char *arg2 = (char *) 0 ;
   
   (void)jenv;
   (void)jcls;
   (void)jarg1_;
-  arg1 = *(input_callback_state_t **)&jarg1; 
+  arg1 = *(input_callback_state **)&jarg1; 
   arg2 = 0;
   if (jarg2) {
     arg2 = (char *)jenv->GetStringUTFChars(jarg2, 0);
     if (!arg2) return ;
   }
   {
-    if (arg1->funcargs) delete [] arg1->funcargs;
+    delete [] arg1->funcargs;
     if (arg2) {
       arg1->funcargs = (char *) (new char[strlen((const char *)arg2)+1]);
       strcpy((char *)arg1->funcargs, (const char *)arg2);
@@ -766,13 +773,13 @@ SWIGEXPORT void JNICALL Java_org_freeswitch_swig_freeswitchJNI_input_1callback_1
 
 SWIGEXPORT jstring JNICALL Java_org_freeswitch_swig_freeswitchJNI_input_1callback_1state_1t_1funcargs_1get(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
   jstring jresult = 0 ;
-  input_callback_state_t *arg1 = (input_callback_state_t *) 0 ;
+  input_callback_state *arg1 = (input_callback_state *) 0 ;
   char *result = 0 ;
   
   (void)jenv;
   (void)jcls;
   (void)jarg1_;
-  arg1 = *(input_callback_state_t **)&jarg1; 
+  arg1 = *(input_callback_state **)&jarg1; 
   result = (char *) ((arg1)->funcargs);
   if (result) jresult = jenv->NewStringUTF((const char *)result);
   return jresult;
@@ -781,24 +788,23 @@ SWIGEXPORT jstring JNICALL Java_org_freeswitch_swig_freeswitchJNI_input_1callbac
 
 SWIGEXPORT jlong JNICALL Java_org_freeswitch_swig_freeswitchJNI_new_1input_1callback_1state_1t(JNIEnv *jenv, jclass jcls) {
   jlong jresult = 0 ;
-  input_callback_state_t *result = 0 ;
+  input_callback_state *result = 0 ;
   
   (void)jenv;
   (void)jcls;
-  result = (input_callback_state_t *)new input_callback_state_t();
+  result = (input_callback_state *)new input_callback_state();
-  *(input_callback_state_t **)&jresult = result; 
+  *(input_callback_state **)&jresult = result; 
   return jresult;
 }
 
 
 SWIGEXPORT void JNICALL Java_org_freeswitch_swig_freeswitchJNI_delete_1input_1callback_1state_1t(JNIEnv *jenv, jclass jcls, jlong jarg1) {
-  input_callback_state_t *arg1 = (input_callback_state_t *) 0 ;
+  input_callback_state *arg1 = (input_callback_state *) 0 ;
   
   (void)jenv;
   (void)jcls;
-  arg1 = *(input_callback_state_t **)&jarg1; 
+  arg1 = *(input_callback_state **)&jarg1; 
   delete arg1;
-  
 }
 
 
@@ -848,7 +854,6 @@ SWIGEXPORT void JNICALL Java_org_freeswitch_swig_freeswitchJNI_DTMF_1digit_1set(
   arg1 = *(DTMF **)&jarg1; 
   arg2 = (char)jarg2; 
   if (arg1) (arg1)->digit = arg2;
-  
 }
 
 
@@ -883,7 +888,6 @@ SWIGEXPORT void JNICALL Java_org_freeswitch_swig_freeswitchJNI_DTMF_1duration_1s
   }
   arg2 = *argp2; 
   if (arg1) (arg1)->duration = arg2;
-  
 }
 
 
@@ -897,7 +901,7 @@ SWIGEXPORT jlong JNICALL Java_org_freeswitch_swig_freeswitchJNI_DTMF_1duration_1
   (void)jarg1_;
   arg1 = *(DTMF **)&jarg1; 
   result =  ((arg1)->duration);
-  *(uint32_t **)&jresult = new uint32_t((uint32_t &)result); 
+  *(uint32_t **)&jresult = new uint32_t((const uint32_t &)result); 
   return jresult;
 }
 
@@ -906,8 +910,8 @@ SWIGEXPORT jlong JNICALL Java_org_freeswitch_swig_freeswitchJNI_new_1DTMF(JNIEnv
   jlong jresult = 0 ;
   char arg1 ;
   uint32_t arg2 = (uint32_t) SWITCH_DEFAULT_DTMF_DURATION ;
-  DTMF *result = 0 ;
   uint32_t *argp2 ;
+  DTMF *result = 0 ;
   
   (void)jenv;
   (void)jcls;
@@ -931,7 +935,6 @@ SWIGEXPORT void JNICALL Java_org_freeswitch_swig_freeswitchJNI_delete_1DTMF(JNIE
   (void)jcls;
   arg1 = *(DTMF **)&jarg1; 
   delete arg1;
-  
 }
 
 
@@ -968,7 +971,6 @@ SWIGEXPORT void JNICALL Java_org_freeswitch_swig_freeswitchJNI_delete_1Stream(JN
   (void)jcls;
   arg1 = *(Stream **)&jarg1; 
   delete arg1;
-  
 }
 
 
@@ -1052,7 +1054,6 @@ SWIGEXPORT void JNICALL Java_org_freeswitch_swig_freeswitchJNI_Event_1event_1set
   arg1 = *(Event **)&jarg1; 
   arg2 = *(switch_event_t **)&jarg2; 
   if (arg1) (arg1)->event = arg2;
-  
 }
 
 
@@ -1085,7 +1086,7 @@ SWIGEXPORT void JNICALL Java_org_freeswitch_swig_freeswitchJNI_Event_1serialized
     if (!arg2) return ;
   }
   {
-    if (arg1->serialized_string) delete [] arg1->serialized_string;
+    delete [] arg1->serialized_string;
     if (arg2) {
       arg1->serialized_string = (char *) (new char[strlen((const char *)arg2)+1]);
       strcpy((char *)arg1->serialized_string, (const char *)arg2);
@@ -1122,7 +1123,6 @@ SWIGEXPORT void JNICALL Java_org_freeswitch_swig_freeswitchJNI_Event_1mine_1set(
   arg1 = *(Event **)&jarg1; 
   arg2 = (int)jarg2; 
   if (arg1) (arg1)->mine = arg2;
-  
 }
 
 
@@ -1190,7 +1190,6 @@ SWIGEXPORT void JNICALL Java_org_freeswitch_swig_freeswitchJNI_delete_1Event(JNI
   (void)jcls;
   arg1 = *(Event **)&jarg1; 
   delete arg1;
-  
 }
 
 
@@ -1271,8 +1270,8 @@ SWIGEXPORT jboolean JNICALL Java_org_freeswitch_swig_freeswitchJNI_Event_1setPri
   jboolean jresult = 0 ;
   Event *arg1 = (Event *) 0 ;
   switch_priority_t arg2 = (switch_priority_t) SWITCH_PRIORITY_NORMAL ;
-  bool result;
   switch_priority_t *argp2 ;
+  bool result;
   
   (void)jenv;
   (void)jcls;
@@ -1440,7 +1439,6 @@ SWIGEXPORT void JNICALL Java_org_freeswitch_swig_freeswitchJNI_EventConsumer_1ev
   arg1 = *(EventConsumer **)&jarg1; 
   arg2 = *(switch_queue_t **)&jarg2; 
   if (arg1) (arg1)->events = arg2;
-  
 }
 
 
@@ -1475,7 +1473,6 @@ SWIGEXPORT void JNICALL Java_org_freeswitch_swig_freeswitchJNI_EventConsumer_1e_
   }
   arg2 = *argp2; 
   if (arg1) (arg1)->e_event_id = arg2;
-  
 }
 
 
@@ -1489,7 +1486,7 @@ SWIGEXPORT jlong JNICALL Java_org_freeswitch_swig_freeswitchJNI_EventConsumer_1e
   (void)jarg1_;
   arg1 = *(EventConsumer **)&jarg1; 
   result =  ((arg1)->e_event_id);
-  *(switch_event_types_t **)&jresult = new switch_event_types_t((switch_event_types_t &)result); 
+  *(switch_event_types_t **)&jresult = new switch_event_types_t((const switch_event_types_t &)result); 
   return jresult;
 }
 
@@ -1508,7 +1505,7 @@ SWIGEXPORT void JNICALL Java_org_freeswitch_swig_freeswitchJNI_EventConsumer_1e_
     if (!arg2) return ;
   }
   {
-    if (arg1->e_callback) delete [] arg1->e_callback;
+    delete [] arg1->e_callback;
     if (arg2) {
       arg1->e_callback = (char *) (new char[strlen((const char *)arg2)+1]);
       strcpy((char *)arg1->e_callback, (const char *)arg2);
@@ -1549,7 +1546,7 @@ SWIGEXPORT void JNICALL Java_org_freeswitch_swig_freeswitchJNI_EventConsumer_1e_
     if (!arg2) return ;
   }
   {
-    if (arg1->e_subclass_name) delete [] arg1->e_subclass_name;
+    delete [] arg1->e_subclass_name;
     if (arg2) {
       arg1->e_subclass_name = (char *) (new char[strlen((const char *)arg2)+1]);
       strcpy((char *)arg1->e_subclass_name, (const char *)arg2);
@@ -1590,7 +1587,7 @@ SWIGEXPORT void JNICALL Java_org_freeswitch_swig_freeswitchJNI_EventConsumer_1e_
     if (!arg2) return ;
   }
   {
-    if (arg1->e_cb_arg) delete [] arg1->e_cb_arg;
+    delete [] arg1->e_cb_arg;
     if (arg2) {
       arg1->e_cb_arg = (char *) (new char[strlen((const char *)arg2)+1]);
       strcpy((char *)arg1->e_cb_arg, (const char *)arg2);
@@ -1666,7 +1663,6 @@ SWIGEXPORT void JNICALL Java_org_freeswitch_swig_freeswitchJNI_EventConsumer_1no
   }
   arg2 = *argp2; 
   if (arg1) (arg1)->node_index = arg2;
-  
 }
 
 
@@ -1680,7 +1676,7 @@ SWIGEXPORT jlong JNICALL Java_org_freeswitch_swig_freeswitchJNI_EventConsumer_1n
   (void)jarg1_;
   arg1 = *(EventConsumer **)&jarg1; 
   result =  ((arg1)->node_index);
-  *(uint32_t **)&jresult = new uint32_t((uint32_t &)result); 
+  *(uint32_t **)&jresult = new uint32_t((const uint32_t &)result); 
   return jresult;
 }
 
@@ -1720,7 +1716,6 @@ SWIGEXPORT void JNICALL Java_org_freeswitch_swig_freeswitchJNI_delete_1EventCons
   (void)jcls;
   arg1 = *(EventConsumer **)&jarg1; 
   delete arg1;
-  
 }
 
 
@@ -1790,7 +1785,6 @@ SWIGEXPORT void JNICALL Java_org_freeswitch_swig_freeswitchJNI_delete_1CoreSessi
   (void)jcls;
   arg1 = *(CoreSession **)&jarg1; 
   delete arg1;
-  
 }
 
 
@@ -1804,7 +1798,6 @@ SWIGEXPORT void JNICALL Java_org_freeswitch_swig_freeswitchJNI_CoreSession_1sess
   arg1 = *(CoreSession **)&jarg1; 
   arg2 = *(switch_core_session_t **)&jarg2; 
   if (arg1) (arg1)->session = arg2;
-  
 }
 
 
@@ -1833,7 +1826,6 @@ SWIGEXPORT void JNICALL Java_org_freeswitch_swig_freeswitchJNI_CoreSession_1chan
   arg1 = *(CoreSession **)&jarg1; 
   arg2 = *(switch_channel_t **)&jarg2; 
   if (arg1) (arg1)->channel = arg2;
-  
 }
 
 
@@ -1862,7 +1854,6 @@ SWIGEXPORT void JNICALL Java_org_freeswitch_swig_freeswitchJNI_CoreSession_1flag
   arg1 = *(CoreSession **)&jarg1; 
   arg2 = (unsigned int)jarg2; 
   if (arg1) (arg1)->flags = arg2;
-  
 }
 
 
@@ -1891,7 +1882,6 @@ SWIGEXPORT void JNICALL Java_org_freeswitch_swig_freeswitchJNI_CoreSession_1allo
   arg1 = *(CoreSession **)&jarg1; 
   arg2 = (int)jarg2; 
   if (arg1) (arg1)->allocated = arg2;
-  
 }
 
 
@@ -1921,7 +1911,6 @@ SWIGEXPORT void JNICALL Java_org_freeswitch_swig_freeswitchJNI_CoreSession_1cb_1
   arg1 = *(CoreSession **)&jarg1; 
   arg2 = *(input_callback_state **)&jarg2; 
   if (arg1) (arg1)->cb_state = *arg2;
-  
 }
 
 
@@ -1956,7 +1945,6 @@ SWIGEXPORT void JNICALL Java_org_freeswitch_swig_freeswitchJNI_CoreSession_1hook
   }
   arg2 = *argp2; 
   if (arg1) (arg1)->hook_state = arg2;
-  
 }
 
 
@@ -1970,7 +1958,7 @@ SWIGEXPORT jlong JNICALL Java_org_freeswitch_swig_freeswitchJNI_CoreSession_1hoo
   (void)jarg1_;
   arg1 = *(CoreSession **)&jarg1; 
   result =  ((arg1)->hook_state);
-  *(switch_channel_state_t **)&jresult = new switch_channel_state_t((switch_channel_state_t &)result); 
+  *(switch_channel_state_t **)&jresult = new switch_channel_state_t((const switch_channel_state_t &)result); 
   return jresult;
 }
 
@@ -1991,7 +1979,6 @@ SWIGEXPORT void JNICALL Java_org_freeswitch_swig_freeswitchJNI_CoreSession_1caus
   }
   arg2 = *argp2; 
   if (arg1) (arg1)->cause = arg2;
-  
 }
 
 
@@ -2005,7 +1992,7 @@ SWIGEXPORT jlong JNICALL Java_org_freeswitch_swig_freeswitchJNI_CoreSession_1cau
   (void)jarg1_;
   arg1 = *(CoreSession **)&jarg1; 
   result =  ((arg1)->cause);
-  *(switch_call_cause_t **)&jresult = new switch_call_cause_t((switch_call_cause_t &)result); 
+  *(switch_call_cause_t **)&jresult = new switch_call_cause_t((const switch_call_cause_t &)result); 
   return jresult;
 }
 
@@ -2024,7 +2011,7 @@ SWIGEXPORT void JNICALL Java_org_freeswitch_swig_freeswitchJNI_CoreSession_1uuid
     if (!arg2) return ;
   }
   {
-    if (arg1->uuid) delete [] arg1->uuid;
+    delete [] arg1->uuid;
     if (arg2) {
       arg1->uuid = (char *) (new char[strlen((const char *)arg2)+1]);
       strcpy((char *)arg1->uuid, (const char *)arg2);
@@ -2065,7 +2052,7 @@ SWIGEXPORT void JNICALL Java_org_freeswitch_swig_freeswitchJNI_CoreSession_1tts_
     if (!arg2) return ;
   }
   {
-    if (arg1->tts_name) delete [] arg1->tts_name;
+    delete [] arg1->tts_name;
     if (arg2) {
       arg1->tts_name = (char *) (new char[strlen((const char *)arg2)+1]);
       strcpy((char *)arg1->tts_name, (const char *)arg2);
@@ -2106,7 +2093,7 @@ SWIGEXPORT void JNICALL Java_org_freeswitch_swig_freeswitchJNI_CoreSession_1voic
     if (!arg2) return ;
   }
   {
-    if (arg1->voice_name) delete [] arg1->voice_name;
+    delete [] arg1->voice_name;
     if (arg2) {
       arg1->voice_name = (char *) (new char[strlen((const char *)arg2)+1]);
       strcpy((char *)arg1->voice_name, (const char *)arg2);
@@ -2328,7 +2315,7 @@ SWIGEXPORT jlong JNICALL Java_org_freeswitch_swig_freeswitchJNI_CoreSession_1pro
     if (!arg2) return 0;
   }
   result = (arg1)->process_callback_result(arg2);
-  *(switch_status_t **)&jresult = new switch_status_t((switch_status_t &)result); 
+  *(switch_status_t **)&jresult = new switch_status_t((const switch_status_t &)result); 
   if (arg2) jenv->ReleaseStringUTFChars(jarg2, (const char *)arg2);
   return jresult;
 }
@@ -3131,10 +3118,7 @@ SWIGEXPORT jlong JNICALL Java_org_freeswitch_swig_freeswitchJNI_CoreSession_1get
   (void)jcls;
   (void)jarg1_;
   arg1 = *(CoreSession **)&jarg1; 
-  {
+  result = (switch_input_args_t *) &((CoreSession const *)arg1)->get_cb_args();
-    switch_input_args_t const &_result_ref = ((CoreSession const *)arg1)->get_cb_args();
-    result = (switch_input_args_t *) &_result_ref;
-  }
   *(switch_input_args_t **)&jresult = result; 
   return jresult;
 }
@@ -3156,8 +3140,8 @@ SWIGEXPORT jlong JNICALL Java_org_freeswitch_swig_freeswitchJNI_CoreSession_1run
   CoreSession *arg1 = (CoreSession *) 0 ;
   void *arg2 = (void *) 0 ;
   switch_input_type_t arg3 ;
-  switch_status_t result;
   switch_input_type_t *argp3 ;
+  switch_status_t result;
   
   (void)jenv;
   (void)jcls;
@@ -3171,7 +3155,7 @@ SWIGEXPORT jlong JNICALL Java_org_freeswitch_swig_freeswitchJNI_CoreSession_1run
   }
   arg3 = *argp3; 
   result = (arg1)->run_dtmf_callback(arg2,arg3);
-  *(switch_status_t **)&jresult = new switch_status_t((switch_status_t &)result); 
+  *(switch_status_t **)&jresult = new switch_status_t((const switch_status_t &)result); 
   return jresult;
 }
 
@@ -3358,7 +3342,7 @@ SWIGEXPORT jlong JNICALL Java_org_freeswitch_swig_freeswitchJNI_hanguphook(JNIEn
   (void)jcls;
   arg1 = *(switch_core_session_t **)&jarg1; 
   result = hanguphook(arg1);
-  *(switch_status_t **)&jresult = new switch_status_t((switch_status_t &)result); 
+  *(switch_status_t **)&jresult = new switch_status_t((const switch_status_t &)result); 
   return jresult;
 }
 
@@ -3370,8 +3354,8 @@ SWIGEXPORT jlong JNICALL Java_org_freeswitch_swig_freeswitchJNI_dtmf_1callback(J
   switch_input_type_t arg3 ;
   void *arg4 = (void *) 0 ;
   unsigned int arg5 ;
-  switch_status_t result;
   switch_input_type_t *argp3 ;
+  switch_status_t result;
   
   (void)jenv;
   (void)jcls;
@@ -3386,7 +3370,7 @@ SWIGEXPORT jlong JNICALL Java_org_freeswitch_swig_freeswitchJNI_dtmf_1callback(J
   arg4 = *(void **)&jarg4; 
   arg5 = (unsigned int)jarg5; 
   result = dtmf_callback(arg1,arg2,arg3,arg4,arg5);
-  *(switch_status_t **)&jresult = new switch_status_t((switch_status_t &)result); 
+  *(switch_status_t **)&jresult = new switch_status_t((const switch_status_t &)result); 
   return jresult;
 }
 
@@ -3398,7 +3382,6 @@ SWIGEXPORT void JNICALL Java_org_freeswitch_swig_freeswitchJNI_javaVM_1set(JNIEn
   (void)jcls;
   arg1 = *(JavaVM **)&jarg1; 
   javaVM = arg1;
-  
 }
 
 
@@ -3476,7 +3459,6 @@ SWIGEXPORT void JNICALL Java_org_freeswitch_swig_freeswitchJNI_delete_1JavaSessi
   (void)jcls;
   arg1 = *(JavaSession **)&jarg1; 
   delete arg1;
-  
 }
 
 
@@ -3559,8 +3541,8 @@ SWIGEXPORT jlong JNICALL Java_org_freeswitch_swig_freeswitchJNI_JavaSession_1run
   JavaSession *arg1 = (JavaSession *) 0 ;
   void *arg2 = (void *) 0 ;
   switch_input_type_t arg3 ;
-  switch_status_t result;
   switch_input_type_t *argp3 ;
+  switch_status_t result;
   
   (void)jenv;
   (void)jcls;
@@ -3574,7 +3556,7 @@ SWIGEXPORT jlong JNICALL Java_org_freeswitch_swig_freeswitchJNI_JavaSession_1run
   }
   arg3 = *argp3; 
   result = (arg1)->run_dtmf_callback(arg2,arg3);
-  *(switch_status_t **)&jresult = new switch_status_t((switch_status_t &)result); 
+  *(switch_status_t **)&jresult = new switch_status_t((const switch_status_t &)result); 
   return jresult;
 }
 
@@ -3606,7 +3588,7 @@ SWIGEXPORT jint JNICALL Java_org_freeswitch_swig_freeswitchJNI_JavaSession_1orig
 }
 
 
-SWIGEXPORT jlong JNICALL Java_org_freeswitch_swig_freeswitchJNI_SWIGJavaSessionUpcast(JNIEnv *jenv, jclass jcls, jlong jarg1) {
+SWIGEXPORT jlong JNICALL Java_org_freeswitch_swig_freeswitchJNI_JavaSession_1SWIGUpcast(JNIEnv *jenv, jclass jcls, jlong jarg1) {
     jlong baseptr = 0;
     (void)jenv;
     (void)jcls;

src/mod/languages/mod_managed/freeswitch_wrap.cxx

@@ -14160,6 +14160,18 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_switch_core_mime_ext2type(char * jarg1) {
 }
 
 
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_core_mime_type2ext(char * jarg1) {
+  char * jresult ;
+  char *arg1 = (char *) 0 ;
+  char *result = 0 ;
+  
+  arg1 = (char *)jarg1; 
+  result = (char *)switch_core_mime_type2ext((char const *)arg1);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
 SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_mime_add_type(char * jarg1, char * jarg2) {
   int jresult ;
   char *arg1 = (char *) 0 ;
@@ -18618,6 +18630,24 @@ SWIGEXPORT int SWIGSTDCALL CSharp_switch_needs_url_encode(char * jarg1) {
 }
 
 
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_url_encode_opt(char * jarg1, char * jarg2, unsigned long jarg3, int jarg4) {
+  char * jresult ;
+  char *arg1 = (char *) 0 ;
+  char *arg2 = (char *) 0 ;
+  size_t arg3 ;
+  switch_bool_t arg4 ;
+  char *result = 0 ;
+  
+  arg1 = (char *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (size_t)jarg3; 
+  arg4 = (switch_bool_t)jarg4; 
+  result = (char *)switch_url_encode_opt((char const *)arg1,arg2,arg3,arg4);
+  jresult = SWIG_csharp_string_callback((const char *)result); 
+  return jresult;
+}
+
+
 SWIGEXPORT char * SWIGSTDCALL CSharp_switch_url_encode(char * jarg1, char * jarg2, unsigned long jarg3) {
   char * jresult ;
   char *arg1 = (char *) 0 ;
@@ -35067,37 +35097,41 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_change_sln_volume_granular(void * jarg
 }
 
 
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_merge_sln(void * jarg1, unsigned long jarg2, void * jarg3, unsigned long jarg4) {
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_merge_sln(void * jarg1, unsigned long jarg2, void * jarg3, unsigned long jarg4, int jarg5) {
   unsigned long jresult ;
   int16_t *arg1 = (int16_t *) 0 ;
   uint32_t arg2 ;
   int16_t *arg3 = (int16_t *) 0 ;
   uint32_t arg4 ;
+  int arg5 ;
   uint32_t result;
   
   arg1 = (int16_t *)jarg1; 
   arg2 = (uint32_t)jarg2; 
   arg3 = (int16_t *)jarg3; 
   arg4 = (uint32_t)jarg4; 
-  result = (uint32_t)switch_merge_sln(arg1,arg2,arg3,arg4);
+  arg5 = (int)jarg5; 
+  result = (uint32_t)switch_merge_sln(arg1,arg2,arg3,arg4,arg5);
   jresult = (unsigned long)result; 
   return jresult;
 }
 
 
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_unmerge_sln(void * jarg1, unsigned long jarg2, void * jarg3, unsigned long jarg4) {
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_unmerge_sln(void * jarg1, unsigned long jarg2, void * jarg3, unsigned long jarg4, int jarg5) {
   unsigned long jresult ;
   int16_t *arg1 = (int16_t *) 0 ;
   uint32_t arg2 ;
   int16_t *arg3 = (int16_t *) 0 ;
   uint32_t arg4 ;
+  int arg5 ;
   uint32_t result;
   
   arg1 = (int16_t *)jarg1; 
   arg2 = (uint32_t)jarg2; 
   arg3 = (int16_t *)jarg3; 
   arg4 = (uint32_t)jarg4; 
-  result = (uint32_t)switch_unmerge_sln(arg1,arg2,arg3,arg4);
+  arg5 = (int)jarg5; 
+  result = (uint32_t)switch_unmerge_sln(arg1,arg2,arg3,arg4,arg5);
   jresult = (unsigned long)result; 
   return jresult;
 }
@@ -35495,6 +35529,28 @@ SWIGEXPORT int SWIGSTDCALL CSharp_switch_unicast_conninfo_stream_id_get(void * j
 }
 
 
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_unicast_conninfo_thread_set(void * jarg1, void * jarg2) {
+  switch_unicast_conninfo *arg1 = (switch_unicast_conninfo *) 0 ;
+  switch_thread_t *arg2 = (switch_thread_t *) 0 ;
+  
+  arg1 = (switch_unicast_conninfo *)jarg1; 
+  arg2 = (switch_thread_t *)jarg2; 
+  if (arg1) (arg1)->thread = arg2;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_unicast_conninfo_thread_get(void * jarg1) {
+  void * jresult ;
+  switch_unicast_conninfo *arg1 = (switch_unicast_conninfo *) 0 ;
+  switch_thread_t *result = 0 ;
+  
+  arg1 = (switch_unicast_conninfo *)jarg1; 
+  result = (switch_thread_t *) ((arg1)->thread);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
 SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_unicast_conninfo() {
   void * jresult ;
   switch_unicast_conninfo *result = 0 ;

src/mod/languages/mod_managed/managed/swig.cs

@@ -2665,6 +2665,11 @@ public class freeswitch {
     return ret;
   }
 
+  public static string switch_core_mime_type2ext(string type) {
+    string ret = freeswitchPINVOKE.switch_core_mime_type2ext(type);
+    return ret;
+  }
+
   public static switch_status_t switch_core_mime_add_type(string type, string ext) {
     switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_core_mime_add_type(type, ext);
     return ret;
@@ -3948,6 +3953,11 @@ public class freeswitch {
     return ret;
   }
 
+  public static string switch_url_encode_opt(string url, string buf, uint len, switch_bool_t double_encode) {
+    string ret = freeswitchPINVOKE.switch_url_encode_opt(url, buf, len, (int)double_encode);
+    return ret;
+  }
+
   public static string switch_url_encode(string url, string buf, uint len) {
     string ret = freeswitchPINVOKE.switch_url_encode(url, buf, len);
     return ret;
@@ -5344,13 +5354,13 @@ public class freeswitch {
     freeswitchPINVOKE.switch_change_sln_volume_granular(SWIGTYPE_p_short.getCPtr(data), samples, vol);
   }
 
-  public static uint switch_merge_sln(SWIGTYPE_p_short data, uint samples, SWIGTYPE_p_short other_data, uint other_samples) {
+  public static uint switch_merge_sln(SWIGTYPE_p_short data, uint samples, SWIGTYPE_p_short other_data, uint other_samples, int channels) {
-    uint ret = freeswitchPINVOKE.switch_merge_sln(SWIGTYPE_p_short.getCPtr(data), samples, SWIGTYPE_p_short.getCPtr(other_data), other_samples);
+    uint ret = freeswitchPINVOKE.switch_merge_sln(SWIGTYPE_p_short.getCPtr(data), samples, SWIGTYPE_p_short.getCPtr(other_data), other_samples, channels);
     return ret;
   }
 
-  public static uint switch_unmerge_sln(SWIGTYPE_p_short data, uint samples, SWIGTYPE_p_short other_data, uint other_samples) {
+  public static uint switch_unmerge_sln(SWIGTYPE_p_short data, uint samples, SWIGTYPE_p_short other_data, uint other_samples, int channels) {
-    uint ret = freeswitchPINVOKE.switch_unmerge_sln(SWIGTYPE_p_short.getCPtr(data), samples, SWIGTYPE_p_short.getCPtr(other_data), other_samples);
+    uint ret = freeswitchPINVOKE.switch_unmerge_sln(SWIGTYPE_p_short.getCPtr(data), samples, SWIGTYPE_p_short.getCPtr(other_data), other_samples, channels);
     return ret;
   }
 
@@ -10886,6 +10896,9 @@ class freeswitchPINVOKE {
   [DllImport("mod_managed", EntryPoint="CSharp_switch_core_mime_ext2type")]
   public static extern string switch_core_mime_ext2type(string jarg1);
 
+  [DllImport("mod_managed", EntryPoint="CSharp_switch_core_mime_type2ext")]
+  public static extern string switch_core_mime_type2ext(string jarg1);
+
   [DllImport("mod_managed", EntryPoint="CSharp_switch_core_mime_add_type")]
   public static extern int switch_core_mime_add_type(string jarg1, string jarg2);
 
@@ -11918,6 +11931,9 @@ class freeswitchPINVOKE {
   [DllImport("mod_managed", EntryPoint="CSharp_switch_needs_url_encode")]
   public static extern int switch_needs_url_encode(string jarg1);
 
+  [DllImport("mod_managed", EntryPoint="CSharp_switch_url_encode_opt")]
+  public static extern string switch_url_encode_opt(string jarg1, string jarg2, uint jarg3, int jarg4);
+
   [DllImport("mod_managed", EntryPoint="CSharp_switch_url_encode")]
   public static extern string switch_url_encode(string jarg1, string jarg2, uint jarg3);
 
@@ -15981,10 +15997,10 @@ class freeswitchPINVOKE {
   public static extern void switch_change_sln_volume_granular(HandleRef jarg1, uint jarg2, int jarg3);
 
   [DllImport("mod_managed", EntryPoint="CSharp_switch_merge_sln")]
-  public static extern uint switch_merge_sln(HandleRef jarg1, uint jarg2, HandleRef jarg3, uint jarg4);
+  public static extern uint switch_merge_sln(HandleRef jarg1, uint jarg2, HandleRef jarg3, uint jarg4, int jarg5);
 
   [DllImport("mod_managed", EntryPoint="CSharp_switch_unmerge_sln")]
-  public static extern uint switch_unmerge_sln(HandleRef jarg1, uint jarg2, HandleRef jarg3, uint jarg4);
+  public static extern uint switch_unmerge_sln(HandleRef jarg1, uint jarg2, HandleRef jarg3, uint jarg4, int jarg5);
 
   [DllImport("mod_managed", EntryPoint="CSharp_switch_mux_channels")]
   public static extern void switch_mux_channels(HandleRef jarg1, HandleRef jarg2, uint jarg3, uint jarg4);
@@ -16085,6 +16101,12 @@ class freeswitchPINVOKE {
   [DllImport("mod_managed", EntryPoint="CSharp_switch_unicast_conninfo_stream_id_get")]
   public static extern int switch_unicast_conninfo_stream_id_get(HandleRef jarg1);
 
+  [DllImport("mod_managed", EntryPoint="CSharp_switch_unicast_conninfo_thread_set")]
+  public static extern void switch_unicast_conninfo_thread_set(HandleRef jarg1, HandleRef jarg2);
+
+  [DllImport("mod_managed", EntryPoint="CSharp_switch_unicast_conninfo_thread_get")]
+  public static extern IntPtr switch_unicast_conninfo_thread_get(HandleRef jarg1);
+
   [DllImport("mod_managed", EntryPoint="CSharp_new_switch_unicast_conninfo")]
   public static extern IntPtr new_switch_unicast_conninfo();
 
@@ -24893,6 +24915,36 @@ namespace FreeSWITCH.Native {
 using System;
 using System.Runtime.InteropServices;
 
+public class SWIGTYPE_p_switch_thread_t {
+  private HandleRef swigCPtr;
+
+  internal SWIGTYPE_p_switch_thread_t(IntPtr cPtr, bool futureUse) {
+    swigCPtr = new HandleRef(this, cPtr);
+  }
+
+  protected SWIGTYPE_p_switch_thread_t() {
+    swigCPtr = new HandleRef(null, IntPtr.Zero);
+  }
+
+  internal static HandleRef getCPtr(SWIGTYPE_p_switch_thread_t obj) {
+    return (obj == null) ? new HandleRef(null, IntPtr.Zero) : obj.swigCPtr;
+  }
+}
+
+}
+/* ----------------------------------------------------------------------------
+ * This file was automatically generated by SWIG (http://www.swig.org).
+ * Version 2.0.12
+ *
+ * Do not make changes to this file unless you know what you are doing--modify
+ * the SWIG interface file instead.
+ * ----------------------------------------------------------------------------- */
+
+namespace FreeSWITCH.Native {
+
+using System;
+using System.Runtime.InteropServices;
+
 public class SWIGTYPE_p_switch_time_exp_t {
   private HandleRef swigCPtr;
 
@@ -40476,6 +40528,17 @@ public class switch_unicast_conninfo : IDisposable {
     } 
   }
 
+  public SWIGTYPE_p_switch_thread_t thread {
+    set {
+      freeswitchPINVOKE.switch_unicast_conninfo_thread_set(swigCPtr, SWIGTYPE_p_switch_thread_t.getCPtr(value));
+    } 
+    get {
+      IntPtr cPtr = freeswitchPINVOKE.switch_unicast_conninfo_thread_get(swigCPtr);
+      SWIGTYPE_p_switch_thread_t ret = (cPtr == IntPtr.Zero) ? null : new SWIGTYPE_p_switch_thread_t(cPtr, false);
+      return ret;
+    } 
+  }
+
   public switch_unicast_conninfo() : this(freeswitchPINVOKE.new_switch_unicast_conninfo(), true) {
   }
 

src/mod/languages/mod_perl/freeswitch.pm

@@ -1,11 +1,12 @@
 # This file was automatically generated by SWIG (http://www.swig.org).
-# Version 1.3.35
+# Version 2.0.12
 #
-# Don't modify this file, modify the SWIG interface instead.
+# Do not make changes to this file unless you know what you are doing--modify
+# the SWIG interface file instead.
 
 package freeswitch;
-require Exporter;
+use base qw(Exporter);
-@ISA = qw(Exporter);
+package freeswitchc;
 package freeswitchc;
 boot_freeswitch();
 package freeswitch;

src/mod/languages/mod_python/freeswitch.py

@@ -1,12 +1,35 @@
 # This file was automatically generated by SWIG (http://www.swig.org).
-# Version 1.3.35
+# Version 2.0.12
 #
-# Don't modify this file, modify the SWIG interface instead.
+# Do not make changes to this file unless you know what you are doing--modify
-# This file is compatible with both classic and new-style classes.
+# the SWIG interface file instead.
 
+
+
+
+
+from sys import version_info
+if version_info >= (2,6,0):
+    def swig_import_helper():
+        from os.path import dirname
+        import imp
+        fp = None
+        try:
+            fp, pathname, description = imp.find_module('_freeswitch', [dirname(__file__)])
+        except ImportError:
             import _freeswitch
-import new
+            return _freeswitch
-new_instancemethod = new.instancemethod
+        if fp is not None:
+            try:
+                _mod = imp.load_module('_freeswitch', fp, pathname, description)
+            finally:
+                fp.close()
+            return _mod
+    _freeswitch = swig_import_helper()
+    del swig_import_helper
+else:
+    import _freeswitch
+del version_info
 try:
     _swig_property = property
 except NameError:
@@ -14,12 +37,12 @@ except NameError:
 def _swig_setattr_nondynamic(self,class_type,name,value,static=1):
     if (name == "thisown"): return self.this.own(value)
     if (name == "this"):
-        if type(value).__name__ == 'PySwigObject':
+        if type(value).__name__ == 'SwigPyObject':
             self.__dict__[name] = value
             return
     method = class_type.__swig_setmethods__.get(name,None)
     if method: return method(self,value)
-    if (not static) or hasattr(self,name):
+    if (not static):
         self.__dict__[name] = value
     else:
         raise AttributeError("You cannot add attributes to %s" % self)
@@ -31,29 +54,48 @@ def _swig_getattr(self,class_type,name):
     if (name == "thisown"): return self.this.own()
     method = class_type.__swig_getmethods__.get(name,None)
     if method: return method(self)
-    raise AttributeError,name
+    raise AttributeError(name)
 
 def _swig_repr(self):
     try: strthis = "proxy of " + self.this.__repr__()
     except: strthis = ""
     return "<%s.%s; %s >" % (self.__class__.__module__, self.__class__.__name__, strthis,)
 
-import types
 try:
-    _object = types.ObjectType
+    _object = object
     _newclass = 1
 except AttributeError:
     class _object : pass
     _newclass = 0
-del types
 
 
+
+def setGlobalVariable(*args):
+  return _freeswitch.setGlobalVariable(*args)
 setGlobalVariable = _freeswitch.setGlobalVariable
+
+def getGlobalVariable(*args):
+  return _freeswitch.getGlobalVariable(*args)
 getGlobalVariable = _freeswitch.getGlobalVariable
+
+def consoleLog(*args):
+  return _freeswitch.consoleLog(*args)
 consoleLog = _freeswitch.consoleLog
+
+def consoleLog2(*args):
+  return _freeswitch.consoleLog2(*args)
 consoleLog2 = _freeswitch.consoleLog2
+
+def consoleCleanLog(*args):
+  return _freeswitch.consoleCleanLog(*args)
 consoleCleanLog = _freeswitch.consoleCleanLog
+
+def running():
+  return _freeswitch.running()
 running = _freeswitch.running
+
+def email(*args):
+  return _freeswitch.email(*args)
 email = _freeswitch.email
 class IVRMenu(_object):
     __swig_setmethods__ = {}
@@ -67,8 +109,8 @@ class IVRMenu(_object):
         except: self.this = this
     __swig_destroy__ = _freeswitch.delete_IVRMenu
     __del__ = lambda self : None;
-    def bindAction(*args): return _freeswitch.IVRMenu_bindAction(*args)
+    def bindAction(self, *args): return _freeswitch.IVRMenu_bindAction(self, *args)
-    def execute(*args): return _freeswitch.IVRMenu_execute(*args)
+    def execute(self, *args): return _freeswitch.IVRMenu_execute(self, *args)
 IVRMenu_swigregister = _freeswitch.IVRMenu_swigregister
 IVRMenu_swigregister(IVRMenu)
 
@@ -78,15 +120,15 @@ class API(_object):
     __swig_getmethods__ = {}
     __getattr__ = lambda self, name: _swig_getattr(self, API, name)
     __repr__ = _swig_repr
-    def __init__(self, *args): 
+    def __init__(self, s=None): 
-        this = _freeswitch.new_API(*args)
+        this = _freeswitch.new_API(s)
         try: self.this.append(this)
         except: self.this = this
     __swig_destroy__ = _freeswitch.delete_API
     __del__ = lambda self : None;
-    def execute(*args): return _freeswitch.API_execute(*args)
+    def execute(self, *args): return _freeswitch.API_execute(self, *args)
-    def executeString(*args): return _freeswitch.API_executeString(*args)
+    def executeString(self, *args): return _freeswitch.API_executeString(self, *args)
-    def getTime(*args): return _freeswitch.API_getTime(*args)
+    def getTime(self): return _freeswitch.API_getTime(self)
 API_swigregister = _freeswitch.API_swigregister
 API_swigregister(API)
 
@@ -108,8 +150,8 @@ class input_callback_state_t(_object):
     __swig_setmethods__["funcargs"] = _freeswitch.input_callback_state_t_funcargs_set
     __swig_getmethods__["funcargs"] = _freeswitch.input_callback_state_t_funcargs_get
     if _newclass:funcargs = _swig_property(_freeswitch.input_callback_state_t_funcargs_get, _freeswitch.input_callback_state_t_funcargs_set)
-    def __init__(self, *args): 
+    def __init__(self): 
-        this = _freeswitch.new_input_callback_state_t(*args)
+        this = _freeswitch.new_input_callback_state_t()
         try: self.this.append(this)
         except: self.this = this
     __swig_destroy__ = _freeswitch.delete_input_callback_state_t
@@ -153,10 +195,10 @@ class Stream(_object):
         except: self.this = this
     __swig_destroy__ = _freeswitch.delete_Stream
     __del__ = lambda self : None;
-    def read(*args): return _freeswitch.Stream_read(*args)
+    def read(self, *args): return _freeswitch.Stream_read(self, *args)
-    def write(*args): return _freeswitch.Stream_write(*args)
+    def write(self, *args): return _freeswitch.Stream_write(self, *args)
-    def raw_write(*args): return _freeswitch.Stream_raw_write(*args)
+    def raw_write(self, *args): return _freeswitch.Stream_raw_write(self, *args)
-    def get_data(*args): return _freeswitch.Stream_get_data(*args)
+    def get_data(self): return _freeswitch.Stream_get_data(self)
 Stream_swigregister = _freeswitch.Stream_swigregister
 Stream_swigregister(Stream)
 
@@ -181,17 +223,17 @@ class Event(_object):
         except: self.this = this
     __swig_destroy__ = _freeswitch.delete_Event
     __del__ = lambda self : None;
-    def chat_execute(*args): return _freeswitch.Event_chat_execute(*args)
+    def chat_execute(self, *args): return _freeswitch.Event_chat_execute(self, *args)
-    def chat_send(*args): return _freeswitch.Event_chat_send(*args)
+    def chat_send(self, dest_proto=None): return _freeswitch.Event_chat_send(self, dest_proto)
-    def serialize(*args): return _freeswitch.Event_serialize(*args)
+    def serialize(self, format=None): return _freeswitch.Event_serialize(self, format)
-    def setPriority(*args): return _freeswitch.Event_setPriority(*args)
+    def setPriority(self, *args): return _freeswitch.Event_setPriority(self, *args)
-    def getHeader(*args): return _freeswitch.Event_getHeader(*args)
+    def getHeader(self, *args): return _freeswitch.Event_getHeader(self, *args)
-    def getBody(*args): return _freeswitch.Event_getBody(*args)
+    def getBody(self): return _freeswitch.Event_getBody(self)
-    def getType(*args): return _freeswitch.Event_getType(*args)
+    def getType(self): return _freeswitch.Event_getType(self)
-    def addBody(*args): return _freeswitch.Event_addBody(*args)
+    def addBody(self, *args): return _freeswitch.Event_addBody(self, *args)
-    def addHeader(*args): return _freeswitch.Event_addHeader(*args)
+    def addHeader(self, *args): return _freeswitch.Event_addHeader(self, *args)
-    def delHeader(*args): return _freeswitch.Event_delHeader(*args)
+    def delHeader(self, *args): return _freeswitch.Event_delHeader(self, *args)
-    def fire(*args): return _freeswitch.Event_fire(*args)
+    def fire(self): return _freeswitch.Event_fire(self)
 Event_swigregister = _freeswitch.Event_swigregister
 Event_swigregister(Event)
 
@@ -222,15 +264,15 @@ class EventConsumer(_object):
     __swig_setmethods__["node_index"] = _freeswitch.EventConsumer_node_index_set
     __swig_getmethods__["node_index"] = _freeswitch.EventConsumer_node_index_get
     if _newclass:node_index = _swig_property(_freeswitch.EventConsumer_node_index_get, _freeswitch.EventConsumer_node_index_set)
-    def __init__(self, *args): 
+    def __init__(self, event_name=None, subclass_name="", len=5000): 
-        this = _freeswitch.new_EventConsumer(*args)
+        this = _freeswitch.new_EventConsumer(event_name, subclass_name, len)
         try: self.this.append(this)
         except: self.this = this
     __swig_destroy__ = _freeswitch.delete_EventConsumer
     __del__ = lambda self : None;
-    def bind(*args): return _freeswitch.EventConsumer_bind(*args)
+    def bind(self, *args): return _freeswitch.EventConsumer_bind(self, *args)
-    def pop(*args): return _freeswitch.EventConsumer_pop(*args)
+    def pop(self, block=0, timeout=0): return _freeswitch.EventConsumer_pop(self, block, timeout)
-    def cleanup(*args): return _freeswitch.EventConsumer_cleanup(*args)
+    def cleanup(self): return _freeswitch.EventConsumer_cleanup(self)
 EventConsumer_swigregister = _freeswitch.EventConsumer_swigregister
 EventConsumer_swigregister(EventConsumer)
 
@@ -239,7 +281,7 @@ class CoreSession(_object):
     __setattr__ = lambda self, name, value: _swig_setattr(self, CoreSession, name, value)
     __swig_getmethods__ = {}
     __getattr__ = lambda self, name: _swig_getattr(self, CoreSession, name)
-    def __init__(self, *args, **kwargs): raise AttributeError, "No constructor defined"
+    def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined - class is abstract")
     __repr__ = _swig_repr
     __swig_destroy__ = _freeswitch.delete_CoreSession
     __del__ = lambda self : None;
@@ -273,64 +315,85 @@ class CoreSession(_object):
     __swig_setmethods__["voice_name"] = _freeswitch.CoreSession_voice_name_set
     __swig_getmethods__["voice_name"] = _freeswitch.CoreSession_voice_name_get
     if _newclass:voice_name = _swig_property(_freeswitch.CoreSession_voice_name_get, _freeswitch.CoreSession_voice_name_set)
-    def insertFile(*args): return _freeswitch.CoreSession_insertFile(*args)
+    def insertFile(self, *args): return _freeswitch.CoreSession_insertFile(self, *args)
-    def answer(*args): return _freeswitch.CoreSession_answer(*args)
+    def answer(self): return _freeswitch.CoreSession_answer(self)
-    def preAnswer(*args): return _freeswitch.CoreSession_preAnswer(*args)
+    def preAnswer(self): return _freeswitch.CoreSession_preAnswer(self)
-    def hangup(*args): return _freeswitch.CoreSession_hangup(*args)
+    def hangup(self, cause="normal_clearing"): return _freeswitch.CoreSession_hangup(self, cause)
-    def hangupState(*args): return _freeswitch.CoreSession_hangupState(*args)
+    def hangupState(self): return _freeswitch.CoreSession_hangupState(self)
-    def setVariable(*args): return _freeswitch.CoreSession_setVariable(*args)
+    def setVariable(self, *args): return _freeswitch.CoreSession_setVariable(self, *args)
-    def setPrivate(*args): return _freeswitch.CoreSession_setPrivate(*args)
+    def setPrivate(self, *args): return _freeswitch.CoreSession_setPrivate(self, *args)
-    def getPrivate(*args): return _freeswitch.CoreSession_getPrivate(*args)
+    def getPrivate(self, *args): return _freeswitch.CoreSession_getPrivate(self, *args)
-    def getVariable(*args): return _freeswitch.CoreSession_getVariable(*args)
+    def getVariable(self, *args): return _freeswitch.CoreSession_getVariable(self, *args)
-    def process_callback_result(*args): return _freeswitch.CoreSession_process_callback_result(*args)
+    def process_callback_result(self, *args): return _freeswitch.CoreSession_process_callback_result(self, *args)
-    def say(*args): return _freeswitch.CoreSession_say(*args)
+    def say(self, *args): return _freeswitch.CoreSession_say(self, *args)
-    def sayPhrase(*args): return _freeswitch.CoreSession_sayPhrase(*args)
+    def sayPhrase(self, *args): return _freeswitch.CoreSession_sayPhrase(self, *args)
-    def hangupCause(*args): return _freeswitch.CoreSession_hangupCause(*args)
+    def hangupCause(self): return _freeswitch.CoreSession_hangupCause(self)
-    def getState(*args): return _freeswitch.CoreSession_getState(*args)
+    def getState(self): return _freeswitch.CoreSession_getState(self)
-    def recordFile(*args): return _freeswitch.CoreSession_recordFile(*args)
+    def recordFile(self, *args): return _freeswitch.CoreSession_recordFile(self, *args)
-    def originate(*args): return _freeswitch.CoreSession_originate(*args)
+    def originate(self, *args): return _freeswitch.CoreSession_originate(self, *args)
-    def destroy(*args): return _freeswitch.CoreSession_destroy(*args)
+    def destroy(self): return _freeswitch.CoreSession_destroy(self)
-    def setDTMFCallback(*args): return _freeswitch.CoreSession_setDTMFCallback(*args)
+    def setDTMFCallback(self, *args): return _freeswitch.CoreSession_setDTMFCallback(self, *args)
-    def speak(*args): return _freeswitch.CoreSession_speak(*args)
+    def speak(self, *args): return _freeswitch.CoreSession_speak(self, *args)
-    def set_tts_parms(*args): return _freeswitch.CoreSession_set_tts_parms(*args)
+    def set_tts_parms(self, *args): return _freeswitch.CoreSession_set_tts_parms(self, *args)
-    def set_tts_params(*args): return _freeswitch.CoreSession_set_tts_params(*args)
+    def set_tts_params(self, *args): return _freeswitch.CoreSession_set_tts_params(self, *args)
-    def collectDigits(*args): return _freeswitch.CoreSession_collectDigits(*args)
+    def collectDigits(self, *args): return _freeswitch.CoreSession_collectDigits(self, *args)
-    def getDigits(*args): return _freeswitch.CoreSession_getDigits(*args)
+    def getDigits(self, *args): return _freeswitch.CoreSession_getDigits(self, *args)
-    def transfer(*args): return _freeswitch.CoreSession_transfer(*args)
+    def transfer(self, *args): return _freeswitch.CoreSession_transfer(self, *args)
-    def read(*args): return _freeswitch.CoreSession_read(*args)
+    def read(self, *args): return _freeswitch.CoreSession_read(self, *args)
-    def playAndGetDigits(*args): return _freeswitch.CoreSession_playAndGetDigits(*args)
+    def playAndGetDigits(self, *args): return _freeswitch.CoreSession_playAndGetDigits(self, *args)
-    def streamFile(*args): return _freeswitch.CoreSession_streamFile(*args)
+    def streamFile(self, *args): return _freeswitch.CoreSession_streamFile(self, *args)
-    def sleep(*args): return _freeswitch.CoreSession_sleep(*args)
+    def sleep(self, *args): return _freeswitch.CoreSession_sleep(self, *args)
-    def flushEvents(*args): return _freeswitch.CoreSession_flushEvents(*args)
+    def flushEvents(self): return _freeswitch.CoreSession_flushEvents(self)
-    def flushDigits(*args): return _freeswitch.CoreSession_flushDigits(*args)
+    def flushDigits(self): return _freeswitch.CoreSession_flushDigits(self)
-    def setAutoHangup(*args): return _freeswitch.CoreSession_setAutoHangup(*args)
+    def setAutoHangup(self, *args): return _freeswitch.CoreSession_setAutoHangup(self, *args)
-    def setHangupHook(*args): return _freeswitch.CoreSession_setHangupHook(*args)
+    def setHangupHook(self, *args): return _freeswitch.CoreSession_setHangupHook(self, *args)
-    def ready(*args): return _freeswitch.CoreSession_ready(*args)
+    def ready(self): return _freeswitch.CoreSession_ready(self)
-    def bridged(*args): return _freeswitch.CoreSession_bridged(*args)
+    def bridged(self): return _freeswitch.CoreSession_bridged(self)
-    def answered(*args): return _freeswitch.CoreSession_answered(*args)
+    def answered(self): return _freeswitch.CoreSession_answered(self)
-    def mediaReady(*args): return _freeswitch.CoreSession_mediaReady(*args)
+    def mediaReady(self): return _freeswitch.CoreSession_mediaReady(self)
-    def waitForAnswer(*args): return _freeswitch.CoreSession_waitForAnswer(*args)
+    def waitForAnswer(self, *args): return _freeswitch.CoreSession_waitForAnswer(self, *args)
-    def execute(*args): return _freeswitch.CoreSession_execute(*args)
+    def execute(self, *args): return _freeswitch.CoreSession_execute(self, *args)
-    def sendEvent(*args): return _freeswitch.CoreSession_sendEvent(*args)
+    def sendEvent(self, *args): return _freeswitch.CoreSession_sendEvent(self, *args)
-    def setEventData(*args): return _freeswitch.CoreSession_setEventData(*args)
+    def setEventData(self, *args): return _freeswitch.CoreSession_setEventData(self, *args)
-    def getXMLCDR(*args): return _freeswitch.CoreSession_getXMLCDR(*args)
+    def getXMLCDR(self): return _freeswitch.CoreSession_getXMLCDR(self)
-    def begin_allow_threads(*args): return _freeswitch.CoreSession_begin_allow_threads(*args)
+    def begin_allow_threads(self): return _freeswitch.CoreSession_begin_allow_threads(self)
-    def end_allow_threads(*args): return _freeswitch.CoreSession_end_allow_threads(*args)
+    def end_allow_threads(self): return _freeswitch.CoreSession_end_allow_threads(self)
-    def get_uuid(*args): return _freeswitch.CoreSession_get_uuid(*args)
+    def get_uuid(self): return _freeswitch.CoreSession_get_uuid(self)
-    def get_cb_args(*args): return _freeswitch.CoreSession_get_cb_args(*args)
+    def get_cb_args(self): return _freeswitch.CoreSession_get_cb_args(self)
-    def check_hangup_hook(*args): return _freeswitch.CoreSession_check_hangup_hook(*args)
+    def check_hangup_hook(self): return _freeswitch.CoreSession_check_hangup_hook(self)
-    def run_dtmf_callback(*args): return _freeswitch.CoreSession_run_dtmf_callback(*args)
+    def run_dtmf_callback(self, *args): return _freeswitch.CoreSession_run_dtmf_callback(self, *args)
-    def consoleLog(*args): return _freeswitch.CoreSession_consoleLog(*args)
+    def consoleLog(self, *args): return _freeswitch.CoreSession_consoleLog(self, *args)
-    def consoleLog2(*args): return _freeswitch.CoreSession_consoleLog2(*args)
+    def consoleLog2(self, *args): return _freeswitch.CoreSession_consoleLog2(self, *args)
 CoreSession_swigregister = _freeswitch.CoreSession_swigregister
 CoreSession_swigregister(CoreSession)
 
+
+def console_log(*args):
+  return _freeswitch.console_log(*args)
 console_log = _freeswitch.console_log
+
+def console_log2(*args):
+  return _freeswitch.console_log2(*args)
 console_log2 = _freeswitch.console_log2
+
+def console_clean_log(*args):
+  return _freeswitch.console_clean_log(*args)
 console_clean_log = _freeswitch.console_clean_log
+
+def msleep(*args):
+  return _freeswitch.msleep(*args)
 msleep = _freeswitch.msleep
+
+def bridge(*args):
+  return _freeswitch.bridge(*args)
 bridge = _freeswitch.bridge
+
+def hanguphook(*args):
+  return _freeswitch.hanguphook(*args)
 hanguphook = _freeswitch.hanguphook
+
+def dtmf_callback(*args):
+  return _freeswitch.dtmf_callback(*args)
 dtmf_callback = _freeswitch.dtmf_callback
 class Session(CoreSession):
     __swig_setmethods__ = {}
@@ -346,15 +409,15 @@ class Session(CoreSession):
         except: self.this = this
     __swig_destroy__ = _freeswitch.delete_Session
     __del__ = lambda self : None;
-    def begin_allow_threads(*args): return _freeswitch.Session_begin_allow_threads(*args)
+    def begin_allow_threads(self): return _freeswitch.Session_begin_allow_threads(self)
-    def end_allow_threads(*args): return _freeswitch.Session_end_allow_threads(*args)
+    def end_allow_threads(self): return _freeswitch.Session_end_allow_threads(self)
-    def check_hangup_hook(*args): return _freeswitch.Session_check_hangup_hook(*args)
+    def check_hangup_hook(self): return _freeswitch.Session_check_hangup_hook(self)
-    def destroy(*args): return _freeswitch.Session_destroy(*args)
+    def destroy(self): return _freeswitch.Session_destroy(self)
-    def run_dtmf_callback(*args): return _freeswitch.Session_run_dtmf_callback(*args)
+    def run_dtmf_callback(self, *args): return _freeswitch.Session_run_dtmf_callback(self, *args)
-    def setInputCallback(*args): return _freeswitch.Session_setInputCallback(*args)
+    def setInputCallback(self, *args): return _freeswitch.Session_setInputCallback(self, *args)
-    def unsetInputCallback(*args): return _freeswitch.Session_unsetInputCallback(*args)
+    def unsetInputCallback(self): return _freeswitch.Session_unsetInputCallback(self)
-    def setHangupHook(*args): return _freeswitch.Session_setHangupHook(*args)
+    def setHangupHook(self, *args): return _freeswitch.Session_setHangupHook(self, *args)
-    def ready(*args): return _freeswitch.Session_ready(*args)
+    def ready(self): return _freeswitch.Session_ready(self)
     __swig_setmethods__["cb_function"] = _freeswitch.Session_cb_function_set
     __swig_getmethods__["cb_function"] = _freeswitch.Session_cb_function_get
     if _newclass:cb_function = _swig_property(_freeswitch.Session_cb_function_get, _freeswitch.Session_cb_function_set)
@@ -367,10 +430,11 @@ class Session(CoreSession):
     __swig_setmethods__["hangup_func_arg"] = _freeswitch.Session_hangup_func_arg_set
     __swig_getmethods__["hangup_func_arg"] = _freeswitch.Session_hangup_func_arg_get
     if _newclass:hangup_func_arg = _swig_property(_freeswitch.Session_hangup_func_arg_get, _freeswitch.Session_hangup_func_arg_set)
-    def setPython(*args): return _freeswitch.Session_setPython(*args)
+    def setPython(self, *args): return _freeswitch.Session_setPython(self, *args)
-    def setSelf(*args): return _freeswitch.Session_setSelf(*args)
+    def setSelf(self, *args): return _freeswitch.Session_setSelf(self, *args)
 Session_swigregister = _freeswitch.Session_swigregister
 Session_swigregister(Session)
 
+# This file is compatible with both classic and new-style classes.