swigall

2026-07-23 04:31:50 +00:00 · 2015-06-16 11:23:25 -05:00
parent b51e988ed5
commit 34f5994aa2
39 changed files with 6196 additions and 4813 deletions
@@ -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,11 +26,13 @@ public class API {
  }

  public synchronized void delete() {
-    if(swigCPtr != 0 && swigCMemOwn) {
-      swigCMemOwn = false;
-      freeswitchJNI.delete_API(swigCPtr);
+    if (swigCPtr != 0) {
+      if (swigCMemOwn) {
+        swigCMemOwn = false;
+        freeswitchJNI.delete_API(swigCPtr);
+      }
+      swigCPtr = 0;
    }
-    swigCPtr = 0;
  }

  public API(CoreSession s) {
@@ -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,11 +26,13 @@ public class CoreSession {
  }

  public synchronized void delete() {
-    if(swigCPtr != 0 && swigCMemOwn) {
-      swigCMemOwn = false;
-      freeswitchJNI.delete_CoreSession(swigCPtr);
+    if (swigCPtr != 0) {
+      if (swigCMemOwn) {
+        swigCMemOwn = false;
+        freeswitchJNI.delete_CoreSession(swigCPtr);
+      }
+      swigCPtr = 0;
    }
-    swigCPtr = 0;
  }

  public void setSession(SWIGTYPE_p_switch_core_session_t value) {
@@ -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,11 +26,13 @@ public class DTMF {
  }

  public synchronized void delete() {
-    if(swigCPtr != 0 && swigCMemOwn) {
-      swigCMemOwn = false;
-      freeswitchJNI.delete_DTMF(swigCPtr);
+    if (swigCPtr != 0) {
+      if (swigCMemOwn) {
+        swigCMemOwn = false;
+        freeswitchJNI.delete_DTMF(swigCPtr);
+      }
+      swigCPtr = 0;
    }
-    swigCPtr = 0;
  }

  public void setDigit(char value) {
@@ -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,11 +26,13 @@ public class Event {
  }

  public synchronized void delete() {
-    if(swigCPtr != 0 && swigCMemOwn) {
-      swigCMemOwn = false;
-      freeswitchJNI.delete_Event(swigCPtr);
+    if (swigCPtr != 0) {
+      if (swigCMemOwn) {
+        swigCMemOwn = false;
+        freeswitchJNI.delete_Event(swigCPtr);
+      }
+      swigCPtr = 0;
    }
-    swigCPtr = 0;
  }

  public void setEvent(SWIGTYPE_p_switch_event_t value) {
@@ -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,11 +26,13 @@ public class EventConsumer {
  }

  public synchronized void delete() {
-    if(swigCPtr != 0 && swigCMemOwn) {
-      swigCMemOwn = false;
-      freeswitchJNI.delete_EventConsumer(swigCPtr);
+    if (swigCPtr != 0) {
+      if (swigCMemOwn) {
+        swigCMemOwn = false;
+        freeswitchJNI.delete_EventConsumer(swigCPtr);
+      }
+      swigCPtr = 0;
    }
-    swigCPtr = 0;
  }

  public void setEvents(SWIGTYPE_p_switch_queue_t value) {
@@ -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,11 +26,13 @@ public class IVRMenu {
  }

  public synchronized void delete() {
-    if(swigCPtr != 0 && swigCMemOwn) {
-      swigCMemOwn = false;
-      freeswitchJNI.delete_IVRMenu(swigCPtr);
+    if (swigCPtr != 0) {
+      if (swigCMemOwn) {
+        swigCMemOwn = false;
+        freeswitchJNI.delete_IVRMenu(swigCPtr);
+      }
+      swigCPtr = 0;
    }
-    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) {
@@ -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) {
-      swigCMemOwn = false;
-      freeswitchJNI.delete_JavaSession(swigCPtr);
+    if (swigCPtr != 0) {
+      if (swigCMemOwn) {
+        swigCMemOwn = false;
+        freeswitchJNI.delete_JavaSession(swigCPtr);
+      }
+      swigCPtr = 0;
    }
-    swigCPtr = 0;
    super.delete();
  }

@@ -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.
@@ -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.
@@ -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.
@@ -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.
@@ -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.
@@ -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.
@@ -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.
@@ -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.
@@ -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.
@@ -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.
@@ -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.
@@ -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.
@@ -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.
@@ -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.
@@ -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.
@@ -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.
@@ -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.
@@ -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.
@@ -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,11 +26,13 @@ public class Stream {
  }

  public synchronized void delete() {
-    if(swigCPtr != 0 && swigCMemOwn) {
-      swigCMemOwn = false;
-      freeswitchJNI.delete_Stream(swigCPtr);
+    if (swigCPtr != 0) {
+      if (swigCMemOwn) {
+        swigCMemOwn = false;
+        freeswitchJNI.delete_Stream(swigCPtr);
+      }
+      swigCPtr = 0;
    }
-    swigCPtr = 0;
  }

  public Stream() {
@@ -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.
@@ -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);
 }
@@ -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,11 +26,13 @@ public class input_callback_state_t {
  }

  public synchronized void delete() {
-    if(swigCPtr != 0 && swigCMemOwn) {
-      swigCMemOwn = false;
-      freeswitchJNI.delete_input_callback_state_t(swigCPtr);
+    if (swigCPtr != 0) {
+      if (swigCMemOwn) {
+        swigCMemOwn = false;
+        freeswitchJNI.delete_input_callback_state_t(swigCPtr);
+      }
+      swigCPtr = 0;
    }
-    swigCPtr = 0;
  }

  public void setFunction(SWIGTYPE_p_void value) {
@@ -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.
@@ -1,27 +1,32 @@
 /* ----------------------------------------------------------------------------
 * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
- * 
- * This file is not intended to be easily readable and contains a number of 
+ * 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
- * changes to this file unless you know what you are doing--modify the SWIG 
- * interface file instead. 
+ * changes to this file unless you know what you are doing--modify the SWIG
+ * interface file instead.
 * ----------------------------------------------------------------------------- */

+#define SWIGJAVA
+

 #ifdef __cplusplus
+/* SwigValueWrapper is described in swig.swg */
 template<typename T> class SwigValueWrapper {
-    T *tt;
+  struct SwigMovePointer {
+    T *ptr;
+    SwigMovePointer(T *p) : ptr(p) { }
+    ~SwigMovePointer() { delete ptr; }
+    SwigMovePointer& operator=(SwigMovePointer& rhs) { T* oldptr = ptr; ptr = 0; delete oldptr; ptr = rhs.ptr; rhs.ptr = 0; return *this; }
+  } pointer;
+  SwigValueWrapper& operator=(const SwigValueWrapper<T>& rhs);
+  SwigValueWrapper(const SwigValueWrapper<T>& rhs);
 public:
-    SwigValueWrapper() : tt(0) { }
-    SwigValueWrapper(const SwigValueWrapper<T>& rhs) : tt(new T(*rhs.tt)) { }
-    SwigValueWrapper(const T& t) : tt(new T(t)) { }
-    ~SwigValueWrapper() { delete tt; } 
-    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() : 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() {
@@ -60,14 +65,20 @@ template <typename T> T SwigValueInit() {
 #ifndef SWIGUNUSED
 # if defined(__GNUC__)
 #   if !(defined(__cplusplus)) || (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4))
-#     define SWIGUNUSED __attribute__ ((__unused__)) 
+#     define SWIGUNUSED __attribute__ ((__unused__))
 #   else
 #     define SWIGUNUSED
 #   endif
 # elif defined(__ICC)
-#   define SWIGUNUSED __attribute__ ((__unused__)) 
+#   define SWIGUNUSED __attribute__ ((__unused__))
 # else
-#   define SWIGUNUSED 
+#   define SWIGUNUSED
+# endif
+#endif
+
+#ifndef SWIG_MSC_UNSUPPRESS_4505
+# if defined(_MSC_VER)
+#   pragma warning(disable : 4505) /* unreferenced local function has been removed */
 # endif
 #endif

@@ -75,7 +86,7 @@ template <typename T> T SwigValueInit() {
 # ifdef __cplusplus
 #   define SWIGUNUSEDPARM(p)
 # else
-#   define SWIGUNUSEDPARM(p) p SWIGUNUSED 
+#   define SWIGUNUSEDPARM(p) p SWIGUNUSED
 # endif
 #endif

@@ -118,7 +129,7 @@ template <typename T> T SwigValueInit() {
 #   define SWIGSTDCALL __stdcall
 # else
 #   define SWIGSTDCALL
-# endif 
+# endif
 #endif

 /* Deal with Microsoft's attempt at deprecating C standard runtime functions */
@@ -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)
@@ -243,7 +255,7 @@ SWIGEXPORT jstring JNICALL Java_org_freeswitch_swig_freeswitchJNI_getGlobalVaria
    if (!arg1) return 0;
  }
  result = (char *)getGlobalVariable(arg1);
-  if(result) jresult = jenv->NewStringUTF((const char *)result);
+  if (result) jresult = jenv->NewStringUTF((const char *)result);
  if (arg1) jenv->ReleaseStringUTFChars(jarg1, (const char *)arg1);
  free(result);
  return jresult;
@@ -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;
-  
 }


@@ -607,7 +617,7 @@ SWIGEXPORT jstring JNICALL Java_org_freeswitch_swig_freeswitchJNI_API_1execute(J
    if (!arg3) return 0;
  }
  result = (char *)(arg1)->execute((char const *)arg2,(char const *)arg3);
-  if(result) jresult = jenv->NewStringUTF((const char *)result);
+  if (result) jresult = jenv->NewStringUTF((const char *)result);
  if (arg2) jenv->ReleaseStringUTFChars(jarg2, (const char *)arg2);
  if (arg3) jenv->ReleaseStringUTFChars(jarg3, (const char *)arg3);
  return jresult;
@@ -630,7 +640,7 @@ SWIGEXPORT jstring JNICALL Java_org_freeswitch_swig_freeswitchJNI_API_1executeSt
    if (!arg2) return 0;
  }
  result = (char *)(arg1)->executeString((char const *)arg2);
-  if(result) jresult = jenv->NewStringUTF((const char *)result);
+  if (result) jresult = jenv->NewStringUTF((const char *)result);
  if (arg2) jenv->ReleaseStringUTFChars(jarg2, (const char *)arg2);
  return jresult;
 }
@@ -646,34 +656,33 @@ SWIGEXPORT jstring JNICALL Java_org_freeswitch_swig_freeswitchJNI_API_1getTime(J
  (void)jarg1_;
  arg1 = *(API **)&jarg1; 
  result = (char *)(arg1)->getTime();
-  if(result) jresult = jenv->NewStringUTF((const char *)result);
+  if (result) jresult = jenv->NewStringUTF((const char *)result);
  return jresult;
 }


 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,39 +773,38 @@ 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);
+  if (result) jresult = jenv->NewStringUTF((const char *)result);
  return jresult;
 }


 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();
-  *(input_callback_state_t **)&jresult = result; 
+  result = (input_callback_state *)new input_callback_state();
+  *(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;
-  
 }


@@ -984,7 +986,7 @@ SWIGEXPORT jstring JNICALL Java_org_freeswitch_swig_freeswitchJNI_Stream_1read(J
  arg1 = *(Stream **)&jarg1; 
  arg2 = *(int **)&jarg2; 
  result = (char *)(arg1)->read(arg2);
-  if(result) jresult = jenv->NewStringUTF((const char *)result);
+  if (result) jresult = jenv->NewStringUTF((const char *)result);
  return jresult;
 }

@@ -1037,7 +1039,7 @@ SWIGEXPORT jstring JNICALL Java_org_freeswitch_swig_freeswitchJNI_Stream_1get_1d
  (void)jarg1_;
  arg1 = *(Stream **)&jarg1; 
  result = (char *)(arg1)->get_data();
-  if(result) jresult = jenv->NewStringUTF((const char *)result);
+  if (result) jresult = jenv->NewStringUTF((const char *)result);
  return jresult;
 }

@@ -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);
@@ -1107,7 +1108,7 @@ SWIGEXPORT jstring JNICALL Java_org_freeswitch_swig_freeswitchJNI_Event_1seriali
  (void)jarg1_;
  arg1 = *(Event **)&jarg1; 
  result = (char *) ((arg1)->serialized_string);
-  if(result) jresult = jenv->NewStringUTF((const char *)result);
+  if (result) jresult = jenv->NewStringUTF((const char *)result);
  return jresult;
 }

@@ -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;
-  
 }


@@ -1261,7 +1260,7 @@ SWIGEXPORT jstring JNICALL Java_org_freeswitch_swig_freeswitchJNI_Event_1seriali
    if (!arg2) return 0;
  }
  result = (char *)(arg1)->serialize((char const *)arg2);
-  if(result) jresult = jenv->NewStringUTF((const char *)result);
+  if (result) jresult = jenv->NewStringUTF((const char *)result);
  if (arg2) jenv->ReleaseStringUTFChars(jarg2, (const char *)arg2);
  return jresult;
 }
@@ -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;
@@ -1306,7 +1305,7 @@ SWIGEXPORT jstring JNICALL Java_org_freeswitch_swig_freeswitchJNI_Event_1getHead
    if (!arg2) return 0;
  }
  result = (char *)(arg1)->getHeader((char const *)arg2);
-  if(result) jresult = jenv->NewStringUTF((const char *)result);
+  if (result) jresult = jenv->NewStringUTF((const char *)result);
  if (arg2) jenv->ReleaseStringUTFChars(jarg2, (const char *)arg2);
  return jresult;
 }
@@ -1322,7 +1321,7 @@ SWIGEXPORT jstring JNICALL Java_org_freeswitch_swig_freeswitchJNI_Event_1getBody
  (void)jarg1_;
  arg1 = *(Event **)&jarg1; 
  result = (char *)(arg1)->getBody();
-  if(result) jresult = jenv->NewStringUTF((const char *)result);
+  if (result) jresult = jenv->NewStringUTF((const char *)result);
  return jresult;
 }

@@ -1337,7 +1336,7 @@ SWIGEXPORT jstring JNICALL Java_org_freeswitch_swig_freeswitchJNI_Event_1getType
  (void)jarg1_;
  arg1 = *(Event **)&jarg1; 
  result = (char *)(arg1)->getType();
-  if(result) jresult = jenv->NewStringUTF((const char *)result);
+  if (result) jresult = jenv->NewStringUTF((const char *)result);
  return jresult;
 }

@@ -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);
@@ -1530,7 +1527,7 @@ SWIGEXPORT jstring JNICALL Java_org_freeswitch_swig_freeswitchJNI_EventConsumer_
  (void)jarg1_;
  arg1 = *(EventConsumer **)&jarg1; 
  result = (char *) ((arg1)->e_callback);
-  if(result) jresult = jenv->NewStringUTF((const char *)result);
+  if (result) jresult = jenv->NewStringUTF((const char *)result);
  return jresult;
 }

@@ -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);
@@ -1571,7 +1568,7 @@ SWIGEXPORT jstring JNICALL Java_org_freeswitch_swig_freeswitchJNI_EventConsumer_
  (void)jarg1_;
  arg1 = *(EventConsumer **)&jarg1; 
  result = (char *) ((arg1)->e_subclass_name);
-  if(result) jresult = jenv->NewStringUTF((const char *)result);
+  if (result) jresult = jenv->NewStringUTF((const char *)result);
  return jresult;
 }

@@ -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);
@@ -1612,7 +1609,7 @@ SWIGEXPORT jstring JNICALL Java_org_freeswitch_swig_freeswitchJNI_EventConsumer_
  (void)jarg1_;
  arg1 = *(EventConsumer **)&jarg1; 
  result = (char *) ((arg1)->e_cb_arg);
-  if(result) jresult = jenv->NewStringUTF((const char *)result);
+  if (result) jresult = jenv->NewStringUTF((const char *)result);
  return jresult;
 }

@@ -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);
@@ -2046,7 +2033,7 @@ SWIGEXPORT jstring JNICALL Java_org_freeswitch_swig_freeswitchJNI_CoreSession_1u
  (void)jarg1_;
  arg1 = *(CoreSession **)&jarg1; 
  result = (char *) ((arg1)->uuid);
-  if(result) jresult = jenv->NewStringUTF((const char *)result);
+  if (result) jresult = jenv->NewStringUTF((const char *)result);
  return jresult;
 }

@@ -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);
@@ -2087,7 +2074,7 @@ SWIGEXPORT jstring JNICALL Java_org_freeswitch_swig_freeswitchJNI_CoreSession_1t
  (void)jarg1_;
  arg1 = *(CoreSession **)&jarg1; 
  result = (char *) ((arg1)->tts_name);
-  if(result) jresult = jenv->NewStringUTF((const char *)result);
+  if (result) jresult = jenv->NewStringUTF((const char *)result);
  return jresult;
 }

@@ -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);
@@ -2128,7 +2115,7 @@ SWIGEXPORT jstring JNICALL Java_org_freeswitch_swig_freeswitchJNI_CoreSession_1v
  (void)jarg1_;
  arg1 = *(CoreSession **)&jarg1; 
  result = (char *) ((arg1)->voice_name);
-  if(result) jresult = jenv->NewStringUTF((const char *)result);
+  if (result) jresult = jenv->NewStringUTF((const char *)result);
  return jresult;
 }

@@ -2306,7 +2293,7 @@ SWIGEXPORT jstring JNICALL Java_org_freeswitch_swig_freeswitchJNI_CoreSession_1g
    if (!arg2) return 0;
  }
  result = (char *)(arg1)->getVariable(arg2);
-  if(result) jresult = jenv->NewStringUTF((const char *)result);
+  if (result) jresult = jenv->NewStringUTF((const char *)result);
  if (arg2) jenv->ReleaseStringUTFChars(jarg2, (const char *)arg2);
  return jresult;
 }
@@ -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;
 }
@@ -2422,7 +2409,7 @@ SWIGEXPORT jstring JNICALL Java_org_freeswitch_swig_freeswitchJNI_CoreSession_1h
  (void)jarg1_;
  arg1 = *(CoreSession **)&jarg1; 
  result = (char *)(arg1)->hangupCause();
-  if(result) jresult = jenv->NewStringUTF((const char *)result);
+  if (result) jresult = jenv->NewStringUTF((const char *)result);
  return jresult;
 }

@@ -2437,7 +2424,7 @@ SWIGEXPORT jstring JNICALL Java_org_freeswitch_swig_freeswitchJNI_CoreSession_1g
  (void)jarg1_;
  arg1 = *(CoreSession **)&jarg1; 
  result = (char *)(arg1)->getState();
-  if(result) jresult = jenv->NewStringUTF((const char *)result);
+  if (result) jresult = jenv->NewStringUTF((const char *)result);
  return jresult;
 }

@@ -2658,7 +2645,7 @@ SWIGEXPORT jstring JNICALL Java_org_freeswitch_swig_freeswitchJNI_CoreSession_1g
  }
  arg4 = (int)jarg4; 
  result = (char *)(arg1)->getDigits(arg2,arg3,arg4);
-  if(result) jresult = jenv->NewStringUTF((const char *)result);
+  if (result) jresult = jenv->NewStringUTF((const char *)result);
  if (arg3) jenv->ReleaseStringUTFChars(jarg3, (const char *)arg3);
  return jresult;
 }
@@ -2686,7 +2673,7 @@ SWIGEXPORT jstring JNICALL Java_org_freeswitch_swig_freeswitchJNI_CoreSession_1g
  arg4 = (int)jarg4; 
  arg5 = (int)jarg5; 
  result = (char *)(arg1)->getDigits(arg2,arg3,arg4,arg5);
-  if(result) jresult = jenv->NewStringUTF((const char *)result);
+  if (result) jresult = jenv->NewStringUTF((const char *)result);
  if (arg3) jenv->ReleaseStringUTFChars(jarg3, (const char *)arg3);
  return jresult;
 }
@@ -2758,7 +2745,7 @@ SWIGEXPORT jstring JNICALL Java_org_freeswitch_swig_freeswitchJNI_CoreSession_1r
  }
  arg7 = (int)jarg7; 
  result = (char *)(arg1)->read(arg2,arg3,(char const *)arg4,arg5,(char const *)arg6,arg7);
-  if(result) jresult = jenv->NewStringUTF((const char *)result);
+  if (result) jresult = jenv->NewStringUTF((const char *)result);
  if (arg4) jenv->ReleaseStringUTFChars(jarg4, (const char *)arg4);
  if (arg6) jenv->ReleaseStringUTFChars(jarg6, (const char *)arg6);
  return jresult;
@@ -2821,7 +2808,7 @@ SWIGEXPORT jstring JNICALL Java_org_freeswitch_swig_freeswitchJNI_CoreSession_1p
    if (!arg12) return 0;
  }
  result = (char *)(arg1)->playAndGetDigits(arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9,(char const *)arg10,arg11,(char const *)arg12);
-  if(result) jresult = jenv->NewStringUTF((const char *)result);
+  if (result) jresult = jenv->NewStringUTF((const char *)result);
  if (arg6) jenv->ReleaseStringUTFChars(jarg6, (const char *)arg6);
  if (arg7) jenv->ReleaseStringUTFChars(jarg7, (const char *)arg7);
  if (arg8) jenv->ReleaseStringUTFChars(jarg8, (const char *)arg8);
@@ -3072,7 +3059,7 @@ SWIGEXPORT jstring JNICALL Java_org_freeswitch_swig_freeswitchJNI_CoreSession_1g
  (void)jarg1_;
  arg1 = *(CoreSession **)&jarg1; 
  result = (char *)(arg1)->getXMLCDR();
-  if(result) jresult = jenv->NewStringUTF((const char *)result);
+  if (result) jresult = jenv->NewStringUTF((const char *)result);
  return jresult;
 }

@@ -3117,7 +3104,7 @@ SWIGEXPORT jstring JNICALL Java_org_freeswitch_swig_freeswitchJNI_CoreSession_1g
  (void)jarg1_;
  arg1 = *(CoreSession **)&jarg1; 
  result = (char *)((CoreSession const *)arg1)->get_uuid();
-  if(result) jresult = jenv->NewStringUTF((const char *)result);
+  if (result) jresult = jenv->NewStringUTF((const char *)result);
  return jresult;
 }

@@ -3131,10 +3118,7 @@ SWIGEXPORT jlong JNICALL Java_org_freeswitch_swig_freeswitchJNI_CoreSession_1get
  (void)jcls;
  (void)jarg1_;
  arg1 = *(CoreSession **)&jarg1; 
-  {
-    switch_input_args_t const &_result_ref = ((CoreSession const *)arg1)->get_cb_args();
-    result = (switch_input_args_t *) &_result_ref;
-  }
+  result = (switch_input_args_t *) &((CoreSession const *)arg1)->get_cb_args();
  *(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;
 }

@@ -3336,12 +3320,12 @@ SWIGEXPORT void JNICALL Java_org_freeswitch_swig_freeswitchJNI_bridge(JNIEnv *je
  (void)jarg1_;
  (void)jarg2_;
  arg1 = *(CoreSession **)&jarg1;
-  if(!arg1) {
+  if (!arg1) {
    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "CoreSession & reference is null");
    return ;
  } 
  arg2 = *(CoreSession **)&jarg2;
-  if(!arg2) {
+  if (!arg2) {
    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "CoreSession & reference is null");
    return ;
  } 
@@ -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;