diff --git a/branches/2.0/doubango/bindings/csharp/ActionConfig.cs b/branches/2.0/doubango/bindings/csharp/ActionConfig.cs
index 73c27d63..898d2247 100644
--- a/branches/2.0/doubango/bindings/csharp/ActionConfig.cs
+++ b/branches/2.0/doubango/bindings/csharp/ActionConfig.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/csharp/AudioResampler.cs b/branches/2.0/doubango/bindings/csharp/AudioResampler.cs
index 8cfb777b..1f911e8a 100644
--- a/branches/2.0/doubango/bindings/csharp/AudioResampler.cs
+++ b/branches/2.0/doubango/bindings/csharp/AudioResampler.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/csharp/CallSession.cs b/branches/2.0/doubango/bindings/csharp/CallSession.cs
index f0d9a52d..83b4b409 100644
--- a/branches/2.0/doubango/bindings/csharp/CallSession.cs
+++ b/branches/2.0/doubango/bindings/csharp/CallSession.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -14,7 +14,7 @@ using System.Runtime.InteropServices;
 public class CallSession : InviteSession {
   private HandleRef swigCPtr;
 
-  internal CallSession(IntPtr cPtr, bool cMemoryOwn) : base(tinyWRAPPINVOKE.CallSession_SWIGUpcast(cPtr), cMemoryOwn) {
+  internal CallSession(IntPtr cPtr, bool cMemoryOwn) : base(tinyWRAPPINVOKE.CallSessionUpcast(cPtr), cMemoryOwn) {
     swigCPtr = new HandleRef(this, cPtr);
   }
 
diff --git a/branches/2.0/doubango/bindings/csharp/Codec.cs b/branches/2.0/doubango/bindings/csharp/Codec.cs
index f0fe9312..747602ca 100644
--- a/branches/2.0/doubango/bindings/csharp/Codec.cs
+++ b/branches/2.0/doubango/bindings/csharp/Codec.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/csharp/DDebugCallback.cs b/branches/2.0/doubango/bindings/csharp/DDebugCallback.cs
index 13a29cb4..82aff760 100644
--- a/branches/2.0/doubango/bindings/csharp/DDebugCallback.cs
+++ b/branches/2.0/doubango/bindings/csharp/DDebugCallback.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -46,22 +46,22 @@ public class DDebugCallback : IDisposable {
   }
 
   public virtual int OnDebugInfo(string message) {
-    int ret = (SwigDerivedClassHasMethod("OnDebugInfo", swigMethodTypes0) ? tinyWRAPPINVOKE.DDebugCallback_OnDebugInfoSwigExplicitDDebugCallback(swigCPtr, message) : tinyWRAPPINVOKE.DDebugCallback_OnDebugInfo(swigCPtr, message));
+    int ret = ((this.GetType() == typeof(DDebugCallback)) ? tinyWRAPPINVOKE.DDebugCallback_OnDebugInfo(swigCPtr, message) : tinyWRAPPINVOKE.DDebugCallback_OnDebugInfoSwigExplicitDDebugCallback(swigCPtr, message));
     return ret;
   }
 
   public virtual int OnDebugWarn(string message) {
-    int ret = (SwigDerivedClassHasMethod("OnDebugWarn", swigMethodTypes1) ? tinyWRAPPINVOKE.DDebugCallback_OnDebugWarnSwigExplicitDDebugCallback(swigCPtr, message) : tinyWRAPPINVOKE.DDebugCallback_OnDebugWarn(swigCPtr, message));
+    int ret = ((this.GetType() == typeof(DDebugCallback)) ? tinyWRAPPINVOKE.DDebugCallback_OnDebugWarn(swigCPtr, message) : tinyWRAPPINVOKE.DDebugCallback_OnDebugWarnSwigExplicitDDebugCallback(swigCPtr, message));
     return ret;
   }
 
   public virtual int OnDebugError(string message) {
-    int ret = (SwigDerivedClassHasMethod("OnDebugError", swigMethodTypes2) ? tinyWRAPPINVOKE.DDebugCallback_OnDebugErrorSwigExplicitDDebugCallback(swigCPtr, message) : tinyWRAPPINVOKE.DDebugCallback_OnDebugError(swigCPtr, message));
+    int ret = ((this.GetType() == typeof(DDebugCallback)) ? tinyWRAPPINVOKE.DDebugCallback_OnDebugError(swigCPtr, message) : tinyWRAPPINVOKE.DDebugCallback_OnDebugErrorSwigExplicitDDebugCallback(swigCPtr, message));
     return ret;
   }
 
   public virtual int OnDebugFatal(string message) {
-    int ret = (SwigDerivedClassHasMethod("OnDebugFatal", swigMethodTypes3) ? tinyWRAPPINVOKE.DDebugCallback_OnDebugFatalSwigExplicitDDebugCallback(swigCPtr, message) : tinyWRAPPINVOKE.DDebugCallback_OnDebugFatal(swigCPtr, message));
+    int ret = ((this.GetType() == typeof(DDebugCallback)) ? tinyWRAPPINVOKE.DDebugCallback_OnDebugFatal(swigCPtr, message) : tinyWRAPPINVOKE.DDebugCallback_OnDebugFatalSwigExplicitDDebugCallback(swigCPtr, message));
     return ret;
   }
 
diff --git a/branches/2.0/doubango/bindings/csharp/DialogEvent.cs b/branches/2.0/doubango/bindings/csharp/DialogEvent.cs
index 5122c132..d518a0b6 100644
--- a/branches/2.0/doubango/bindings/csharp/DialogEvent.cs
+++ b/branches/2.0/doubango/bindings/csharp/DialogEvent.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -14,7 +14,7 @@ using System.Runtime.InteropServices;
 public class DialogEvent : SipEvent {
   private HandleRef swigCPtr;
 
-  internal DialogEvent(IntPtr cPtr, bool cMemoryOwn) : base(tinyWRAPPINVOKE.DialogEvent_SWIGUpcast(cPtr), cMemoryOwn) {
+  internal DialogEvent(IntPtr cPtr, bool cMemoryOwn) : base(tinyWRAPPINVOKE.DialogEventUpcast(cPtr), cMemoryOwn) {
     swigCPtr = new HandleRef(this, cPtr);
   }
 
diff --git a/branches/2.0/doubango/bindings/csharp/InfoEvent.cs b/branches/2.0/doubango/bindings/csharp/InfoEvent.cs
index 9f241106..860385f1 100644
--- a/branches/2.0/doubango/bindings/csharp/InfoEvent.cs
+++ b/branches/2.0/doubango/bindings/csharp/InfoEvent.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -14,7 +14,7 @@ using System.Runtime.InteropServices;
 public class InfoEvent : SipEvent {
   private HandleRef swigCPtr;
 
-  internal InfoEvent(IntPtr cPtr, bool cMemoryOwn) : base(tinyWRAPPINVOKE.InfoEvent_SWIGUpcast(cPtr), cMemoryOwn) {
+  internal InfoEvent(IntPtr cPtr, bool cMemoryOwn) : base(tinyWRAPPINVOKE.InfoEventUpcast(cPtr), cMemoryOwn) {
     swigCPtr = new HandleRef(this, cPtr);
   }
 
diff --git a/branches/2.0/doubango/bindings/csharp/InfoSession.cs b/branches/2.0/doubango/bindings/csharp/InfoSession.cs
index f823ffcd..1f309cd0 100644
--- a/branches/2.0/doubango/bindings/csharp/InfoSession.cs
+++ b/branches/2.0/doubango/bindings/csharp/InfoSession.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -14,7 +14,7 @@ using System.Runtime.InteropServices;
 public class InfoSession : SipSession {
   private HandleRef swigCPtr;
 
-  internal InfoSession(IntPtr cPtr, bool cMemoryOwn) : base(tinyWRAPPINVOKE.InfoSession_SWIGUpcast(cPtr), cMemoryOwn) {
+  internal InfoSession(IntPtr cPtr, bool cMemoryOwn) : base(tinyWRAPPINVOKE.InfoSessionUpcast(cPtr), cMemoryOwn) {
     swigCPtr = new HandleRef(this, cPtr);
   }
 
diff --git a/branches/2.0/doubango/bindings/csharp/InviteEvent.cs b/branches/2.0/doubango/bindings/csharp/InviteEvent.cs
index d70b46cd..a300a58f 100644
--- a/branches/2.0/doubango/bindings/csharp/InviteEvent.cs
+++ b/branches/2.0/doubango/bindings/csharp/InviteEvent.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -14,7 +14,7 @@ using System.Runtime.InteropServices;
 public class InviteEvent : SipEvent {
   private HandleRef swigCPtr;
 
-  internal InviteEvent(IntPtr cPtr, bool cMemoryOwn) : base(tinyWRAPPINVOKE.InviteEvent_SWIGUpcast(cPtr), cMemoryOwn) {
+  internal InviteEvent(IntPtr cPtr, bool cMemoryOwn) : base(tinyWRAPPINVOKE.InviteEventUpcast(cPtr), cMemoryOwn) {
     swigCPtr = new HandleRef(this, cPtr);
   }
 
diff --git a/branches/2.0/doubango/bindings/csharp/InviteSession.cs b/branches/2.0/doubango/bindings/csharp/InviteSession.cs
index 35af69e9..c5f11c23 100644
--- a/branches/2.0/doubango/bindings/csharp/InviteSession.cs
+++ b/branches/2.0/doubango/bindings/csharp/InviteSession.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -14,7 +14,7 @@ using System.Runtime.InteropServices;
 public class InviteSession : SipSession {
   private HandleRef swigCPtr;
 
-  internal InviteSession(IntPtr cPtr, bool cMemoryOwn) : base(tinyWRAPPINVOKE.InviteSession_SWIGUpcast(cPtr), cMemoryOwn) {
+  internal InviteSession(IntPtr cPtr, bool cMemoryOwn) : base(tinyWRAPPINVOKE.InviteSessionUpcast(cPtr), cMemoryOwn) {
     swigCPtr = new HandleRef(this, cPtr);
   }
 
diff --git a/branches/2.0/doubango/bindings/csharp/MediaContent.cs b/branches/2.0/doubango/bindings/csharp/MediaContent.cs
index fcbddd4d..2d059387 100644
--- a/branches/2.0/doubango/bindings/csharp/MediaContent.cs
+++ b/branches/2.0/doubango/bindings/csharp/MediaContent.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/csharp/MediaContentCPIM.cs b/branches/2.0/doubango/bindings/csharp/MediaContentCPIM.cs
index 7e13bfa0..0fe03091 100644
--- a/branches/2.0/doubango/bindings/csharp/MediaContentCPIM.cs
+++ b/branches/2.0/doubango/bindings/csharp/MediaContentCPIM.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -14,7 +14,7 @@ using System.Runtime.InteropServices;
 public class MediaContentCPIM : MediaContent {
   private HandleRef swigCPtr;
 
-  internal MediaContentCPIM(IntPtr cPtr, bool cMemoryOwn) : base(tinyWRAPPINVOKE.MediaContentCPIM_SWIGUpcast(cPtr), cMemoryOwn) {
+  internal MediaContentCPIM(IntPtr cPtr, bool cMemoryOwn) : base(tinyWRAPPINVOKE.MediaContentCPIMUpcast(cPtr), cMemoryOwn) {
     swigCPtr = new HandleRef(this, cPtr);
   }
 
diff --git a/branches/2.0/doubango/bindings/csharp/MediaSessionMgr.cs b/branches/2.0/doubango/bindings/csharp/MediaSessionMgr.cs
index 8ee9d863..763925d3 100644
--- a/branches/2.0/doubango/bindings/csharp/MediaSessionMgr.cs
+++ b/branches/2.0/doubango/bindings/csharp/MediaSessionMgr.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/csharp/MessagingEvent.cs b/branches/2.0/doubango/bindings/csharp/MessagingEvent.cs
index c7c734a0..43be961f 100644
--- a/branches/2.0/doubango/bindings/csharp/MessagingEvent.cs
+++ b/branches/2.0/doubango/bindings/csharp/MessagingEvent.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -14,7 +14,7 @@ using System.Runtime.InteropServices;
 public class MessagingEvent : SipEvent {
   private HandleRef swigCPtr;
 
-  internal MessagingEvent(IntPtr cPtr, bool cMemoryOwn) : base(tinyWRAPPINVOKE.MessagingEvent_SWIGUpcast(cPtr), cMemoryOwn) {
+  internal MessagingEvent(IntPtr cPtr, bool cMemoryOwn) : base(tinyWRAPPINVOKE.MessagingEventUpcast(cPtr), cMemoryOwn) {
     swigCPtr = new HandleRef(this, cPtr);
   }
 
diff --git a/branches/2.0/doubango/bindings/csharp/MessagingSession.cs b/branches/2.0/doubango/bindings/csharp/MessagingSession.cs
index 252c59f7..cb37585a 100644
--- a/branches/2.0/doubango/bindings/csharp/MessagingSession.cs
+++ b/branches/2.0/doubango/bindings/csharp/MessagingSession.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -14,7 +14,7 @@ using System.Runtime.InteropServices;
 public class MessagingSession : SipSession {
   private HandleRef swigCPtr;
 
-  internal MessagingSession(IntPtr cPtr, bool cMemoryOwn) : base(tinyWRAPPINVOKE.MessagingSession_SWIGUpcast(cPtr), cMemoryOwn) {
+  internal MessagingSession(IntPtr cPtr, bool cMemoryOwn) : base(tinyWRAPPINVOKE.MessagingSessionUpcast(cPtr), cMemoryOwn) {
     swigCPtr = new HandleRef(this, cPtr);
   }
 
diff --git a/branches/2.0/doubango/bindings/csharp/MsrpCallback.cs b/branches/2.0/doubango/bindings/csharp/MsrpCallback.cs
index f5fa468f..5c2cbfc5 100644
--- a/branches/2.0/doubango/bindings/csharp/MsrpCallback.cs
+++ b/branches/2.0/doubango/bindings/csharp/MsrpCallback.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -46,7 +46,7 @@ public class MsrpCallback : IDisposable {
   }
 
   public virtual int OnEvent(MsrpEvent e) {
-    int ret = (SwigDerivedClassHasMethod("OnEvent", swigMethodTypes0) ? tinyWRAPPINVOKE.MsrpCallback_OnEventSwigExplicitMsrpCallback(swigCPtr, MsrpEvent.getCPtr(e)) : tinyWRAPPINVOKE.MsrpCallback_OnEvent(swigCPtr, MsrpEvent.getCPtr(e)));
+    int ret = ((this.GetType() == typeof(MsrpCallback)) ? tinyWRAPPINVOKE.MsrpCallback_OnEvent(swigCPtr, MsrpEvent.getCPtr(e)) : tinyWRAPPINVOKE.MsrpCallback_OnEventSwigExplicitMsrpCallback(swigCPtr, MsrpEvent.getCPtr(e)));
     return ret;
   }
 
diff --git a/branches/2.0/doubango/bindings/csharp/MsrpEvent.cs b/branches/2.0/doubango/bindings/csharp/MsrpEvent.cs
index 3da8cca6..b72d24ac 100644
--- a/branches/2.0/doubango/bindings/csharp/MsrpEvent.cs
+++ b/branches/2.0/doubango/bindings/csharp/MsrpEvent.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/csharp/MsrpMessage.cs b/branches/2.0/doubango/bindings/csharp/MsrpMessage.cs
index 2f582fbc..75876fa9 100644
--- a/branches/2.0/doubango/bindings/csharp/MsrpMessage.cs
+++ b/branches/2.0/doubango/bindings/csharp/MsrpMessage.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/csharp/MsrpSession.cs b/branches/2.0/doubango/bindings/csharp/MsrpSession.cs
index cb4cbea2..cdb9d3e5 100644
--- a/branches/2.0/doubango/bindings/csharp/MsrpSession.cs
+++ b/branches/2.0/doubango/bindings/csharp/MsrpSession.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -14,7 +14,7 @@ using System.Runtime.InteropServices;
 public class MsrpSession : InviteSession {
   private HandleRef swigCPtr;
 
-  internal MsrpSession(IntPtr cPtr, bool cMemoryOwn) : base(tinyWRAPPINVOKE.MsrpSession_SWIGUpcast(cPtr), cMemoryOwn) {
+  internal MsrpSession(IntPtr cPtr, bool cMemoryOwn) : base(tinyWRAPPINVOKE.MsrpSessionUpcast(cPtr), cMemoryOwn) {
     swigCPtr = new HandleRef(this, cPtr);
   }
 
diff --git a/branches/2.0/doubango/bindings/csharp/OptionsEvent.cs b/branches/2.0/doubango/bindings/csharp/OptionsEvent.cs
index d09f3c30..0118e0e8 100644
--- a/branches/2.0/doubango/bindings/csharp/OptionsEvent.cs
+++ b/branches/2.0/doubango/bindings/csharp/OptionsEvent.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -14,7 +14,7 @@ using System.Runtime.InteropServices;
 public class OptionsEvent : SipEvent {
   private HandleRef swigCPtr;
 
-  internal OptionsEvent(IntPtr cPtr, bool cMemoryOwn) : base(tinyWRAPPINVOKE.OptionsEvent_SWIGUpcast(cPtr), cMemoryOwn) {
+  internal OptionsEvent(IntPtr cPtr, bool cMemoryOwn) : base(tinyWRAPPINVOKE.OptionsEventUpcast(cPtr), cMemoryOwn) {
     swigCPtr = new HandleRef(this, cPtr);
   }
 
diff --git a/branches/2.0/doubango/bindings/csharp/OptionsSession.cs b/branches/2.0/doubango/bindings/csharp/OptionsSession.cs
index 0386080f..e6693a34 100644
--- a/branches/2.0/doubango/bindings/csharp/OptionsSession.cs
+++ b/branches/2.0/doubango/bindings/csharp/OptionsSession.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -14,7 +14,7 @@ using System.Runtime.InteropServices;
 public class OptionsSession : SipSession {
   private HandleRef swigCPtr;
 
-  internal OptionsSession(IntPtr cPtr, bool cMemoryOwn) : base(tinyWRAPPINVOKE.OptionsSession_SWIGUpcast(cPtr), cMemoryOwn) {
+  internal OptionsSession(IntPtr cPtr, bool cMemoryOwn) : base(tinyWRAPPINVOKE.OptionsSessionUpcast(cPtr), cMemoryOwn) {
     swigCPtr = new HandleRef(this, cPtr);
   }
 
diff --git a/branches/2.0/doubango/bindings/csharp/ProxyAudioConsumer.cs b/branches/2.0/doubango/bindings/csharp/ProxyAudioConsumer.cs
index 39974f27..ef1d2072 100644
--- a/branches/2.0/doubango/bindings/csharp/ProxyAudioConsumer.cs
+++ b/branches/2.0/doubango/bindings/csharp/ProxyAudioConsumer.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -14,7 +14,7 @@ using System.Runtime.InteropServices;
 public class ProxyAudioConsumer : ProxyPlugin {
   private HandleRef swigCPtr;
 
-  internal ProxyAudioConsumer(IntPtr cPtr, bool cMemoryOwn) : base(tinyWRAPPINVOKE.ProxyAudioConsumer_SWIGUpcast(cPtr), cMemoryOwn) {
+  internal ProxyAudioConsumer(IntPtr cPtr, bool cMemoryOwn) : base(tinyWRAPPINVOKE.ProxyAudioConsumerUpcast(cPtr), cMemoryOwn) {
     swigCPtr = new HandleRef(this, cPtr);
   }
 
diff --git a/branches/2.0/doubango/bindings/csharp/ProxyAudioConsumerCallback.cs b/branches/2.0/doubango/bindings/csharp/ProxyAudioConsumerCallback.cs
index 85a6770b..8b5e1afd 100644
--- a/branches/2.0/doubango/bindings/csharp/ProxyAudioConsumerCallback.cs
+++ b/branches/2.0/doubango/bindings/csharp/ProxyAudioConsumerCallback.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -46,22 +46,22 @@ public class ProxyAudioConsumerCallback : IDisposable {
   }
 
   public virtual int prepare(int ptime, int rate, int channels) {
-    int ret = (SwigDerivedClassHasMethod("prepare", swigMethodTypes0) ? tinyWRAPPINVOKE.ProxyAudioConsumerCallback_prepareSwigExplicitProxyAudioConsumerCallback(swigCPtr, ptime, rate, channels) : tinyWRAPPINVOKE.ProxyAudioConsumerCallback_prepare(swigCPtr, ptime, rate, channels));
+    int ret = ((this.GetType() == typeof(ProxyAudioConsumerCallback)) ? tinyWRAPPINVOKE.ProxyAudioConsumerCallback_prepare(swigCPtr, ptime, rate, channels) : tinyWRAPPINVOKE.ProxyAudioConsumerCallback_prepareSwigExplicitProxyAudioConsumerCallback(swigCPtr, ptime, rate, channels));
     return ret;
   }
 
   public virtual int start() {
-    int ret = (SwigDerivedClassHasMethod("start", swigMethodTypes1) ? tinyWRAPPINVOKE.ProxyAudioConsumerCallback_startSwigExplicitProxyAudioConsumerCallback(swigCPtr) : tinyWRAPPINVOKE.ProxyAudioConsumerCallback_start(swigCPtr));
+    int ret = ((this.GetType() == typeof(ProxyAudioConsumerCallback)) ? tinyWRAPPINVOKE.ProxyAudioConsumerCallback_start(swigCPtr) : tinyWRAPPINVOKE.ProxyAudioConsumerCallback_startSwigExplicitProxyAudioConsumerCallback(swigCPtr));
     return ret;
   }
 
   public virtual int pause() {
-    int ret = (SwigDerivedClassHasMethod("pause", swigMethodTypes2) ? tinyWRAPPINVOKE.ProxyAudioConsumerCallback_pauseSwigExplicitProxyAudioConsumerCallback(swigCPtr) : tinyWRAPPINVOKE.ProxyAudioConsumerCallback_pause(swigCPtr));
+    int ret = ((this.GetType() == typeof(ProxyAudioConsumerCallback)) ? tinyWRAPPINVOKE.ProxyAudioConsumerCallback_pause(swigCPtr) : tinyWRAPPINVOKE.ProxyAudioConsumerCallback_pauseSwigExplicitProxyAudioConsumerCallback(swigCPtr));
     return ret;
   }
 
   public virtual int stop() {
-    int ret = (SwigDerivedClassHasMethod("stop", swigMethodTypes3) ? tinyWRAPPINVOKE.ProxyAudioConsumerCallback_stopSwigExplicitProxyAudioConsumerCallback(swigCPtr) : tinyWRAPPINVOKE.ProxyAudioConsumerCallback_stop(swigCPtr));
+    int ret = ((this.GetType() == typeof(ProxyAudioConsumerCallback)) ? tinyWRAPPINVOKE.ProxyAudioConsumerCallback_stop(swigCPtr) : tinyWRAPPINVOKE.ProxyAudioConsumerCallback_stopSwigExplicitProxyAudioConsumerCallback(swigCPtr));
     return ret;
   }
 
diff --git a/branches/2.0/doubango/bindings/csharp/ProxyAudioProducer.cs b/branches/2.0/doubango/bindings/csharp/ProxyAudioProducer.cs
index 342852a7..04d22269 100644
--- a/branches/2.0/doubango/bindings/csharp/ProxyAudioProducer.cs
+++ b/branches/2.0/doubango/bindings/csharp/ProxyAudioProducer.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -14,7 +14,7 @@ using System.Runtime.InteropServices;
 public class ProxyAudioProducer : ProxyPlugin {
   private HandleRef swigCPtr;
 
-  internal ProxyAudioProducer(IntPtr cPtr, bool cMemoryOwn) : base(tinyWRAPPINVOKE.ProxyAudioProducer_SWIGUpcast(cPtr), cMemoryOwn) {
+  internal ProxyAudioProducer(IntPtr cPtr, bool cMemoryOwn) : base(tinyWRAPPINVOKE.ProxyAudioProducerUpcast(cPtr), cMemoryOwn) {
     swigCPtr = new HandleRef(this, cPtr);
   }
 
diff --git a/branches/2.0/doubango/bindings/csharp/ProxyAudioProducerCallback.cs b/branches/2.0/doubango/bindings/csharp/ProxyAudioProducerCallback.cs
index 7703d621..31bca5c2 100644
--- a/branches/2.0/doubango/bindings/csharp/ProxyAudioProducerCallback.cs
+++ b/branches/2.0/doubango/bindings/csharp/ProxyAudioProducerCallback.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -46,27 +46,27 @@ public class ProxyAudioProducerCallback : IDisposable {
   }
 
   public virtual int prepare(int ptime, int rate, int channels) {
-    int ret = (SwigDerivedClassHasMethod("prepare", swigMethodTypes0) ? tinyWRAPPINVOKE.ProxyAudioProducerCallback_prepareSwigExplicitProxyAudioProducerCallback(swigCPtr, ptime, rate, channels) : tinyWRAPPINVOKE.ProxyAudioProducerCallback_prepare(swigCPtr, ptime, rate, channels));
+    int ret = ((this.GetType() == typeof(ProxyAudioProducerCallback)) ? tinyWRAPPINVOKE.ProxyAudioProducerCallback_prepare(swigCPtr, ptime, rate, channels) : tinyWRAPPINVOKE.ProxyAudioProducerCallback_prepareSwigExplicitProxyAudioProducerCallback(swigCPtr, ptime, rate, channels));
     return ret;
   }
 
   public virtual int start() {
-    int ret = (SwigDerivedClassHasMethod("start", swigMethodTypes1) ? tinyWRAPPINVOKE.ProxyAudioProducerCallback_startSwigExplicitProxyAudioProducerCallback(swigCPtr) : tinyWRAPPINVOKE.ProxyAudioProducerCallback_start(swigCPtr));
+    int ret = ((this.GetType() == typeof(ProxyAudioProducerCallback)) ? tinyWRAPPINVOKE.ProxyAudioProducerCallback_start(swigCPtr) : tinyWRAPPINVOKE.ProxyAudioProducerCallback_startSwigExplicitProxyAudioProducerCallback(swigCPtr));
     return ret;
   }
 
   public virtual int pause() {
-    int ret = (SwigDerivedClassHasMethod("pause", swigMethodTypes2) ? tinyWRAPPINVOKE.ProxyAudioProducerCallback_pauseSwigExplicitProxyAudioProducerCallback(swigCPtr) : tinyWRAPPINVOKE.ProxyAudioProducerCallback_pause(swigCPtr));
+    int ret = ((this.GetType() == typeof(ProxyAudioProducerCallback)) ? tinyWRAPPINVOKE.ProxyAudioProducerCallback_pause(swigCPtr) : tinyWRAPPINVOKE.ProxyAudioProducerCallback_pauseSwigExplicitProxyAudioProducerCallback(swigCPtr));
     return ret;
   }
 
   public virtual int stop() {
-    int ret = (SwigDerivedClassHasMethod("stop", swigMethodTypes3) ? tinyWRAPPINVOKE.ProxyAudioProducerCallback_stopSwigExplicitProxyAudioProducerCallback(swigCPtr) : tinyWRAPPINVOKE.ProxyAudioProducerCallback_stop(swigCPtr));
+    int ret = ((this.GetType() == typeof(ProxyAudioProducerCallback)) ? tinyWRAPPINVOKE.ProxyAudioProducerCallback_stop(swigCPtr) : tinyWRAPPINVOKE.ProxyAudioProducerCallback_stopSwigExplicitProxyAudioProducerCallback(swigCPtr));
     return ret;
   }
 
   public virtual int fillPushBuffer() {
-    int ret = (SwigDerivedClassHasMethod("fillPushBuffer", swigMethodTypes4) ? tinyWRAPPINVOKE.ProxyAudioProducerCallback_fillPushBufferSwigExplicitProxyAudioProducerCallback(swigCPtr) : tinyWRAPPINVOKE.ProxyAudioProducerCallback_fillPushBuffer(swigCPtr));
+    int ret = ((this.GetType() == typeof(ProxyAudioProducerCallback)) ? tinyWRAPPINVOKE.ProxyAudioProducerCallback_fillPushBuffer(swigCPtr) : tinyWRAPPINVOKE.ProxyAudioProducerCallback_fillPushBufferSwigExplicitProxyAudioProducerCallback(swigCPtr));
     return ret;
   }
 
diff --git a/branches/2.0/doubango/bindings/csharp/ProxyPlugin.cs b/branches/2.0/doubango/bindings/csharp/ProxyPlugin.cs
index aaf6cb7c..267d04b5 100644
--- a/branches/2.0/doubango/bindings/csharp/ProxyPlugin.cs
+++ b/branches/2.0/doubango/bindings/csharp/ProxyPlugin.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/csharp/ProxyPluginMgr.cs b/branches/2.0/doubango/bindings/csharp/ProxyPluginMgr.cs
index 14fd44ec..425c1e45 100644
--- a/branches/2.0/doubango/bindings/csharp/ProxyPluginMgr.cs
+++ b/branches/2.0/doubango/bindings/csharp/ProxyPluginMgr.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/csharp/ProxyPluginMgrCallback.cs b/branches/2.0/doubango/bindings/csharp/ProxyPluginMgrCallback.cs
index 900aad6d..b8f0a9de 100644
--- a/branches/2.0/doubango/bindings/csharp/ProxyPluginMgrCallback.cs
+++ b/branches/2.0/doubango/bindings/csharp/ProxyPluginMgrCallback.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -46,12 +46,12 @@ public class ProxyPluginMgrCallback : IDisposable {
   }
 
   public virtual int OnPluginCreated(ulong id, twrap_proxy_plugin_type_t type) {
-    int ret = (SwigDerivedClassHasMethod("OnPluginCreated", swigMethodTypes0) ? tinyWRAPPINVOKE.ProxyPluginMgrCallback_OnPluginCreatedSwigExplicitProxyPluginMgrCallback(swigCPtr, id, (int)type) : tinyWRAPPINVOKE.ProxyPluginMgrCallback_OnPluginCreated(swigCPtr, id, (int)type));
+    int ret = ((this.GetType() == typeof(ProxyPluginMgrCallback)) ? tinyWRAPPINVOKE.ProxyPluginMgrCallback_OnPluginCreated(swigCPtr, id, (int)type) : tinyWRAPPINVOKE.ProxyPluginMgrCallback_OnPluginCreatedSwigExplicitProxyPluginMgrCallback(swigCPtr, id, (int)type));
     return ret;
   }
 
   public virtual int OnPluginDestroyed(ulong id, twrap_proxy_plugin_type_t type) {
-    int ret = (SwigDerivedClassHasMethod("OnPluginDestroyed", swigMethodTypes1) ? tinyWRAPPINVOKE.ProxyPluginMgrCallback_OnPluginDestroyedSwigExplicitProxyPluginMgrCallback(swigCPtr, id, (int)type) : tinyWRAPPINVOKE.ProxyPluginMgrCallback_OnPluginDestroyed(swigCPtr, id, (int)type));
+    int ret = ((this.GetType() == typeof(ProxyPluginMgrCallback)) ? tinyWRAPPINVOKE.ProxyPluginMgrCallback_OnPluginDestroyed(swigCPtr, id, (int)type) : tinyWRAPPINVOKE.ProxyPluginMgrCallback_OnPluginDestroyedSwigExplicitProxyPluginMgrCallback(swigCPtr, id, (int)type));
     return ret;
   }
 
diff --git a/branches/2.0/doubango/bindings/csharp/ProxyVideoConsumer.cs b/branches/2.0/doubango/bindings/csharp/ProxyVideoConsumer.cs
index a60653bc..d8ebfe4d 100644
--- a/branches/2.0/doubango/bindings/csharp/ProxyVideoConsumer.cs
+++ b/branches/2.0/doubango/bindings/csharp/ProxyVideoConsumer.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -14,7 +14,7 @@ using System.Runtime.InteropServices;
 public class ProxyVideoConsumer : ProxyPlugin {
   private HandleRef swigCPtr;
 
-  internal ProxyVideoConsumer(IntPtr cPtr, bool cMemoryOwn) : base(tinyWRAPPINVOKE.ProxyVideoConsumer_SWIGUpcast(cPtr), cMemoryOwn) {
+  internal ProxyVideoConsumer(IntPtr cPtr, bool cMemoryOwn) : base(tinyWRAPPINVOKE.ProxyVideoConsumerUpcast(cPtr), cMemoryOwn) {
     swigCPtr = new HandleRef(this, cPtr);
   }
 
diff --git a/branches/2.0/doubango/bindings/csharp/ProxyVideoConsumerCallback.cs b/branches/2.0/doubango/bindings/csharp/ProxyVideoConsumerCallback.cs
index 1e740b4e..607628c3 100644
--- a/branches/2.0/doubango/bindings/csharp/ProxyVideoConsumerCallback.cs
+++ b/branches/2.0/doubango/bindings/csharp/ProxyVideoConsumerCallback.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -46,32 +46,32 @@ public class ProxyVideoConsumerCallback : IDisposable {
   }
 
   public virtual int prepare(int nWidth, int nHeight, int nFps) {
-    int ret = (SwigDerivedClassHasMethod("prepare", swigMethodTypes0) ? tinyWRAPPINVOKE.ProxyVideoConsumerCallback_prepareSwigExplicitProxyVideoConsumerCallback(swigCPtr, nWidth, nHeight, nFps) : tinyWRAPPINVOKE.ProxyVideoConsumerCallback_prepare(swigCPtr, nWidth, nHeight, nFps));
+    int ret = ((this.GetType() == typeof(ProxyVideoConsumerCallback)) ? tinyWRAPPINVOKE.ProxyVideoConsumerCallback_prepare(swigCPtr, nWidth, nHeight, nFps) : tinyWRAPPINVOKE.ProxyVideoConsumerCallback_prepareSwigExplicitProxyVideoConsumerCallback(swigCPtr, nWidth, nHeight, nFps));
     return ret;
   }
 
   public virtual int consume(ProxyVideoFrame frame) {
-    int ret = (SwigDerivedClassHasMethod("consume", swigMethodTypes1) ? tinyWRAPPINVOKE.ProxyVideoConsumerCallback_consumeSwigExplicitProxyVideoConsumerCallback(swigCPtr, ProxyVideoFrame.getCPtr(frame)) : tinyWRAPPINVOKE.ProxyVideoConsumerCallback_consume(swigCPtr, ProxyVideoFrame.getCPtr(frame)));
+    int ret = ((this.GetType() == typeof(ProxyVideoConsumerCallback)) ? tinyWRAPPINVOKE.ProxyVideoConsumerCallback_consume(swigCPtr, ProxyVideoFrame.getCPtr(frame)) : tinyWRAPPINVOKE.ProxyVideoConsumerCallback_consumeSwigExplicitProxyVideoConsumerCallback(swigCPtr, ProxyVideoFrame.getCPtr(frame)));
     return ret;
   }
 
   public virtual int bufferCopied(uint nCopiedSize, uint nAvailableSize) {
-    int ret = (SwigDerivedClassHasMethod("bufferCopied", swigMethodTypes2) ? tinyWRAPPINVOKE.ProxyVideoConsumerCallback_bufferCopiedSwigExplicitProxyVideoConsumerCallback(swigCPtr, nCopiedSize, nAvailableSize) : tinyWRAPPINVOKE.ProxyVideoConsumerCallback_bufferCopied(swigCPtr, nCopiedSize, nAvailableSize));
+    int ret = ((this.GetType() == typeof(ProxyVideoConsumerCallback)) ? tinyWRAPPINVOKE.ProxyVideoConsumerCallback_bufferCopied(swigCPtr, nCopiedSize, nAvailableSize) : tinyWRAPPINVOKE.ProxyVideoConsumerCallback_bufferCopiedSwigExplicitProxyVideoConsumerCallback(swigCPtr, nCopiedSize, nAvailableSize));
     return ret;
   }
 
   public virtual int start() {
-    int ret = (SwigDerivedClassHasMethod("start", swigMethodTypes3) ? tinyWRAPPINVOKE.ProxyVideoConsumerCallback_startSwigExplicitProxyVideoConsumerCallback(swigCPtr) : tinyWRAPPINVOKE.ProxyVideoConsumerCallback_start(swigCPtr));
+    int ret = ((this.GetType() == typeof(ProxyVideoConsumerCallback)) ? tinyWRAPPINVOKE.ProxyVideoConsumerCallback_start(swigCPtr) : tinyWRAPPINVOKE.ProxyVideoConsumerCallback_startSwigExplicitProxyVideoConsumerCallback(swigCPtr));
     return ret;
   }
 
   public virtual int pause() {
-    int ret = (SwigDerivedClassHasMethod("pause", swigMethodTypes4) ? tinyWRAPPINVOKE.ProxyVideoConsumerCallback_pauseSwigExplicitProxyVideoConsumerCallback(swigCPtr) : tinyWRAPPINVOKE.ProxyVideoConsumerCallback_pause(swigCPtr));
+    int ret = ((this.GetType() == typeof(ProxyVideoConsumerCallback)) ? tinyWRAPPINVOKE.ProxyVideoConsumerCallback_pause(swigCPtr) : tinyWRAPPINVOKE.ProxyVideoConsumerCallback_pauseSwigExplicitProxyVideoConsumerCallback(swigCPtr));
     return ret;
   }
 
   public virtual int stop() {
-    int ret = (SwigDerivedClassHasMethod("stop", swigMethodTypes5) ? tinyWRAPPINVOKE.ProxyVideoConsumerCallback_stopSwigExplicitProxyVideoConsumerCallback(swigCPtr) : tinyWRAPPINVOKE.ProxyVideoConsumerCallback_stop(swigCPtr));
+    int ret = ((this.GetType() == typeof(ProxyVideoConsumerCallback)) ? tinyWRAPPINVOKE.ProxyVideoConsumerCallback_stop(swigCPtr) : tinyWRAPPINVOKE.ProxyVideoConsumerCallback_stopSwigExplicitProxyVideoConsumerCallback(swigCPtr));
     return ret;
   }
 
diff --git a/branches/2.0/doubango/bindings/csharp/ProxyVideoFrame.cs b/branches/2.0/doubango/bindings/csharp/ProxyVideoFrame.cs
index cc133e36..c772d41c 100644
--- a/branches/2.0/doubango/bindings/csharp/ProxyVideoFrame.cs
+++ b/branches/2.0/doubango/bindings/csharp/ProxyVideoFrame.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/csharp/ProxyVideoProducer.cs b/branches/2.0/doubango/bindings/csharp/ProxyVideoProducer.cs
index eade7804..70fd6557 100644
--- a/branches/2.0/doubango/bindings/csharp/ProxyVideoProducer.cs
+++ b/branches/2.0/doubango/bindings/csharp/ProxyVideoProducer.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -14,7 +14,7 @@ using System.Runtime.InteropServices;
 public class ProxyVideoProducer : ProxyPlugin {
   private HandleRef swigCPtr;
 
-  internal ProxyVideoProducer(IntPtr cPtr, bool cMemoryOwn) : base(tinyWRAPPINVOKE.ProxyVideoProducer_SWIGUpcast(cPtr), cMemoryOwn) {
+  internal ProxyVideoProducer(IntPtr cPtr, bool cMemoryOwn) : base(tinyWRAPPINVOKE.ProxyVideoProducerUpcast(cPtr), cMemoryOwn) {
     swigCPtr = new HandleRef(this, cPtr);
   }
 
diff --git a/branches/2.0/doubango/bindings/csharp/ProxyVideoProducerCallback.cs b/branches/2.0/doubango/bindings/csharp/ProxyVideoProducerCallback.cs
index 0d1cfe2a..7920d900 100644
--- a/branches/2.0/doubango/bindings/csharp/ProxyVideoProducerCallback.cs
+++ b/branches/2.0/doubango/bindings/csharp/ProxyVideoProducerCallback.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -46,22 +46,22 @@ public class ProxyVideoProducerCallback : IDisposable {
   }
 
   public virtual int prepare(int width, int height, int fps) {
-    int ret = (SwigDerivedClassHasMethod("prepare", swigMethodTypes0) ? tinyWRAPPINVOKE.ProxyVideoProducerCallback_prepareSwigExplicitProxyVideoProducerCallback(swigCPtr, width, height, fps) : tinyWRAPPINVOKE.ProxyVideoProducerCallback_prepare(swigCPtr, width, height, fps));
+    int ret = ((this.GetType() == typeof(ProxyVideoProducerCallback)) ? tinyWRAPPINVOKE.ProxyVideoProducerCallback_prepare(swigCPtr, width, height, fps) : tinyWRAPPINVOKE.ProxyVideoProducerCallback_prepareSwigExplicitProxyVideoProducerCallback(swigCPtr, width, height, fps));
     return ret;
   }
 
   public virtual int start() {
-    int ret = (SwigDerivedClassHasMethod("start", swigMethodTypes1) ? tinyWRAPPINVOKE.ProxyVideoProducerCallback_startSwigExplicitProxyVideoProducerCallback(swigCPtr) : tinyWRAPPINVOKE.ProxyVideoProducerCallback_start(swigCPtr));
+    int ret = ((this.GetType() == typeof(ProxyVideoProducerCallback)) ? tinyWRAPPINVOKE.ProxyVideoProducerCallback_start(swigCPtr) : tinyWRAPPINVOKE.ProxyVideoProducerCallback_startSwigExplicitProxyVideoProducerCallback(swigCPtr));
     return ret;
   }
 
   public virtual int pause() {
-    int ret = (SwigDerivedClassHasMethod("pause", swigMethodTypes2) ? tinyWRAPPINVOKE.ProxyVideoProducerCallback_pauseSwigExplicitProxyVideoProducerCallback(swigCPtr) : tinyWRAPPINVOKE.ProxyVideoProducerCallback_pause(swigCPtr));
+    int ret = ((this.GetType() == typeof(ProxyVideoProducerCallback)) ? tinyWRAPPINVOKE.ProxyVideoProducerCallback_pause(swigCPtr) : tinyWRAPPINVOKE.ProxyVideoProducerCallback_pauseSwigExplicitProxyVideoProducerCallback(swigCPtr));
     return ret;
   }
 
   public virtual int stop() {
-    int ret = (SwigDerivedClassHasMethod("stop", swigMethodTypes3) ? tinyWRAPPINVOKE.ProxyVideoProducerCallback_stopSwigExplicitProxyVideoProducerCallback(swigCPtr) : tinyWRAPPINVOKE.ProxyVideoProducerCallback_stop(swigCPtr));
+    int ret = ((this.GetType() == typeof(ProxyVideoProducerCallback)) ? tinyWRAPPINVOKE.ProxyVideoProducerCallback_stop(swigCPtr) : tinyWRAPPINVOKE.ProxyVideoProducerCallback_stopSwigExplicitProxyVideoProducerCallback(swigCPtr));
     return ret;
   }
 
diff --git a/branches/2.0/doubango/bindings/csharp/PublicationEvent.cs b/branches/2.0/doubango/bindings/csharp/PublicationEvent.cs
index df20ffe2..f7078645 100644
--- a/branches/2.0/doubango/bindings/csharp/PublicationEvent.cs
+++ b/branches/2.0/doubango/bindings/csharp/PublicationEvent.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -14,7 +14,7 @@ using System.Runtime.InteropServices;
 public class PublicationEvent : SipEvent {
   private HandleRef swigCPtr;
 
-  internal PublicationEvent(IntPtr cPtr, bool cMemoryOwn) : base(tinyWRAPPINVOKE.PublicationEvent_SWIGUpcast(cPtr), cMemoryOwn) {
+  internal PublicationEvent(IntPtr cPtr, bool cMemoryOwn) : base(tinyWRAPPINVOKE.PublicationEventUpcast(cPtr), cMemoryOwn) {
     swigCPtr = new HandleRef(this, cPtr);
   }
 
diff --git a/branches/2.0/doubango/bindings/csharp/PublicationSession.cs b/branches/2.0/doubango/bindings/csharp/PublicationSession.cs
index b27ce417..5067783d 100644
--- a/branches/2.0/doubango/bindings/csharp/PublicationSession.cs
+++ b/branches/2.0/doubango/bindings/csharp/PublicationSession.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -14,7 +14,7 @@ using System.Runtime.InteropServices;
 public class PublicationSession : SipSession {
   private HandleRef swigCPtr;
 
-  internal PublicationSession(IntPtr cPtr, bool cMemoryOwn) : base(tinyWRAPPINVOKE.PublicationSession_SWIGUpcast(cPtr), cMemoryOwn) {
+  internal PublicationSession(IntPtr cPtr, bool cMemoryOwn) : base(tinyWRAPPINVOKE.PublicationSessionUpcast(cPtr), cMemoryOwn) {
     swigCPtr = new HandleRef(this, cPtr);
   }
 
diff --git a/branches/2.0/doubango/bindings/csharp/RPMessage.cs b/branches/2.0/doubango/bindings/csharp/RPMessage.cs
index 44f92742..b8e76be9 100644
--- a/branches/2.0/doubango/bindings/csharp/RPMessage.cs
+++ b/branches/2.0/doubango/bindings/csharp/RPMessage.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/csharp/RegistrationEvent.cs b/branches/2.0/doubango/bindings/csharp/RegistrationEvent.cs
index d6268b48..01b15394 100644
--- a/branches/2.0/doubango/bindings/csharp/RegistrationEvent.cs
+++ b/branches/2.0/doubango/bindings/csharp/RegistrationEvent.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -14,7 +14,7 @@ using System.Runtime.InteropServices;
 public class RegistrationEvent : SipEvent {
   private HandleRef swigCPtr;
 
-  internal RegistrationEvent(IntPtr cPtr, bool cMemoryOwn) : base(tinyWRAPPINVOKE.RegistrationEvent_SWIGUpcast(cPtr), cMemoryOwn) {
+  internal RegistrationEvent(IntPtr cPtr, bool cMemoryOwn) : base(tinyWRAPPINVOKE.RegistrationEventUpcast(cPtr), cMemoryOwn) {
     swigCPtr = new HandleRef(this, cPtr);
   }
 
diff --git a/branches/2.0/doubango/bindings/csharp/RegistrationSession.cs b/branches/2.0/doubango/bindings/csharp/RegistrationSession.cs
index c1191f4d..868f9ba6 100644
--- a/branches/2.0/doubango/bindings/csharp/RegistrationSession.cs
+++ b/branches/2.0/doubango/bindings/csharp/RegistrationSession.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -14,7 +14,7 @@ using System.Runtime.InteropServices;
 public class RegistrationSession : SipSession {
   private HandleRef swigCPtr;
 
-  internal RegistrationSession(IntPtr cPtr, bool cMemoryOwn) : base(tinyWRAPPINVOKE.RegistrationSession_SWIGUpcast(cPtr), cMemoryOwn) {
+  internal RegistrationSession(IntPtr cPtr, bool cMemoryOwn) : base(tinyWRAPPINVOKE.RegistrationSessionUpcast(cPtr), cMemoryOwn) {
     swigCPtr = new HandleRef(this, cPtr);
   }
 
diff --git a/branches/2.0/doubango/bindings/csharp/SMSData.cs b/branches/2.0/doubango/bindings/csharp/SMSData.cs
index 30508020..dc3ba4c7 100644
--- a/branches/2.0/doubango/bindings/csharp/SMSData.cs
+++ b/branches/2.0/doubango/bindings/csharp/SMSData.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/csharp/SMSEncoder.cs b/branches/2.0/doubango/bindings/csharp/SMSEncoder.cs
index 19df1fde..6f488510 100644
--- a/branches/2.0/doubango/bindings/csharp/SMSEncoder.cs
+++ b/branches/2.0/doubango/bindings/csharp/SMSEncoder.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/csharp/SafeObject.cs b/branches/2.0/doubango/bindings/csharp/SafeObject.cs
index ead0333a..e7addc56 100644
--- a/branches/2.0/doubango/bindings/csharp/SafeObject.cs
+++ b/branches/2.0/doubango/bindings/csharp/SafeObject.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/csharp/SdpMessage.cs b/branches/2.0/doubango/bindings/csharp/SdpMessage.cs
index 8f59a009..50e03065 100644
--- a/branches/2.0/doubango/bindings/csharp/SdpMessage.cs
+++ b/branches/2.0/doubango/bindings/csharp/SdpMessage.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/csharp/SipCallback.cs b/branches/2.0/doubango/bindings/csharp/SipCallback.cs
index 0505f7b0..216aee0a 100644
--- a/branches/2.0/doubango/bindings/csharp/SipCallback.cs
+++ b/branches/2.0/doubango/bindings/csharp/SipCallback.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -46,47 +46,47 @@ public class SipCallback : IDisposable {
   }
 
   public virtual int OnDialogEvent(DialogEvent e) {
-    int ret = (SwigDerivedClassHasMethod("OnDialogEvent", swigMethodTypes0) ? tinyWRAPPINVOKE.SipCallback_OnDialogEventSwigExplicitSipCallback(swigCPtr, DialogEvent.getCPtr(e)) : tinyWRAPPINVOKE.SipCallback_OnDialogEvent(swigCPtr, DialogEvent.getCPtr(e)));
+    int ret = ((this.GetType() == typeof(SipCallback)) ? tinyWRAPPINVOKE.SipCallback_OnDialogEvent(swigCPtr, DialogEvent.getCPtr(e)) : tinyWRAPPINVOKE.SipCallback_OnDialogEventSwigExplicitSipCallback(swigCPtr, DialogEvent.getCPtr(e)));
     return ret;
   }
 
   public virtual int OnStackEvent(StackEvent e) {
-    int ret = (SwigDerivedClassHasMethod("OnStackEvent", swigMethodTypes1) ? tinyWRAPPINVOKE.SipCallback_OnStackEventSwigExplicitSipCallback(swigCPtr, StackEvent.getCPtr(e)) : tinyWRAPPINVOKE.SipCallback_OnStackEvent(swigCPtr, StackEvent.getCPtr(e)));
+    int ret = ((this.GetType() == typeof(SipCallback)) ? tinyWRAPPINVOKE.SipCallback_OnStackEvent(swigCPtr, StackEvent.getCPtr(e)) : tinyWRAPPINVOKE.SipCallback_OnStackEventSwigExplicitSipCallback(swigCPtr, StackEvent.getCPtr(e)));
     return ret;
   }
 
   public virtual int OnInviteEvent(InviteEvent e) {
-    int ret = (SwigDerivedClassHasMethod("OnInviteEvent", swigMethodTypes2) ? tinyWRAPPINVOKE.SipCallback_OnInviteEventSwigExplicitSipCallback(swigCPtr, InviteEvent.getCPtr(e)) : tinyWRAPPINVOKE.SipCallback_OnInviteEvent(swigCPtr, InviteEvent.getCPtr(e)));
+    int ret = ((this.GetType() == typeof(SipCallback)) ? tinyWRAPPINVOKE.SipCallback_OnInviteEvent(swigCPtr, InviteEvent.getCPtr(e)) : tinyWRAPPINVOKE.SipCallback_OnInviteEventSwigExplicitSipCallback(swigCPtr, InviteEvent.getCPtr(e)));
     return ret;
   }
 
   public virtual int OnMessagingEvent(MessagingEvent e) {
-    int ret = (SwigDerivedClassHasMethod("OnMessagingEvent", swigMethodTypes3) ? tinyWRAPPINVOKE.SipCallback_OnMessagingEventSwigExplicitSipCallback(swigCPtr, MessagingEvent.getCPtr(e)) : tinyWRAPPINVOKE.SipCallback_OnMessagingEvent(swigCPtr, MessagingEvent.getCPtr(e)));
+    int ret = ((this.GetType() == typeof(SipCallback)) ? tinyWRAPPINVOKE.SipCallback_OnMessagingEvent(swigCPtr, MessagingEvent.getCPtr(e)) : tinyWRAPPINVOKE.SipCallback_OnMessagingEventSwigExplicitSipCallback(swigCPtr, MessagingEvent.getCPtr(e)));
     return ret;
   }
 
   public virtual int OnInfoEvent(InfoEvent e) {
-    int ret = (SwigDerivedClassHasMethod("OnInfoEvent", swigMethodTypes4) ? tinyWRAPPINVOKE.SipCallback_OnInfoEventSwigExplicitSipCallback(swigCPtr, InfoEvent.getCPtr(e)) : tinyWRAPPINVOKE.SipCallback_OnInfoEvent(swigCPtr, InfoEvent.getCPtr(e)));
+    int ret = ((this.GetType() == typeof(SipCallback)) ? tinyWRAPPINVOKE.SipCallback_OnInfoEvent(swigCPtr, InfoEvent.getCPtr(e)) : tinyWRAPPINVOKE.SipCallback_OnInfoEventSwigExplicitSipCallback(swigCPtr, InfoEvent.getCPtr(e)));
     return ret;
   }
 
   public virtual int OnOptionsEvent(OptionsEvent e) {
-    int ret = (SwigDerivedClassHasMethod("OnOptionsEvent", swigMethodTypes5) ? tinyWRAPPINVOKE.SipCallback_OnOptionsEventSwigExplicitSipCallback(swigCPtr, OptionsEvent.getCPtr(e)) : tinyWRAPPINVOKE.SipCallback_OnOptionsEvent(swigCPtr, OptionsEvent.getCPtr(e)));
+    int ret = ((this.GetType() == typeof(SipCallback)) ? tinyWRAPPINVOKE.SipCallback_OnOptionsEvent(swigCPtr, OptionsEvent.getCPtr(e)) : tinyWRAPPINVOKE.SipCallback_OnOptionsEventSwigExplicitSipCallback(swigCPtr, OptionsEvent.getCPtr(e)));
     return ret;
   }
 
   public virtual int OnPublicationEvent(PublicationEvent e) {
-    int ret = (SwigDerivedClassHasMethod("OnPublicationEvent", swigMethodTypes6) ? tinyWRAPPINVOKE.SipCallback_OnPublicationEventSwigExplicitSipCallback(swigCPtr, PublicationEvent.getCPtr(e)) : tinyWRAPPINVOKE.SipCallback_OnPublicationEvent(swigCPtr, PublicationEvent.getCPtr(e)));
+    int ret = ((this.GetType() == typeof(SipCallback)) ? tinyWRAPPINVOKE.SipCallback_OnPublicationEvent(swigCPtr, PublicationEvent.getCPtr(e)) : tinyWRAPPINVOKE.SipCallback_OnPublicationEventSwigExplicitSipCallback(swigCPtr, PublicationEvent.getCPtr(e)));
     return ret;
   }
 
   public virtual int OnRegistrationEvent(RegistrationEvent e) {
-    int ret = (SwigDerivedClassHasMethod("OnRegistrationEvent", swigMethodTypes7) ? tinyWRAPPINVOKE.SipCallback_OnRegistrationEventSwigExplicitSipCallback(swigCPtr, RegistrationEvent.getCPtr(e)) : tinyWRAPPINVOKE.SipCallback_OnRegistrationEvent(swigCPtr, RegistrationEvent.getCPtr(e)));
+    int ret = ((this.GetType() == typeof(SipCallback)) ? tinyWRAPPINVOKE.SipCallback_OnRegistrationEvent(swigCPtr, RegistrationEvent.getCPtr(e)) : tinyWRAPPINVOKE.SipCallback_OnRegistrationEventSwigExplicitSipCallback(swigCPtr, RegistrationEvent.getCPtr(e)));
     return ret;
   }
 
   public virtual int OnSubscriptionEvent(SubscriptionEvent e) {
-    int ret = (SwigDerivedClassHasMethod("OnSubscriptionEvent", swigMethodTypes8) ? tinyWRAPPINVOKE.SipCallback_OnSubscriptionEventSwigExplicitSipCallback(swigCPtr, SubscriptionEvent.getCPtr(e)) : tinyWRAPPINVOKE.SipCallback_OnSubscriptionEvent(swigCPtr, SubscriptionEvent.getCPtr(e)));
+    int ret = ((this.GetType() == typeof(SipCallback)) ? tinyWRAPPINVOKE.SipCallback_OnSubscriptionEvent(swigCPtr, SubscriptionEvent.getCPtr(e)) : tinyWRAPPINVOKE.SipCallback_OnSubscriptionEventSwigExplicitSipCallback(swigCPtr, SubscriptionEvent.getCPtr(e)));
     return ret;
   }
 
diff --git a/branches/2.0/doubango/bindings/csharp/SipEvent.cs b/branches/2.0/doubango/bindings/csharp/SipEvent.cs
index 553b98f3..da912557 100644
--- a/branches/2.0/doubango/bindings/csharp/SipEvent.cs
+++ b/branches/2.0/doubango/bindings/csharp/SipEvent.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/csharp/SipMessage.cs b/branches/2.0/doubango/bindings/csharp/SipMessage.cs
index 657c1b87..07e0cfb4 100644
--- a/branches/2.0/doubango/bindings/csharp/SipMessage.cs
+++ b/branches/2.0/doubango/bindings/csharp/SipMessage.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/csharp/SipSession.cs b/branches/2.0/doubango/bindings/csharp/SipSession.cs
index cbc418e7..03cd3fa9 100644
--- a/branches/2.0/doubango/bindings/csharp/SipSession.cs
+++ b/branches/2.0/doubango/bindings/csharp/SipSession.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/csharp/SipStack.cs b/branches/2.0/doubango/bindings/csharp/SipStack.cs
index 14593253..d1c4bc4b 100644
--- a/branches/2.0/doubango/bindings/csharp/SipStack.cs
+++ b/branches/2.0/doubango/bindings/csharp/SipStack.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -14,7 +14,7 @@ using System.Runtime.InteropServices;
 public class SipStack : SafeObject {
   private HandleRef swigCPtr;
 
-  internal SipStack(IntPtr cPtr, bool cMemoryOwn) : base(tinyWRAPPINVOKE.SipStack_SWIGUpcast(cPtr), cMemoryOwn) {
+  internal SipStack(IntPtr cPtr, bool cMemoryOwn) : base(tinyWRAPPINVOKE.SipStackUpcast(cPtr), cMemoryOwn) {
     swigCPtr = new HandleRef(this, cPtr);
   }
 
diff --git a/branches/2.0/doubango/bindings/csharp/SipUri.cs b/branches/2.0/doubango/bindings/csharp/SipUri.cs
index 9679a66d..8da47585 100644
--- a/branches/2.0/doubango/bindings/csharp/SipUri.cs
+++ b/branches/2.0/doubango/bindings/csharp/SipUri.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/csharp/StackEvent.cs b/branches/2.0/doubango/bindings/csharp/StackEvent.cs
index 1ca9068f..76b3d075 100644
--- a/branches/2.0/doubango/bindings/csharp/StackEvent.cs
+++ b/branches/2.0/doubango/bindings/csharp/StackEvent.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -14,7 +14,7 @@ using System.Runtime.InteropServices;
 public class StackEvent : SipEvent {
   private HandleRef swigCPtr;
 
-  internal StackEvent(IntPtr cPtr, bool cMemoryOwn) : base(tinyWRAPPINVOKE.StackEvent_SWIGUpcast(cPtr), cMemoryOwn) {
+  internal StackEvent(IntPtr cPtr, bool cMemoryOwn) : base(tinyWRAPPINVOKE.StackEventUpcast(cPtr), cMemoryOwn) {
     swigCPtr = new HandleRef(this, cPtr);
   }
 
diff --git a/branches/2.0/doubango/bindings/csharp/SubscriptionEvent.cs b/branches/2.0/doubango/bindings/csharp/SubscriptionEvent.cs
index cbc3c410..692c428e 100644
--- a/branches/2.0/doubango/bindings/csharp/SubscriptionEvent.cs
+++ b/branches/2.0/doubango/bindings/csharp/SubscriptionEvent.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -14,7 +14,7 @@ using System.Runtime.InteropServices;
 public class SubscriptionEvent : SipEvent {
   private HandleRef swigCPtr;
 
-  internal SubscriptionEvent(IntPtr cPtr, bool cMemoryOwn) : base(tinyWRAPPINVOKE.SubscriptionEvent_SWIGUpcast(cPtr), cMemoryOwn) {
+  internal SubscriptionEvent(IntPtr cPtr, bool cMemoryOwn) : base(tinyWRAPPINVOKE.SubscriptionEventUpcast(cPtr), cMemoryOwn) {
     swigCPtr = new HandleRef(this, cPtr);
   }
 
diff --git a/branches/2.0/doubango/bindings/csharp/SubscriptionSession.cs b/branches/2.0/doubango/bindings/csharp/SubscriptionSession.cs
index a9b2e907..6549822b 100644
--- a/branches/2.0/doubango/bindings/csharp/SubscriptionSession.cs
+++ b/branches/2.0/doubango/bindings/csharp/SubscriptionSession.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -14,7 +14,7 @@ using System.Runtime.InteropServices;
 public class SubscriptionSession : SipSession {
   private HandleRef swigCPtr;
 
-  internal SubscriptionSession(IntPtr cPtr, bool cMemoryOwn) : base(tinyWRAPPINVOKE.SubscriptionSession_SWIGUpcast(cPtr), cMemoryOwn) {
+  internal SubscriptionSession(IntPtr cPtr, bool cMemoryOwn) : base(tinyWRAPPINVOKE.SubscriptionSessionUpcast(cPtr), cMemoryOwn) {
     swigCPtr = new HandleRef(this, cPtr);
   }
 
diff --git a/branches/2.0/doubango/bindings/csharp/T140Callback.cs b/branches/2.0/doubango/bindings/csharp/T140Callback.cs
index a32e3924..b878d2d2 100644
--- a/branches/2.0/doubango/bindings/csharp/T140Callback.cs
+++ b/branches/2.0/doubango/bindings/csharp/T140Callback.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -46,7 +46,7 @@ public class T140Callback : IDisposable {
   }
 
   public virtual int ondata(T140CallbackData pData) {
-    int ret = (SwigDerivedClassHasMethod("ondata", swigMethodTypes0) ? tinyWRAPPINVOKE.T140Callback_ondataSwigExplicitT140Callback(swigCPtr, T140CallbackData.getCPtr(pData)) : tinyWRAPPINVOKE.T140Callback_ondata(swigCPtr, T140CallbackData.getCPtr(pData)));
+    int ret = ((this.GetType() == typeof(T140Callback)) ? tinyWRAPPINVOKE.T140Callback_ondata(swigCPtr, T140CallbackData.getCPtr(pData)) : tinyWRAPPINVOKE.T140Callback_ondataSwigExplicitT140Callback(swigCPtr, T140CallbackData.getCPtr(pData)));
     return ret;
   }
 
diff --git a/branches/2.0/doubango/bindings/csharp/T140CallbackData.cs b/branches/2.0/doubango/bindings/csharp/T140CallbackData.cs
index f5e53855..b814d16d 100644
--- a/branches/2.0/doubango/bindings/csharp/T140CallbackData.cs
+++ b/branches/2.0/doubango/bindings/csharp/T140CallbackData.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/csharp/XcapCallback.cs b/branches/2.0/doubango/bindings/csharp/XcapCallback.cs
index a1e340a5..c0cf0057 100644
--- a/branches/2.0/doubango/bindings/csharp/XcapCallback.cs
+++ b/branches/2.0/doubango/bindings/csharp/XcapCallback.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -46,7 +46,7 @@ public class XcapCallback : IDisposable {
   }
 
   public virtual int onEvent(XcapEvent e) {
-    int ret = (SwigDerivedClassHasMethod("onEvent", swigMethodTypes0) ? tinyWRAPPINVOKE.XcapCallback_onEventSwigExplicitXcapCallback(swigCPtr, XcapEvent.getCPtr(e)) : tinyWRAPPINVOKE.XcapCallback_onEvent(swigCPtr, XcapEvent.getCPtr(e)));
+    int ret = ((this.GetType() == typeof(XcapCallback)) ? tinyWRAPPINVOKE.XcapCallback_onEvent(swigCPtr, XcapEvent.getCPtr(e)) : tinyWRAPPINVOKE.XcapCallback_onEventSwigExplicitXcapCallback(swigCPtr, XcapEvent.getCPtr(e)));
     return ret;
   }
 
diff --git a/branches/2.0/doubango/bindings/csharp/XcapEvent.cs b/branches/2.0/doubango/bindings/csharp/XcapEvent.cs
index 8ec23c75..3d13a61d 100644
--- a/branches/2.0/doubango/bindings/csharp/XcapEvent.cs
+++ b/branches/2.0/doubango/bindings/csharp/XcapEvent.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/csharp/XcapMessage.cs b/branches/2.0/doubango/bindings/csharp/XcapMessage.cs
index 1f13295c..b176a9bb 100644
--- a/branches/2.0/doubango/bindings/csharp/XcapMessage.cs
+++ b/branches/2.0/doubango/bindings/csharp/XcapMessage.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/csharp/XcapSelector.cs b/branches/2.0/doubango/bindings/csharp/XcapSelector.cs
index 5eb77a35..f857879d 100644
--- a/branches/2.0/doubango/bindings/csharp/XcapSelector.cs
+++ b/branches/2.0/doubango/bindings/csharp/XcapSelector.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/csharp/XcapStack.cs b/branches/2.0/doubango/bindings/csharp/XcapStack.cs
index 43459d81..fd6b42e9 100644
--- a/branches/2.0/doubango/bindings/csharp/XcapStack.cs
+++ b/branches/2.0/doubango/bindings/csharp/XcapStack.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/csharp/tdav_codec_id_t.cs b/branches/2.0/doubango/bindings/csharp/tdav_codec_id_t.cs
index 98f5f699..256936a0 100644
--- a/branches/2.0/doubango/bindings/csharp/tdav_codec_id_t.cs
+++ b/branches/2.0/doubango/bindings/csharp/tdav_codec_id_t.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/csharp/thttp_event_type_t.cs b/branches/2.0/doubango/bindings/csharp/thttp_event_type_t.cs
index 82fc9f10..c728e958 100644
--- a/branches/2.0/doubango/bindings/csharp/thttp_event_type_t.cs
+++ b/branches/2.0/doubango/bindings/csharp/thttp_event_type_t.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/csharp/tinyWRAP.cs b/branches/2.0/doubango/bindings/csharp/tinyWRAP.cs
index 91b84fc0..093266fd 100644
--- a/branches/2.0/doubango/bindings/csharp/tinyWRAP.cs
+++ b/branches/2.0/doubango/bindings/csharp/tinyWRAP.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/csharp/tinyWRAPPINVOKE.cs b/branches/2.0/doubango/bindings/csharp/tinyWRAPPINVOKE.cs
index 0dade0ef..8a56d49d 100644
--- a/branches/2.0/doubango/bindings/csharp/tinyWRAPPINVOKE.cs
+++ b/branches/2.0/doubango/bindings/csharp/tinyWRAPPINVOKE.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -185,10 +185,6 @@ class tinyWRAPPINVOKE {
   static protected SWIGStringHelper swigStringHelper = new SWIGStringHelper();
 
 
-  static tinyWRAPPINVOKE() {
-  }
-
-
   [DllImport("tinyWRAP", EntryPoint="CSharp_new_DDebugCallback")]
   public static extern IntPtr new_DDebugCallback();
 
@@ -2109,77 +2105,77 @@ class tinyWRAPPINVOKE {
   [DllImport("tinyWRAP", EntryPoint="CSharp_MsrpCallback_director_connect")]
   public static extern void MsrpCallback_director_connect(HandleRef jarg1, MsrpCallback.SwigDelegateMsrpCallback_0 delegate0);
 
-  [DllImport("tinyWRAP", EntryPoint="CSharp_MediaContentCPIM_SWIGUpcast")]
-  public static extern IntPtr MediaContentCPIM_SWIGUpcast(IntPtr jarg1);
+  [DllImport("tinyWRAP", EntryPoint="CSharp_MediaContentCPIMUpcast")]
+  public static extern IntPtr MediaContentCPIMUpcast(IntPtr objectRef);
 
-  [DllImport("tinyWRAP", EntryPoint="CSharp_DialogEvent_SWIGUpcast")]
-  public static extern IntPtr DialogEvent_SWIGUpcast(IntPtr jarg1);
+  [DllImport("tinyWRAP", EntryPoint="CSharp_DialogEventUpcast")]
+  public static extern IntPtr DialogEventUpcast(IntPtr objectRef);
 
-  [DllImport("tinyWRAP", EntryPoint="CSharp_StackEvent_SWIGUpcast")]
-  public static extern IntPtr StackEvent_SWIGUpcast(IntPtr jarg1);
+  [DllImport("tinyWRAP", EntryPoint="CSharp_StackEventUpcast")]
+  public static extern IntPtr StackEventUpcast(IntPtr objectRef);
 
-  [DllImport("tinyWRAP", EntryPoint="CSharp_InviteEvent_SWIGUpcast")]
-  public static extern IntPtr InviteEvent_SWIGUpcast(IntPtr jarg1);
+  [DllImport("tinyWRAP", EntryPoint="CSharp_InviteEventUpcast")]
+  public static extern IntPtr InviteEventUpcast(IntPtr objectRef);
 
-  [DllImport("tinyWRAP", EntryPoint="CSharp_MessagingEvent_SWIGUpcast")]
-  public static extern IntPtr MessagingEvent_SWIGUpcast(IntPtr jarg1);
+  [DllImport("tinyWRAP", EntryPoint="CSharp_MessagingEventUpcast")]
+  public static extern IntPtr MessagingEventUpcast(IntPtr objectRef);
 
-  [DllImport("tinyWRAP", EntryPoint="CSharp_InfoEvent_SWIGUpcast")]
-  public static extern IntPtr InfoEvent_SWIGUpcast(IntPtr jarg1);
+  [DllImport("tinyWRAP", EntryPoint="CSharp_InfoEventUpcast")]
+  public static extern IntPtr InfoEventUpcast(IntPtr objectRef);
 
-  [DllImport("tinyWRAP", EntryPoint="CSharp_OptionsEvent_SWIGUpcast")]
-  public static extern IntPtr OptionsEvent_SWIGUpcast(IntPtr jarg1);
+  [DllImport("tinyWRAP", EntryPoint="CSharp_OptionsEventUpcast")]
+  public static extern IntPtr OptionsEventUpcast(IntPtr objectRef);
 
-  [DllImport("tinyWRAP", EntryPoint="CSharp_PublicationEvent_SWIGUpcast")]
-  public static extern IntPtr PublicationEvent_SWIGUpcast(IntPtr jarg1);
+  [DllImport("tinyWRAP", EntryPoint="CSharp_PublicationEventUpcast")]
+  public static extern IntPtr PublicationEventUpcast(IntPtr objectRef);
 
-  [DllImport("tinyWRAP", EntryPoint="CSharp_RegistrationEvent_SWIGUpcast")]
-  public static extern IntPtr RegistrationEvent_SWIGUpcast(IntPtr jarg1);
+  [DllImport("tinyWRAP", EntryPoint="CSharp_RegistrationEventUpcast")]
+  public static extern IntPtr RegistrationEventUpcast(IntPtr objectRef);
 
-  [DllImport("tinyWRAP", EntryPoint="CSharp_SubscriptionEvent_SWIGUpcast")]
-  public static extern IntPtr SubscriptionEvent_SWIGUpcast(IntPtr jarg1);
+  [DllImport("tinyWRAP", EntryPoint="CSharp_SubscriptionEventUpcast")]
+  public static extern IntPtr SubscriptionEventUpcast(IntPtr objectRef);
 
-  [DllImport("tinyWRAP", EntryPoint="CSharp_InviteSession_SWIGUpcast")]
-  public static extern IntPtr InviteSession_SWIGUpcast(IntPtr jarg1);
+  [DllImport("tinyWRAP", EntryPoint="CSharp_InviteSessionUpcast")]
+  public static extern IntPtr InviteSessionUpcast(IntPtr objectRef);
 
-  [DllImport("tinyWRAP", EntryPoint="CSharp_CallSession_SWIGUpcast")]
-  public static extern IntPtr CallSession_SWIGUpcast(IntPtr jarg1);
+  [DllImport("tinyWRAP", EntryPoint="CSharp_CallSessionUpcast")]
+  public static extern IntPtr CallSessionUpcast(IntPtr objectRef);
 
-  [DllImport("tinyWRAP", EntryPoint="CSharp_MsrpSession_SWIGUpcast")]
-  public static extern IntPtr MsrpSession_SWIGUpcast(IntPtr jarg1);
+  [DllImport("tinyWRAP", EntryPoint="CSharp_MsrpSessionUpcast")]
+  public static extern IntPtr MsrpSessionUpcast(IntPtr objectRef);
 
-  [DllImport("tinyWRAP", EntryPoint="CSharp_MessagingSession_SWIGUpcast")]
-  public static extern IntPtr MessagingSession_SWIGUpcast(IntPtr jarg1);
+  [DllImport("tinyWRAP", EntryPoint="CSharp_MessagingSessionUpcast")]
+  public static extern IntPtr MessagingSessionUpcast(IntPtr objectRef);
 
-  [DllImport("tinyWRAP", EntryPoint="CSharp_InfoSession_SWIGUpcast")]
-  public static extern IntPtr InfoSession_SWIGUpcast(IntPtr jarg1);
+  [DllImport("tinyWRAP", EntryPoint="CSharp_InfoSessionUpcast")]
+  public static extern IntPtr InfoSessionUpcast(IntPtr objectRef);
 
-  [DllImport("tinyWRAP", EntryPoint="CSharp_OptionsSession_SWIGUpcast")]
-  public static extern IntPtr OptionsSession_SWIGUpcast(IntPtr jarg1);
+  [DllImport("tinyWRAP", EntryPoint="CSharp_OptionsSessionUpcast")]
+  public static extern IntPtr OptionsSessionUpcast(IntPtr objectRef);
 
-  [DllImport("tinyWRAP", EntryPoint="CSharp_PublicationSession_SWIGUpcast")]
-  public static extern IntPtr PublicationSession_SWIGUpcast(IntPtr jarg1);
+  [DllImport("tinyWRAP", EntryPoint="CSharp_PublicationSessionUpcast")]
+  public static extern IntPtr PublicationSessionUpcast(IntPtr objectRef);
 
-  [DllImport("tinyWRAP", EntryPoint="CSharp_RegistrationSession_SWIGUpcast")]
-  public static extern IntPtr RegistrationSession_SWIGUpcast(IntPtr jarg1);
+  [DllImport("tinyWRAP", EntryPoint="CSharp_RegistrationSessionUpcast")]
+  public static extern IntPtr RegistrationSessionUpcast(IntPtr objectRef);
 
-  [DllImport("tinyWRAP", EntryPoint="CSharp_SubscriptionSession_SWIGUpcast")]
-  public static extern IntPtr SubscriptionSession_SWIGUpcast(IntPtr jarg1);
+  [DllImport("tinyWRAP", EntryPoint="CSharp_SubscriptionSessionUpcast")]
+  public static extern IntPtr SubscriptionSessionUpcast(IntPtr objectRef);
 
-  [DllImport("tinyWRAP", EntryPoint="CSharp_ProxyAudioConsumer_SWIGUpcast")]
-  public static extern IntPtr ProxyAudioConsumer_SWIGUpcast(IntPtr jarg1);
+  [DllImport("tinyWRAP", EntryPoint="CSharp_ProxyAudioConsumerUpcast")]
+  public static extern IntPtr ProxyAudioConsumerUpcast(IntPtr objectRef);
 
-  [DllImport("tinyWRAP", EntryPoint="CSharp_ProxyVideoConsumer_SWIGUpcast")]
-  public static extern IntPtr ProxyVideoConsumer_SWIGUpcast(IntPtr jarg1);
+  [DllImport("tinyWRAP", EntryPoint="CSharp_ProxyVideoConsumerUpcast")]
+  public static extern IntPtr ProxyVideoConsumerUpcast(IntPtr objectRef);
 
-  [DllImport("tinyWRAP", EntryPoint="CSharp_ProxyAudioProducer_SWIGUpcast")]
-  public static extern IntPtr ProxyAudioProducer_SWIGUpcast(IntPtr jarg1);
+  [DllImport("tinyWRAP", EntryPoint="CSharp_ProxyAudioProducerUpcast")]
+  public static extern IntPtr ProxyAudioProducerUpcast(IntPtr objectRef);
 
-  [DllImport("tinyWRAP", EntryPoint="CSharp_ProxyVideoProducer_SWIGUpcast")]
-  public static extern IntPtr ProxyVideoProducer_SWIGUpcast(IntPtr jarg1);
+  [DllImport("tinyWRAP", EntryPoint="CSharp_ProxyVideoProducerUpcast")]
+  public static extern IntPtr ProxyVideoProducerUpcast(IntPtr objectRef);
 
-  [DllImport("tinyWRAP", EntryPoint="CSharp_SipStack_SWIGUpcast")]
-  public static extern IntPtr SipStack_SWIGUpcast(IntPtr jarg1);
+  [DllImport("tinyWRAP", EntryPoint="CSharp_SipStackUpcast")]
+  public static extern IntPtr SipStackUpcast(IntPtr objectRef);
 }
 
 }
diff --git a/branches/2.0/doubango/bindings/csharp/tinyWRAP_wrap.cxx b/branches/2.0/doubango/bindings/csharp/tinyWRAP_wrap.cxx
index 0cc0d0a9..f85a5b87 100644
--- a/branches/2.0/doubango/bindings/csharp/tinyWRAP_wrap.cxx
+++ b/branches/2.0/doubango/bindings/csharp/tinyWRAP_wrap.cxx
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  * 
  * 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
@@ -281,6 +281,9 @@ SWIGEXPORT void SWIGSTDCALL SWIGRegisterStringCallback_tinyWRAP(SWIG_CSharpStrin
 #define SWIG_contract_assert(nullreturn, expr, msg) if (!(expr)) {SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentOutOfRangeException, msg, ""); return nullreturn; } else
 
 /* -----------------------------------------------------------------------------
+ * See the LICENSE file for information on copyright, usage and redistribution
+ * of SWIG, and the README file for authors - http://www.swig.org/release.html.
+ *
  * director.swg
  *
  * This file contains support for director classes so that C# proxy 
@@ -7991,7 +7994,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_tsip_event_code_dialog_transport_error_get() {
   int jresult ;
   int result;
   
-  result = (int)(702);
+  result = (int) 702;
   jresult = result; 
   return jresult;
 }
@@ -8001,7 +8004,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_tsip_event_code_dialog_global_error_get() {
   int jresult ;
   int result;
   
-  result = (int)(703);
+  result = (int) 703;
   jresult = result; 
   return jresult;
 }
@@ -8011,7 +8014,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_tsip_event_code_dialog_message_error_get() {
   int jresult ;
   int result;
   
-  result = (int)(704);
+  result = (int) 704;
   jresult = result; 
   return jresult;
 }
@@ -8021,7 +8024,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_tsip_event_code_dialog_request_incoming_get()
   int jresult ;
   int result;
   
-  result = (int)(800);
+  result = (int) 800;
   jresult = result; 
   return jresult;
 }
@@ -8031,7 +8034,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_tsip_event_code_dialog_request_outgoing_get()
   int jresult ;
   int result;
   
-  result = (int)(802);
+  result = (int) 802;
   jresult = result; 
   return jresult;
 }
@@ -8041,7 +8044,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_tsip_event_code_dialog_request_cancelled_get()
   int jresult ;
   int result;
   
-  result = (int)(803);
+  result = (int) 803;
   jresult = result; 
   return jresult;
 }
@@ -8051,7 +8054,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_tsip_event_code_dialog_request_sent_get() {
   int jresult ;
   int result;
   
-  result = (int)(804);
+  result = (int) 804;
   jresult = result; 
   return jresult;
 }
@@ -8061,7 +8064,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_tsip_event_code_dialog_connecting_get() {
   int jresult ;
   int result;
   
-  result = (int)(900);
+  result = (int) 900;
   jresult = result; 
   return jresult;
 }
@@ -8071,7 +8074,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_tsip_event_code_dialog_connected_get() {
   int jresult ;
   int result;
   
-  result = (int)(901);
+  result = (int) 901;
   jresult = result; 
   return jresult;
 }
@@ -8081,7 +8084,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_tsip_event_code_dialog_terminating_get() {
   int jresult ;
   int result;
   
-  result = (int)(902);
+  result = (int) 902;
   jresult = result; 
   return jresult;
 }
@@ -8091,7 +8094,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_tsip_event_code_dialog_terminated_get() {
   int jresult ;
   int result;
   
-  result = (int)(903);
+  result = (int) 903;
   jresult = result; 
   return jresult;
 }
@@ -8101,7 +8104,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_tsip_event_code_stack_starting_get() {
   int jresult ;
   int result;
   
-  result = (int)(950);
+  result = (int) 950;
   jresult = result; 
   return jresult;
 }
@@ -8111,7 +8114,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_tsip_event_code_stack_started_get() {
   int jresult ;
   int result;
   
-  result = (int)(951);
+  result = (int) 951;
   jresult = result; 
   return jresult;
 }
@@ -8121,7 +8124,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_tsip_event_code_stack_stopping_get() {
   int jresult ;
   int result;
   
-  result = (int)(952);
+  result = (int) 952;
   jresult = result; 
   return jresult;
 }
@@ -8131,7 +8134,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_tsip_event_code_stack_stopped_get() {
   int jresult ;
   int result;
   
-  result = (int)(953);
+  result = (int) 953;
   jresult = result; 
   return jresult;
 }
@@ -8141,7 +8144,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_tsip_event_code_stack_failed_to_start_get() {
   int jresult ;
   int result;
   
-  result = (int)(954);
+  result = (int) 954;
   jresult = result; 
   return jresult;
 }
@@ -8151,7 +8154,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_tsip_event_code_stack_failed_to_stop_get() {
   int jresult ;
   int result;
   
-  result = (int)(955);
+  result = (int) 955;
   jresult = result; 
   return jresult;
 }
@@ -8161,7 +8164,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_tsip_event_code_stack_disconnected_get() {
   int jresult ;
   int result;
   
-  result = (int)(956);
+  result = (int) 956;
   jresult = result; 
   return jresult;
 }
@@ -9368,100 +9371,100 @@ SWIGEXPORT void SWIGSTDCALL CSharp_MsrpCallback_director_connect(void *objarg, S
 }
 
 
-SWIGEXPORT MediaContent * SWIGSTDCALL CSharp_MediaContentCPIM_SWIGUpcast(MediaContentCPIM *jarg1) {
-    return (MediaContent *)jarg1;
+SWIGEXPORT MediaContent * SWIGSTDCALL CSharp_MediaContentCPIMUpcast(MediaContentCPIM *objectRef) {
+    return (MediaContent *)objectRef;
 }
 
-SWIGEXPORT SipEvent * SWIGSTDCALL CSharp_DialogEvent_SWIGUpcast(DialogEvent *jarg1) {
-    return (SipEvent *)jarg1;
+SWIGEXPORT SipEvent * SWIGSTDCALL CSharp_DialogEventUpcast(DialogEvent *objectRef) {
+    return (SipEvent *)objectRef;
 }
 
-SWIGEXPORT SipEvent * SWIGSTDCALL CSharp_StackEvent_SWIGUpcast(StackEvent *jarg1) {
-    return (SipEvent *)jarg1;
+SWIGEXPORT SipEvent * SWIGSTDCALL CSharp_StackEventUpcast(StackEvent *objectRef) {
+    return (SipEvent *)objectRef;
 }
 
-SWIGEXPORT SipEvent * SWIGSTDCALL CSharp_InviteEvent_SWIGUpcast(InviteEvent *jarg1) {
-    return (SipEvent *)jarg1;
+SWIGEXPORT SipEvent * SWIGSTDCALL CSharp_InviteEventUpcast(InviteEvent *objectRef) {
+    return (SipEvent *)objectRef;
 }
 
-SWIGEXPORT SipEvent * SWIGSTDCALL CSharp_MessagingEvent_SWIGUpcast(MessagingEvent *jarg1) {
-    return (SipEvent *)jarg1;
+SWIGEXPORT SipEvent * SWIGSTDCALL CSharp_MessagingEventUpcast(MessagingEvent *objectRef) {
+    return (SipEvent *)objectRef;
 }
 
-SWIGEXPORT SipEvent * SWIGSTDCALL CSharp_InfoEvent_SWIGUpcast(InfoEvent *jarg1) {
-    return (SipEvent *)jarg1;
+SWIGEXPORT SipEvent * SWIGSTDCALL CSharp_InfoEventUpcast(InfoEvent *objectRef) {
+    return (SipEvent *)objectRef;
 }
 
-SWIGEXPORT SipEvent * SWIGSTDCALL CSharp_OptionsEvent_SWIGUpcast(OptionsEvent *jarg1) {
-    return (SipEvent *)jarg1;
+SWIGEXPORT SipEvent * SWIGSTDCALL CSharp_OptionsEventUpcast(OptionsEvent *objectRef) {
+    return (SipEvent *)objectRef;
 }
 
-SWIGEXPORT SipEvent * SWIGSTDCALL CSharp_PublicationEvent_SWIGUpcast(PublicationEvent *jarg1) {
-    return (SipEvent *)jarg1;
+SWIGEXPORT SipEvent * SWIGSTDCALL CSharp_PublicationEventUpcast(PublicationEvent *objectRef) {
+    return (SipEvent *)objectRef;
 }
 
-SWIGEXPORT SipEvent * SWIGSTDCALL CSharp_RegistrationEvent_SWIGUpcast(RegistrationEvent *jarg1) {
-    return (SipEvent *)jarg1;
+SWIGEXPORT SipEvent * SWIGSTDCALL CSharp_RegistrationEventUpcast(RegistrationEvent *objectRef) {
+    return (SipEvent *)objectRef;
 }
 
-SWIGEXPORT SipEvent * SWIGSTDCALL CSharp_SubscriptionEvent_SWIGUpcast(SubscriptionEvent *jarg1) {
-    return (SipEvent *)jarg1;
+SWIGEXPORT SipEvent * SWIGSTDCALL CSharp_SubscriptionEventUpcast(SubscriptionEvent *objectRef) {
+    return (SipEvent *)objectRef;
 }
 
-SWIGEXPORT SipSession * SWIGSTDCALL CSharp_InviteSession_SWIGUpcast(InviteSession *jarg1) {
-    return (SipSession *)jarg1;
+SWIGEXPORT SipSession * SWIGSTDCALL CSharp_InviteSessionUpcast(InviteSession *objectRef) {
+    return (SipSession *)objectRef;
 }
 
-SWIGEXPORT InviteSession * SWIGSTDCALL CSharp_CallSession_SWIGUpcast(CallSession *jarg1) {
-    return (InviteSession *)jarg1;
+SWIGEXPORT InviteSession * SWIGSTDCALL CSharp_CallSessionUpcast(CallSession *objectRef) {
+    return (InviteSession *)objectRef;
 }
 
-SWIGEXPORT InviteSession * SWIGSTDCALL CSharp_MsrpSession_SWIGUpcast(MsrpSession *jarg1) {
-    return (InviteSession *)jarg1;
+SWIGEXPORT InviteSession * SWIGSTDCALL CSharp_MsrpSessionUpcast(MsrpSession *objectRef) {
+    return (InviteSession *)objectRef;
 }
 
-SWIGEXPORT SipSession * SWIGSTDCALL CSharp_MessagingSession_SWIGUpcast(MessagingSession *jarg1) {
-    return (SipSession *)jarg1;
+SWIGEXPORT SipSession * SWIGSTDCALL CSharp_MessagingSessionUpcast(MessagingSession *objectRef) {
+    return (SipSession *)objectRef;
 }
 
-SWIGEXPORT SipSession * SWIGSTDCALL CSharp_InfoSession_SWIGUpcast(InfoSession *jarg1) {
-    return (SipSession *)jarg1;
+SWIGEXPORT SipSession * SWIGSTDCALL CSharp_InfoSessionUpcast(InfoSession *objectRef) {
+    return (SipSession *)objectRef;
 }
 
-SWIGEXPORT SipSession * SWIGSTDCALL CSharp_OptionsSession_SWIGUpcast(OptionsSession *jarg1) {
-    return (SipSession *)jarg1;
+SWIGEXPORT SipSession * SWIGSTDCALL CSharp_OptionsSessionUpcast(OptionsSession *objectRef) {
+    return (SipSession *)objectRef;
 }
 
-SWIGEXPORT SipSession * SWIGSTDCALL CSharp_PublicationSession_SWIGUpcast(PublicationSession *jarg1) {
-    return (SipSession *)jarg1;
+SWIGEXPORT SipSession * SWIGSTDCALL CSharp_PublicationSessionUpcast(PublicationSession *objectRef) {
+    return (SipSession *)objectRef;
 }
 
-SWIGEXPORT SipSession * SWIGSTDCALL CSharp_RegistrationSession_SWIGUpcast(RegistrationSession *jarg1) {
-    return (SipSession *)jarg1;
+SWIGEXPORT SipSession * SWIGSTDCALL CSharp_RegistrationSessionUpcast(RegistrationSession *objectRef) {
+    return (SipSession *)objectRef;
 }
 
-SWIGEXPORT SipSession * SWIGSTDCALL CSharp_SubscriptionSession_SWIGUpcast(SubscriptionSession *jarg1) {
-    return (SipSession *)jarg1;
+SWIGEXPORT SipSession * SWIGSTDCALL CSharp_SubscriptionSessionUpcast(SubscriptionSession *objectRef) {
+    return (SipSession *)objectRef;
 }
 
-SWIGEXPORT ProxyPlugin * SWIGSTDCALL CSharp_ProxyAudioConsumer_SWIGUpcast(ProxyAudioConsumer *jarg1) {
-    return (ProxyPlugin *)jarg1;
+SWIGEXPORT ProxyPlugin * SWIGSTDCALL CSharp_ProxyAudioConsumerUpcast(ProxyAudioConsumer *objectRef) {
+    return (ProxyPlugin *)objectRef;
 }
 
-SWIGEXPORT ProxyPlugin * SWIGSTDCALL CSharp_ProxyVideoConsumer_SWIGUpcast(ProxyVideoConsumer *jarg1) {
-    return (ProxyPlugin *)jarg1;
+SWIGEXPORT ProxyPlugin * SWIGSTDCALL CSharp_ProxyVideoConsumerUpcast(ProxyVideoConsumer *objectRef) {
+    return (ProxyPlugin *)objectRef;
 }
 
-SWIGEXPORT ProxyPlugin * SWIGSTDCALL CSharp_ProxyAudioProducer_SWIGUpcast(ProxyAudioProducer *jarg1) {
-    return (ProxyPlugin *)jarg1;
+SWIGEXPORT ProxyPlugin * SWIGSTDCALL CSharp_ProxyAudioProducerUpcast(ProxyAudioProducer *objectRef) {
+    return (ProxyPlugin *)objectRef;
 }
 
-SWIGEXPORT ProxyPlugin * SWIGSTDCALL CSharp_ProxyVideoProducer_SWIGUpcast(ProxyVideoProducer *jarg1) {
-    return (ProxyPlugin *)jarg1;
+SWIGEXPORT ProxyPlugin * SWIGSTDCALL CSharp_ProxyVideoProducerUpcast(ProxyVideoProducer *objectRef) {
+    return (ProxyPlugin *)objectRef;
 }
 
-SWIGEXPORT SafeObject * SWIGSTDCALL CSharp_SipStack_SWIGUpcast(SipStack *jarg1) {
-    return (SafeObject *)jarg1;
+SWIGEXPORT SafeObject * SWIGSTDCALL CSharp_SipStackUpcast(SipStack *objectRef) {
+    return (SafeObject *)objectRef;
 }
 
 #ifdef __cplusplus
diff --git a/branches/2.0/doubango/bindings/csharp/tinyWRAP_wrap.h b/branches/2.0/doubango/bindings/csharp/tinyWRAP_wrap.h
index 14334109..1085877d 100644
--- a/branches/2.0/doubango/bindings/csharp/tinyWRAP_wrap.h
+++ b/branches/2.0/doubango/bindings/csharp/tinyWRAP_wrap.h
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  * 
  * 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
diff --git a/branches/2.0/doubango/bindings/csharp/tmedia_bandwidth_level_t.cs b/branches/2.0/doubango/bindings/csharp/tmedia_bandwidth_level_t.cs
index fbbaa4f7..7ffa2920 100644
--- a/branches/2.0/doubango/bindings/csharp/tmedia_bandwidth_level_t.cs
+++ b/branches/2.0/doubango/bindings/csharp/tmedia_bandwidth_level_t.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/csharp/tmedia_chroma_t.cs b/branches/2.0/doubango/bindings/csharp/tmedia_chroma_t.cs
index 02a8bef2..bac4bce9 100644
--- a/branches/2.0/doubango/bindings/csharp/tmedia_chroma_t.cs
+++ b/branches/2.0/doubango/bindings/csharp/tmedia_chroma_t.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -19,7 +19,9 @@ public enum tmedia_chroma_t {
   tmedia_chroma_nv21,
   tmedia_chroma_yuv422p,
   tmedia_chroma_uyvy422,
-  tmedia_chroma_yuv420p
+  tmedia_chroma_yuv420p,
+  tmedia_chroma_mjpeg,
+  tmedia_chroma_yuyv422
 }
 
 }
diff --git a/branches/2.0/doubango/bindings/csharp/tmedia_codec_id_t.cs b/branches/2.0/doubango/bindings/csharp/tmedia_codec_id_t.cs
index c09b74a6..58fa897c 100644
--- a/branches/2.0/doubango/bindings/csharp/tmedia_codec_id_t.cs
+++ b/branches/2.0/doubango/bindings/csharp/tmedia_codec_id_t.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/csharp/tmedia_mode_t.cs b/branches/2.0/doubango/bindings/csharp/tmedia_mode_t.cs
index c8b4fc4c..be288cad 100644
--- a/branches/2.0/doubango/bindings/csharp/tmedia_mode_t.cs
+++ b/branches/2.0/doubango/bindings/csharp/tmedia_mode_t.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/csharp/tmedia_pref_video_size_t.cs b/branches/2.0/doubango/bindings/csharp/tmedia_pref_video_size_t.cs
index 35229e10..c85c330f 100644
--- a/branches/2.0/doubango/bindings/csharp/tmedia_pref_video_size_t.cs
+++ b/branches/2.0/doubango/bindings/csharp/tmedia_pref_video_size_t.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -16,6 +16,7 @@ public enum tmedia_pref_video_size_t {
   tmedia_pref_video_size_hvga,
   tmedia_pref_video_size_vga,
   tmedia_pref_video_size_4cif,
+  tmedia_pref_video_size_wvga,
   tmedia_pref_video_size_svga,
   tmedia_pref_video_size_480p,
   tmedia_pref_video_size_720p,
diff --git a/branches/2.0/doubango/bindings/csharp/tmedia_profile_t.cs b/branches/2.0/doubango/bindings/csharp/tmedia_profile_t.cs
index c440b72b..33f35eea 100644
--- a/branches/2.0/doubango/bindings/csharp/tmedia_profile_t.cs
+++ b/branches/2.0/doubango/bindings/csharp/tmedia_profile_t.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/csharp/tmedia_qos_strength_t.cs b/branches/2.0/doubango/bindings/csharp/tmedia_qos_strength_t.cs
index 97b5802f..145dab47 100644
--- a/branches/2.0/doubango/bindings/csharp/tmedia_qos_strength_t.cs
+++ b/branches/2.0/doubango/bindings/csharp/tmedia_qos_strength_t.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/csharp/tmedia_qos_stype_t.cs b/branches/2.0/doubango/bindings/csharp/tmedia_qos_stype_t.cs
index d750e621..9bb9d083 100644
--- a/branches/2.0/doubango/bindings/csharp/tmedia_qos_stype_t.cs
+++ b/branches/2.0/doubango/bindings/csharp/tmedia_qos_stype_t.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/csharp/tmedia_srtp_mode_t.cs b/branches/2.0/doubango/bindings/csharp/tmedia_srtp_mode_t.cs
index 9d2a740f..ec0099db 100644
--- a/branches/2.0/doubango/bindings/csharp/tmedia_srtp_mode_t.cs
+++ b/branches/2.0/doubango/bindings/csharp/tmedia_srtp_mode_t.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/csharp/tmedia_srtp_type_t.cs b/branches/2.0/doubango/bindings/csharp/tmedia_srtp_type_t.cs
index 07c0ced8..c0f3cf06 100644
--- a/branches/2.0/doubango/bindings/csharp/tmedia_srtp_type_t.cs
+++ b/branches/2.0/doubango/bindings/csharp/tmedia_srtp_type_t.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/csharp/tmedia_t140_data_type_t.cs b/branches/2.0/doubango/bindings/csharp/tmedia_t140_data_type_t.cs
index 2f7d8a81..66045f49 100644
--- a/branches/2.0/doubango/bindings/csharp/tmedia_t140_data_type_t.cs
+++ b/branches/2.0/doubango/bindings/csharp/tmedia_t140_data_type_t.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/csharp/tmsrp_event_type_t.cs b/branches/2.0/doubango/bindings/csharp/tmsrp_event_type_t.cs
index c4435ff8..0c52d2b2 100644
--- a/branches/2.0/doubango/bindings/csharp/tmsrp_event_type_t.cs
+++ b/branches/2.0/doubango/bindings/csharp/tmsrp_event_type_t.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/csharp/tmsrp_request_type_t.cs b/branches/2.0/doubango/bindings/csharp/tmsrp_request_type_t.cs
index 6a62debf..b431d86c 100644
--- a/branches/2.0/doubango/bindings/csharp/tmsrp_request_type_t.cs
+++ b/branches/2.0/doubango/bindings/csharp/tmsrp_request_type_t.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/csharp/tsip_event_type_t.cs b/branches/2.0/doubango/bindings/csharp/tsip_event_type_t.cs
index f2d348d9..9a1ff99f 100644
--- a/branches/2.0/doubango/bindings/csharp/tsip_event_type_t.cs
+++ b/branches/2.0/doubango/bindings/csharp/tsip_event_type_t.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/csharp/tsip_info_event_type_t.cs b/branches/2.0/doubango/bindings/csharp/tsip_info_event_type_t.cs
index 99cc9b9a..92a316a8 100644
--- a/branches/2.0/doubango/bindings/csharp/tsip_info_event_type_t.cs
+++ b/branches/2.0/doubango/bindings/csharp/tsip_info_event_type_t.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/csharp/tsip_invite_event_type_t.cs b/branches/2.0/doubango/bindings/csharp/tsip_invite_event_type_t.cs
index f3f025c8..bf897580 100644
--- a/branches/2.0/doubango/bindings/csharp/tsip_invite_event_type_t.cs
+++ b/branches/2.0/doubango/bindings/csharp/tsip_invite_event_type_t.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/csharp/tsip_message_event_type_t.cs b/branches/2.0/doubango/bindings/csharp/tsip_message_event_type_t.cs
index ee9fc385..bc7f2f0a 100644
--- a/branches/2.0/doubango/bindings/csharp/tsip_message_event_type_t.cs
+++ b/branches/2.0/doubango/bindings/csharp/tsip_message_event_type_t.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/csharp/tsip_options_event_type_t.cs b/branches/2.0/doubango/bindings/csharp/tsip_options_event_type_t.cs
index f4276461..42f7a287 100644
--- a/branches/2.0/doubango/bindings/csharp/tsip_options_event_type_t.cs
+++ b/branches/2.0/doubango/bindings/csharp/tsip_options_event_type_t.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/csharp/tsip_publish_event_type_t.cs b/branches/2.0/doubango/bindings/csharp/tsip_publish_event_type_t.cs
index d726e46d..1b1b9993 100644
--- a/branches/2.0/doubango/bindings/csharp/tsip_publish_event_type_t.cs
+++ b/branches/2.0/doubango/bindings/csharp/tsip_publish_event_type_t.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/csharp/tsip_register_event_type_t.cs b/branches/2.0/doubango/bindings/csharp/tsip_register_event_type_t.cs
index 05ed969b..25982cfe 100644
--- a/branches/2.0/doubango/bindings/csharp/tsip_register_event_type_t.cs
+++ b/branches/2.0/doubango/bindings/csharp/tsip_register_event_type_t.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/csharp/tsip_request_type_t.cs b/branches/2.0/doubango/bindings/csharp/tsip_request_type_t.cs
index c1e79955..5e299fd8 100644
--- a/branches/2.0/doubango/bindings/csharp/tsip_request_type_t.cs
+++ b/branches/2.0/doubango/bindings/csharp/tsip_request_type_t.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/csharp/tsip_stack_mode_t.cs b/branches/2.0/doubango/bindings/csharp/tsip_stack_mode_t.cs
index f37bd8e3..31c5f0c2 100644
--- a/branches/2.0/doubango/bindings/csharp/tsip_stack_mode_t.cs
+++ b/branches/2.0/doubango/bindings/csharp/tsip_stack_mode_t.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/csharp/tsip_subscribe_event_type_t.cs b/branches/2.0/doubango/bindings/csharp/tsip_subscribe_event_type_t.cs
index e58f7b3c..9f2a5df4 100644
--- a/branches/2.0/doubango/bindings/csharp/tsip_subscribe_event_type_t.cs
+++ b/branches/2.0/doubango/bindings/csharp/tsip_subscribe_event_type_t.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/csharp/twrap_media_type_t.cs b/branches/2.0/doubango/bindings/csharp/twrap_media_type_t.cs
index be5a1e89..74432c34 100644
--- a/branches/2.0/doubango/bindings/csharp/twrap_media_type_t.cs
+++ b/branches/2.0/doubango/bindings/csharp/twrap_media_type_t.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/csharp/twrap_proxy_plugin_type_t.cs b/branches/2.0/doubango/bindings/csharp/twrap_proxy_plugin_type_t.cs
index 6e1c62b8..c8cbc21f 100644
--- a/branches/2.0/doubango/bindings/csharp/twrap_proxy_plugin_type_t.cs
+++ b/branches/2.0/doubango/bindings/csharp/twrap_proxy_plugin_type_t.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/csharp/twrap_rpmessage_type_t.cs b/branches/2.0/doubango/bindings/csharp/twrap_rpmessage_type_t.cs
index 54924705..6266081c 100644
--- a/branches/2.0/doubango/bindings/csharp/twrap_rpmessage_type_t.cs
+++ b/branches/2.0/doubango/bindings/csharp/twrap_rpmessage_type_t.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/csharp/twrap_sms_type_t.cs b/branches/2.0/doubango/bindings/csharp/twrap_sms_type_t.cs
index 084b8a02..97545f9f 100644
--- a/branches/2.0/doubango/bindings/csharp/twrap_sms_type_t.cs
+++ b/branches/2.0/doubango/bindings/csharp/twrap_sms_type_t.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/java/ActionConfig.java b/branches/2.0/doubango/bindings/java/ActionConfig.java
index cf840605..3c9338d8 100644
--- a/branches/2.0/doubango/bindings/java/ActionConfig.java
+++ b/branches/2.0/doubango/bindings/java/ActionConfig.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/java/AudioResampler.java b/branches/2.0/doubango/bindings/java/AudioResampler.java
index fb7b9e4f..8e4b2aa6 100644
--- a/branches/2.0/doubango/bindings/java/AudioResampler.java
+++ b/branches/2.0/doubango/bindings/java/AudioResampler.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/java/CallSession.java b/branches/2.0/doubango/bindings/java/CallSession.java
index 8a4ad9ec..aa1a584b 100644
--- a/branches/2.0/doubango/bindings/java/CallSession.java
+++ b/branches/2.0/doubango/bindings/java/CallSession.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * 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 CallSession extends InviteSession {
   private long swigCPtr;
 
   protected CallSession(long cPtr, boolean cMemoryOwn) {
-    super(tinyWRAPJNI.CallSession_SWIGUpcast(cPtr), cMemoryOwn);
+    super(tinyWRAPJNI.SWIGCallSessionUpcast(cPtr), cMemoryOwn);
     swigCPtr = cPtr;
   }
 
diff --git a/branches/2.0/doubango/bindings/java/Codec.java b/branches/2.0/doubango/bindings/java/Codec.java
index 6c2a68d3..9c3fd93f 100644
--- a/branches/2.0/doubango/bindings/java/Codec.java
+++ b/branches/2.0/doubango/bindings/java/Codec.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/java/DDebugCallback.java b/branches/2.0/doubango/bindings/java/DDebugCallback.java
index e469d30a..223da5bd 100644
--- a/branches/2.0/doubango/bindings/java/DDebugCallback.java
+++ b/branches/2.0/doubango/bindings/java/DDebugCallback.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/java/DialogEvent.java b/branches/2.0/doubango/bindings/java/DialogEvent.java
index fc83b5f8..93ec1f60 100644
--- a/branches/2.0/doubango/bindings/java/DialogEvent.java
+++ b/branches/2.0/doubango/bindings/java/DialogEvent.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * 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 DialogEvent extends SipEvent {
   private long swigCPtr;
 
   protected DialogEvent(long cPtr, boolean cMemoryOwn) {
-    super(tinyWRAPJNI.DialogEvent_SWIGUpcast(cPtr), cMemoryOwn);
+    super(tinyWRAPJNI.SWIGDialogEventUpcast(cPtr), cMemoryOwn);
     swigCPtr = cPtr;
   }
 
diff --git a/branches/2.0/doubango/bindings/java/InfoEvent.java b/branches/2.0/doubango/bindings/java/InfoEvent.java
index 9166a578..1c4b6566 100644
--- a/branches/2.0/doubango/bindings/java/InfoEvent.java
+++ b/branches/2.0/doubango/bindings/java/InfoEvent.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * 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 InfoEvent extends SipEvent {
   private long swigCPtr;
 
   protected InfoEvent(long cPtr, boolean cMemoryOwn) {
-    super(tinyWRAPJNI.InfoEvent_SWIGUpcast(cPtr), cMemoryOwn);
+    super(tinyWRAPJNI.SWIGInfoEventUpcast(cPtr), cMemoryOwn);
     swigCPtr = cPtr;
   }
 
diff --git a/branches/2.0/doubango/bindings/java/InfoSession.java b/branches/2.0/doubango/bindings/java/InfoSession.java
index f7c79969..c4afae40 100644
--- a/branches/2.0/doubango/bindings/java/InfoSession.java
+++ b/branches/2.0/doubango/bindings/java/InfoSession.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * 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 InfoSession extends SipSession {
   private long swigCPtr;
 
   protected InfoSession(long cPtr, boolean cMemoryOwn) {
-    super(tinyWRAPJNI.InfoSession_SWIGUpcast(cPtr), cMemoryOwn);
+    super(tinyWRAPJNI.SWIGInfoSessionUpcast(cPtr), cMemoryOwn);
     swigCPtr = cPtr;
   }
 
diff --git a/branches/2.0/doubango/bindings/java/InviteEvent.java b/branches/2.0/doubango/bindings/java/InviteEvent.java
index 11675d16..2362a76e 100644
--- a/branches/2.0/doubango/bindings/java/InviteEvent.java
+++ b/branches/2.0/doubango/bindings/java/InviteEvent.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * 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 InviteEvent extends SipEvent {
   private long swigCPtr;
 
   protected InviteEvent(long cPtr, boolean cMemoryOwn) {
-    super(tinyWRAPJNI.InviteEvent_SWIGUpcast(cPtr), cMemoryOwn);
+    super(tinyWRAPJNI.SWIGInviteEventUpcast(cPtr), cMemoryOwn);
     swigCPtr = cPtr;
   }
 
diff --git a/branches/2.0/doubango/bindings/java/InviteSession.java b/branches/2.0/doubango/bindings/java/InviteSession.java
index bf85bdf4..4fa584c6 100644
--- a/branches/2.0/doubango/bindings/java/InviteSession.java
+++ b/branches/2.0/doubango/bindings/java/InviteSession.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * 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 InviteSession extends SipSession {
   private long swigCPtr;
 
   protected InviteSession(long cPtr, boolean cMemoryOwn) {
-    super(tinyWRAPJNI.InviteSession_SWIGUpcast(cPtr), cMemoryOwn);
+    super(tinyWRAPJNI.SWIGInviteSessionUpcast(cPtr), cMemoryOwn);
     swigCPtr = cPtr;
   }
 
diff --git a/branches/2.0/doubango/bindings/java/MediaContent.java b/branches/2.0/doubango/bindings/java/MediaContent.java
index d7ef55fb..ac38c694 100644
--- a/branches/2.0/doubango/bindings/java/MediaContent.java
+++ b/branches/2.0/doubango/bindings/java/MediaContent.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/java/MediaContentCPIM.java b/branches/2.0/doubango/bindings/java/MediaContentCPIM.java
index 65bd4ea0..e7fa1588 100644
--- a/branches/2.0/doubango/bindings/java/MediaContentCPIM.java
+++ b/branches/2.0/doubango/bindings/java/MediaContentCPIM.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * 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 MediaContentCPIM extends MediaContent {
   private long swigCPtr;
 
   protected MediaContentCPIM(long cPtr, boolean cMemoryOwn) {
-    super(tinyWRAPJNI.MediaContentCPIM_SWIGUpcast(cPtr), cMemoryOwn);
+    super(tinyWRAPJNI.SWIGMediaContentCPIMUpcast(cPtr), cMemoryOwn);
     swigCPtr = cPtr;
   }
 
diff --git a/branches/2.0/doubango/bindings/java/MediaSessionMgr.java b/branches/2.0/doubango/bindings/java/MediaSessionMgr.java
index f5d01772..04a32ece 100644
--- a/branches/2.0/doubango/bindings/java/MediaSessionMgr.java
+++ b/branches/2.0/doubango/bindings/java/MediaSessionMgr.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/java/MessagingEvent.java b/branches/2.0/doubango/bindings/java/MessagingEvent.java
index 4d88c330..041945eb 100644
--- a/branches/2.0/doubango/bindings/java/MessagingEvent.java
+++ b/branches/2.0/doubango/bindings/java/MessagingEvent.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * 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 MessagingEvent extends SipEvent {
   private long swigCPtr;
 
   protected MessagingEvent(long cPtr, boolean cMemoryOwn) {
-    super(tinyWRAPJNI.MessagingEvent_SWIGUpcast(cPtr), cMemoryOwn);
+    super(tinyWRAPJNI.SWIGMessagingEventUpcast(cPtr), cMemoryOwn);
     swigCPtr = cPtr;
   }
 
diff --git a/branches/2.0/doubango/bindings/java/MessagingSession.java b/branches/2.0/doubango/bindings/java/MessagingSession.java
index 95e03896..6e96c661 100644
--- a/branches/2.0/doubango/bindings/java/MessagingSession.java
+++ b/branches/2.0/doubango/bindings/java/MessagingSession.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * 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 MessagingSession extends SipSession {
   private long swigCPtr;
 
   protected MessagingSession(long cPtr, boolean cMemoryOwn) {
-    super(tinyWRAPJNI.MessagingSession_SWIGUpcast(cPtr), cMemoryOwn);
+    super(tinyWRAPJNI.SWIGMessagingSessionUpcast(cPtr), cMemoryOwn);
     swigCPtr = cPtr;
   }
 
diff --git a/branches/2.0/doubango/bindings/java/MsrpCallback.java b/branches/2.0/doubango/bindings/java/MsrpCallback.java
index 55de1a82..4ba40a9b 100644
--- a/branches/2.0/doubango/bindings/java/MsrpCallback.java
+++ b/branches/2.0/doubango/bindings/java/MsrpCallback.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/java/MsrpEvent.java b/branches/2.0/doubango/bindings/java/MsrpEvent.java
index 7a024d4f..648ba771 100644
--- a/branches/2.0/doubango/bindings/java/MsrpEvent.java
+++ b/branches/2.0/doubango/bindings/java/MsrpEvent.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/java/MsrpMessage.java b/branches/2.0/doubango/bindings/java/MsrpMessage.java
index 8fd6e397..18cabd08 100644
--- a/branches/2.0/doubango/bindings/java/MsrpMessage.java
+++ b/branches/2.0/doubango/bindings/java/MsrpMessage.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/java/MsrpSession.java b/branches/2.0/doubango/bindings/java/MsrpSession.java
index 6393dec3..71ff962c 100644
--- a/branches/2.0/doubango/bindings/java/MsrpSession.java
+++ b/branches/2.0/doubango/bindings/java/MsrpSession.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * 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 MsrpSession extends InviteSession {
   private long swigCPtr;
 
   protected MsrpSession(long cPtr, boolean cMemoryOwn) {
-    super(tinyWRAPJNI.MsrpSession_SWIGUpcast(cPtr), cMemoryOwn);
+    super(tinyWRAPJNI.SWIGMsrpSessionUpcast(cPtr), cMemoryOwn);
     swigCPtr = cPtr;
   }
 
diff --git a/branches/2.0/doubango/bindings/java/OptionsEvent.java b/branches/2.0/doubango/bindings/java/OptionsEvent.java
index 4dde699d..aec72f9b 100644
--- a/branches/2.0/doubango/bindings/java/OptionsEvent.java
+++ b/branches/2.0/doubango/bindings/java/OptionsEvent.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * 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 OptionsEvent extends SipEvent {
   private long swigCPtr;
 
   protected OptionsEvent(long cPtr, boolean cMemoryOwn) {
-    super(tinyWRAPJNI.OptionsEvent_SWIGUpcast(cPtr), cMemoryOwn);
+    super(tinyWRAPJNI.SWIGOptionsEventUpcast(cPtr), cMemoryOwn);
     swigCPtr = cPtr;
   }
 
diff --git a/branches/2.0/doubango/bindings/java/OptionsSession.java b/branches/2.0/doubango/bindings/java/OptionsSession.java
index fb018c4c..67ea8168 100644
--- a/branches/2.0/doubango/bindings/java/OptionsSession.java
+++ b/branches/2.0/doubango/bindings/java/OptionsSession.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * 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 OptionsSession extends SipSession {
   private long swigCPtr;
 
   protected OptionsSession(long cPtr, boolean cMemoryOwn) {
-    super(tinyWRAPJNI.OptionsSession_SWIGUpcast(cPtr), cMemoryOwn);
+    super(tinyWRAPJNI.SWIGOptionsSessionUpcast(cPtr), cMemoryOwn);
     swigCPtr = cPtr;
   }
 
diff --git a/branches/2.0/doubango/bindings/java/ProxyAudioConsumer.java b/branches/2.0/doubango/bindings/java/ProxyAudioConsumer.java
index 50c44745..1ef79d41 100644
--- a/branches/2.0/doubango/bindings/java/ProxyAudioConsumer.java
+++ b/branches/2.0/doubango/bindings/java/ProxyAudioConsumer.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * 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 ProxyAudioConsumer extends ProxyPlugin {
   private long swigCPtr;
 
   protected ProxyAudioConsumer(long cPtr, boolean cMemoryOwn) {
-    super(tinyWRAPJNI.ProxyAudioConsumer_SWIGUpcast(cPtr), cMemoryOwn);
+    super(tinyWRAPJNI.SWIGProxyAudioConsumerUpcast(cPtr), cMemoryOwn);
     swigCPtr = cPtr;
   }
 
diff --git a/branches/2.0/doubango/bindings/java/ProxyAudioConsumerCallback.java b/branches/2.0/doubango/bindings/java/ProxyAudioConsumerCallback.java
index b48d5d39..8b19039b 100644
--- a/branches/2.0/doubango/bindings/java/ProxyAudioConsumerCallback.java
+++ b/branches/2.0/doubango/bindings/java/ProxyAudioConsumerCallback.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/java/ProxyAudioProducer.java b/branches/2.0/doubango/bindings/java/ProxyAudioProducer.java
index 288287aa..ac509271 100644
--- a/branches/2.0/doubango/bindings/java/ProxyAudioProducer.java
+++ b/branches/2.0/doubango/bindings/java/ProxyAudioProducer.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * 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 ProxyAudioProducer extends ProxyPlugin {
   private long swigCPtr;
 
   protected ProxyAudioProducer(long cPtr, boolean cMemoryOwn) {
-    super(tinyWRAPJNI.ProxyAudioProducer_SWIGUpcast(cPtr), cMemoryOwn);
+    super(tinyWRAPJNI.SWIGProxyAudioProducerUpcast(cPtr), cMemoryOwn);
     swigCPtr = cPtr;
   }
 
diff --git a/branches/2.0/doubango/bindings/java/ProxyAudioProducerCallback.java b/branches/2.0/doubango/bindings/java/ProxyAudioProducerCallback.java
index 7dc1bfd7..efcb05fa 100644
--- a/branches/2.0/doubango/bindings/java/ProxyAudioProducerCallback.java
+++ b/branches/2.0/doubango/bindings/java/ProxyAudioProducerCallback.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/java/ProxyPlugin.java b/branches/2.0/doubango/bindings/java/ProxyPlugin.java
index 6ccfe9bf..7c1eff95 100644
--- a/branches/2.0/doubango/bindings/java/ProxyPlugin.java
+++ b/branches/2.0/doubango/bindings/java/ProxyPlugin.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/java/ProxyPluginMgr.java b/branches/2.0/doubango/bindings/java/ProxyPluginMgr.java
index 22ee6dde..6029cbf9 100644
--- a/branches/2.0/doubango/bindings/java/ProxyPluginMgr.java
+++ b/branches/2.0/doubango/bindings/java/ProxyPluginMgr.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/java/ProxyPluginMgrCallback.java b/branches/2.0/doubango/bindings/java/ProxyPluginMgrCallback.java
index 7e45b61b..905998c4 100644
--- a/branches/2.0/doubango/bindings/java/ProxyPluginMgrCallback.java
+++ b/branches/2.0/doubango/bindings/java/ProxyPluginMgrCallback.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/java/ProxyVideoConsumer.java b/branches/2.0/doubango/bindings/java/ProxyVideoConsumer.java
index 53d7a701..8d9144a6 100644
--- a/branches/2.0/doubango/bindings/java/ProxyVideoConsumer.java
+++ b/branches/2.0/doubango/bindings/java/ProxyVideoConsumer.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * 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 ProxyVideoConsumer extends ProxyPlugin {
   private long swigCPtr;
 
   protected ProxyVideoConsumer(long cPtr, boolean cMemoryOwn) {
-    super(tinyWRAPJNI.ProxyVideoConsumer_SWIGUpcast(cPtr), cMemoryOwn);
+    super(tinyWRAPJNI.SWIGProxyVideoConsumerUpcast(cPtr), cMemoryOwn);
     swigCPtr = cPtr;
   }
 
diff --git a/branches/2.0/doubango/bindings/java/ProxyVideoConsumerCallback.java b/branches/2.0/doubango/bindings/java/ProxyVideoConsumerCallback.java
index e2a43494..ab44d808 100644
--- a/branches/2.0/doubango/bindings/java/ProxyVideoConsumerCallback.java
+++ b/branches/2.0/doubango/bindings/java/ProxyVideoConsumerCallback.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/java/ProxyVideoFrame.java b/branches/2.0/doubango/bindings/java/ProxyVideoFrame.java
index 8c4ef4c2..169aa53d 100644
--- a/branches/2.0/doubango/bindings/java/ProxyVideoFrame.java
+++ b/branches/2.0/doubango/bindings/java/ProxyVideoFrame.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/java/ProxyVideoProducer.java b/branches/2.0/doubango/bindings/java/ProxyVideoProducer.java
index d82cb843..b417ed1a 100644
--- a/branches/2.0/doubango/bindings/java/ProxyVideoProducer.java
+++ b/branches/2.0/doubango/bindings/java/ProxyVideoProducer.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * 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 ProxyVideoProducer extends ProxyPlugin {
   private long swigCPtr;
 
   protected ProxyVideoProducer(long cPtr, boolean cMemoryOwn) {
-    super(tinyWRAPJNI.ProxyVideoProducer_SWIGUpcast(cPtr), cMemoryOwn);
+    super(tinyWRAPJNI.SWIGProxyVideoProducerUpcast(cPtr), cMemoryOwn);
     swigCPtr = cPtr;
   }
 
diff --git a/branches/2.0/doubango/bindings/java/ProxyVideoProducerCallback.java b/branches/2.0/doubango/bindings/java/ProxyVideoProducerCallback.java
index c625405f..cf2e7c04 100644
--- a/branches/2.0/doubango/bindings/java/ProxyVideoProducerCallback.java
+++ b/branches/2.0/doubango/bindings/java/ProxyVideoProducerCallback.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/java/PublicationEvent.java b/branches/2.0/doubango/bindings/java/PublicationEvent.java
index ba44ed8b..7dd54967 100644
--- a/branches/2.0/doubango/bindings/java/PublicationEvent.java
+++ b/branches/2.0/doubango/bindings/java/PublicationEvent.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * 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 PublicationEvent extends SipEvent {
   private long swigCPtr;
 
   protected PublicationEvent(long cPtr, boolean cMemoryOwn) {
-    super(tinyWRAPJNI.PublicationEvent_SWIGUpcast(cPtr), cMemoryOwn);
+    super(tinyWRAPJNI.SWIGPublicationEventUpcast(cPtr), cMemoryOwn);
     swigCPtr = cPtr;
   }
 
diff --git a/branches/2.0/doubango/bindings/java/PublicationSession.java b/branches/2.0/doubango/bindings/java/PublicationSession.java
index adfef9a6..7296d110 100644
--- a/branches/2.0/doubango/bindings/java/PublicationSession.java
+++ b/branches/2.0/doubango/bindings/java/PublicationSession.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * 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 PublicationSession extends SipSession {
   private long swigCPtr;
 
   protected PublicationSession(long cPtr, boolean cMemoryOwn) {
-    super(tinyWRAPJNI.PublicationSession_SWIGUpcast(cPtr), cMemoryOwn);
+    super(tinyWRAPJNI.SWIGPublicationSessionUpcast(cPtr), cMemoryOwn);
     swigCPtr = cPtr;
   }
 
diff --git a/branches/2.0/doubango/bindings/java/RPMessage.java b/branches/2.0/doubango/bindings/java/RPMessage.java
index 0e9b864f..5dfae095 100644
--- a/branches/2.0/doubango/bindings/java/RPMessage.java
+++ b/branches/2.0/doubango/bindings/java/RPMessage.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/java/RegistrationEvent.java b/branches/2.0/doubango/bindings/java/RegistrationEvent.java
index 5a1cc25d..235cf840 100644
--- a/branches/2.0/doubango/bindings/java/RegistrationEvent.java
+++ b/branches/2.0/doubango/bindings/java/RegistrationEvent.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * 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 RegistrationEvent extends SipEvent {
   private long swigCPtr;
 
   protected RegistrationEvent(long cPtr, boolean cMemoryOwn) {
-    super(tinyWRAPJNI.RegistrationEvent_SWIGUpcast(cPtr), cMemoryOwn);
+    super(tinyWRAPJNI.SWIGRegistrationEventUpcast(cPtr), cMemoryOwn);
     swigCPtr = cPtr;
   }
 
diff --git a/branches/2.0/doubango/bindings/java/RegistrationSession.java b/branches/2.0/doubango/bindings/java/RegistrationSession.java
index 2857a721..f414cd94 100644
--- a/branches/2.0/doubango/bindings/java/RegistrationSession.java
+++ b/branches/2.0/doubango/bindings/java/RegistrationSession.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * 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 RegistrationSession extends SipSession {
   private long swigCPtr;
 
   protected RegistrationSession(long cPtr, boolean cMemoryOwn) {
-    super(tinyWRAPJNI.RegistrationSession_SWIGUpcast(cPtr), cMemoryOwn);
+    super(tinyWRAPJNI.SWIGRegistrationSessionUpcast(cPtr), cMemoryOwn);
     swigCPtr = cPtr;
   }
 
diff --git a/branches/2.0/doubango/bindings/java/SMSData.java b/branches/2.0/doubango/bindings/java/SMSData.java
index 1ab6479a..6f4d5b80 100644
--- a/branches/2.0/doubango/bindings/java/SMSData.java
+++ b/branches/2.0/doubango/bindings/java/SMSData.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/java/SMSEncoder.java b/branches/2.0/doubango/bindings/java/SMSEncoder.java
index 2c0885f7..fff16717 100644
--- a/branches/2.0/doubango/bindings/java/SMSEncoder.java
+++ b/branches/2.0/doubango/bindings/java/SMSEncoder.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/java/SafeObject.java b/branches/2.0/doubango/bindings/java/SafeObject.java
index eb984d69..bc54590b 100644
--- a/branches/2.0/doubango/bindings/java/SafeObject.java
+++ b/branches/2.0/doubango/bindings/java/SafeObject.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/java/SdpMessage.java b/branches/2.0/doubango/bindings/java/SdpMessage.java
index 742ffb88..64ced0bb 100644
--- a/branches/2.0/doubango/bindings/java/SdpMessage.java
+++ b/branches/2.0/doubango/bindings/java/SdpMessage.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/java/SipCallback.java b/branches/2.0/doubango/bindings/java/SipCallback.java
index bcfe0264..003a0814 100644
--- a/branches/2.0/doubango/bindings/java/SipCallback.java
+++ b/branches/2.0/doubango/bindings/java/SipCallback.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/java/SipEvent.java b/branches/2.0/doubango/bindings/java/SipEvent.java
index 3d035816..e446bf63 100644
--- a/branches/2.0/doubango/bindings/java/SipEvent.java
+++ b/branches/2.0/doubango/bindings/java/SipEvent.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/java/SipMessage.java b/branches/2.0/doubango/bindings/java/SipMessage.java
index ff9b1d14..769811d3 100644
--- a/branches/2.0/doubango/bindings/java/SipMessage.java
+++ b/branches/2.0/doubango/bindings/java/SipMessage.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/java/SipSession.java b/branches/2.0/doubango/bindings/java/SipSession.java
index fcb83642..4453e679 100644
--- a/branches/2.0/doubango/bindings/java/SipSession.java
+++ b/branches/2.0/doubango/bindings/java/SipSession.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/java/SipStack.java b/branches/2.0/doubango/bindings/java/SipStack.java
index 5e3b41ab..cc21995f 100644
--- a/branches/2.0/doubango/bindings/java/SipStack.java
+++ b/branches/2.0/doubango/bindings/java/SipStack.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * 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 SipStack extends SafeObject {
   private long swigCPtr;
 
   protected SipStack(long cPtr, boolean cMemoryOwn) {
-    super(tinyWRAPJNI.SipStack_SWIGUpcast(cPtr), cMemoryOwn);
+    super(tinyWRAPJNI.SWIGSipStackUpcast(cPtr), cMemoryOwn);
     swigCPtr = cPtr;
   }
 
diff --git a/branches/2.0/doubango/bindings/java/SipUri.java b/branches/2.0/doubango/bindings/java/SipUri.java
index 34413ef6..79d493aa 100644
--- a/branches/2.0/doubango/bindings/java/SipUri.java
+++ b/branches/2.0/doubango/bindings/java/SipUri.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/java/StackEvent.java b/branches/2.0/doubango/bindings/java/StackEvent.java
index 53a48dd1..fb27e804 100644
--- a/branches/2.0/doubango/bindings/java/StackEvent.java
+++ b/branches/2.0/doubango/bindings/java/StackEvent.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * 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 StackEvent extends SipEvent {
   private long swigCPtr;
 
   protected StackEvent(long cPtr, boolean cMemoryOwn) {
-    super(tinyWRAPJNI.StackEvent_SWIGUpcast(cPtr), cMemoryOwn);
+    super(tinyWRAPJNI.SWIGStackEventUpcast(cPtr), cMemoryOwn);
     swigCPtr = cPtr;
   }
 
diff --git a/branches/2.0/doubango/bindings/java/SubscriptionEvent.java b/branches/2.0/doubango/bindings/java/SubscriptionEvent.java
index 96c63fd9..8c2f3a06 100644
--- a/branches/2.0/doubango/bindings/java/SubscriptionEvent.java
+++ b/branches/2.0/doubango/bindings/java/SubscriptionEvent.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * 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 SubscriptionEvent extends SipEvent {
   private long swigCPtr;
 
   protected SubscriptionEvent(long cPtr, boolean cMemoryOwn) {
-    super(tinyWRAPJNI.SubscriptionEvent_SWIGUpcast(cPtr), cMemoryOwn);
+    super(tinyWRAPJNI.SWIGSubscriptionEventUpcast(cPtr), cMemoryOwn);
     swigCPtr = cPtr;
   }
 
diff --git a/branches/2.0/doubango/bindings/java/SubscriptionSession.java b/branches/2.0/doubango/bindings/java/SubscriptionSession.java
index bbe9c659..ced7acdf 100644
--- a/branches/2.0/doubango/bindings/java/SubscriptionSession.java
+++ b/branches/2.0/doubango/bindings/java/SubscriptionSession.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * 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 SubscriptionSession extends SipSession {
   private long swigCPtr;
 
   protected SubscriptionSession(long cPtr, boolean cMemoryOwn) {
-    super(tinyWRAPJNI.SubscriptionSession_SWIGUpcast(cPtr), cMemoryOwn);
+    super(tinyWRAPJNI.SWIGSubscriptionSessionUpcast(cPtr), cMemoryOwn);
     swigCPtr = cPtr;
   }
 
diff --git a/branches/2.0/doubango/bindings/java/T140Callback.java b/branches/2.0/doubango/bindings/java/T140Callback.java
index c20de22a..56fcf228 100644
--- a/branches/2.0/doubango/bindings/java/T140Callback.java
+++ b/branches/2.0/doubango/bindings/java/T140Callback.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/java/T140CallbackData.java b/branches/2.0/doubango/bindings/java/T140CallbackData.java
index b08a9c4b..255e13c1 100644
--- a/branches/2.0/doubango/bindings/java/T140CallbackData.java
+++ b/branches/2.0/doubango/bindings/java/T140CallbackData.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/java/XcapCallback.java b/branches/2.0/doubango/bindings/java/XcapCallback.java
index 7976fece..2f8c376f 100644
--- a/branches/2.0/doubango/bindings/java/XcapCallback.java
+++ b/branches/2.0/doubango/bindings/java/XcapCallback.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/java/XcapEvent.java b/branches/2.0/doubango/bindings/java/XcapEvent.java
index 1d5f3b44..f41e5144 100644
--- a/branches/2.0/doubango/bindings/java/XcapEvent.java
+++ b/branches/2.0/doubango/bindings/java/XcapEvent.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/java/XcapMessage.java b/branches/2.0/doubango/bindings/java/XcapMessage.java
index 93669119..2292b909 100644
--- a/branches/2.0/doubango/bindings/java/XcapMessage.java
+++ b/branches/2.0/doubango/bindings/java/XcapMessage.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/java/XcapSelector.java b/branches/2.0/doubango/bindings/java/XcapSelector.java
index 0a0c297c..d648683b 100644
--- a/branches/2.0/doubango/bindings/java/XcapSelector.java
+++ b/branches/2.0/doubango/bindings/java/XcapSelector.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/java/XcapStack.java b/branches/2.0/doubango/bindings/java/XcapStack.java
index 80a360a8..d810d141 100644
--- a/branches/2.0/doubango/bindings/java/XcapStack.java
+++ b/branches/2.0/doubango/bindings/java/XcapStack.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/java/android/ActionConfig.java b/branches/2.0/doubango/bindings/java/android/ActionConfig.java
index cf840605..3c9338d8 100644
--- a/branches/2.0/doubango/bindings/java/android/ActionConfig.java
+++ b/branches/2.0/doubango/bindings/java/android/ActionConfig.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/java/android/AudioResampler.java b/branches/2.0/doubango/bindings/java/android/AudioResampler.java
index fb7b9e4f..8e4b2aa6 100644
--- a/branches/2.0/doubango/bindings/java/android/AudioResampler.java
+++ b/branches/2.0/doubango/bindings/java/android/AudioResampler.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/java/android/CallSession.java b/branches/2.0/doubango/bindings/java/android/CallSession.java
index 8a4ad9ec..aa1a584b 100644
--- a/branches/2.0/doubango/bindings/java/android/CallSession.java
+++ b/branches/2.0/doubango/bindings/java/android/CallSession.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * 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 CallSession extends InviteSession {
   private long swigCPtr;
 
   protected CallSession(long cPtr, boolean cMemoryOwn) {
-    super(tinyWRAPJNI.CallSession_SWIGUpcast(cPtr), cMemoryOwn);
+    super(tinyWRAPJNI.SWIGCallSessionUpcast(cPtr), cMemoryOwn);
     swigCPtr = cPtr;
   }
 
diff --git a/branches/2.0/doubango/bindings/java/android/Codec.java b/branches/2.0/doubango/bindings/java/android/Codec.java
index 6c2a68d3..9c3fd93f 100644
--- a/branches/2.0/doubango/bindings/java/android/Codec.java
+++ b/branches/2.0/doubango/bindings/java/android/Codec.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/java/android/DDebugCallback.java b/branches/2.0/doubango/bindings/java/android/DDebugCallback.java
index e469d30a..223da5bd 100644
--- a/branches/2.0/doubango/bindings/java/android/DDebugCallback.java
+++ b/branches/2.0/doubango/bindings/java/android/DDebugCallback.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/java/android/DialogEvent.java b/branches/2.0/doubango/bindings/java/android/DialogEvent.java
index fc83b5f8..93ec1f60 100644
--- a/branches/2.0/doubango/bindings/java/android/DialogEvent.java
+++ b/branches/2.0/doubango/bindings/java/android/DialogEvent.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * 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 DialogEvent extends SipEvent {
   private long swigCPtr;
 
   protected DialogEvent(long cPtr, boolean cMemoryOwn) {
-    super(tinyWRAPJNI.DialogEvent_SWIGUpcast(cPtr), cMemoryOwn);
+    super(tinyWRAPJNI.SWIGDialogEventUpcast(cPtr), cMemoryOwn);
     swigCPtr = cPtr;
   }
 
diff --git a/branches/2.0/doubango/bindings/java/android/InfoEvent.java b/branches/2.0/doubango/bindings/java/android/InfoEvent.java
index 9166a578..1c4b6566 100644
--- a/branches/2.0/doubango/bindings/java/android/InfoEvent.java
+++ b/branches/2.0/doubango/bindings/java/android/InfoEvent.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * 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 InfoEvent extends SipEvent {
   private long swigCPtr;
 
   protected InfoEvent(long cPtr, boolean cMemoryOwn) {
-    super(tinyWRAPJNI.InfoEvent_SWIGUpcast(cPtr), cMemoryOwn);
+    super(tinyWRAPJNI.SWIGInfoEventUpcast(cPtr), cMemoryOwn);
     swigCPtr = cPtr;
   }
 
diff --git a/branches/2.0/doubango/bindings/java/android/InfoSession.java b/branches/2.0/doubango/bindings/java/android/InfoSession.java
index f7c79969..c4afae40 100644
--- a/branches/2.0/doubango/bindings/java/android/InfoSession.java
+++ b/branches/2.0/doubango/bindings/java/android/InfoSession.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * 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 InfoSession extends SipSession {
   private long swigCPtr;
 
   protected InfoSession(long cPtr, boolean cMemoryOwn) {
-    super(tinyWRAPJNI.InfoSession_SWIGUpcast(cPtr), cMemoryOwn);
+    super(tinyWRAPJNI.SWIGInfoSessionUpcast(cPtr), cMemoryOwn);
     swigCPtr = cPtr;
   }
 
diff --git a/branches/2.0/doubango/bindings/java/android/InviteEvent.java b/branches/2.0/doubango/bindings/java/android/InviteEvent.java
index 11675d16..2362a76e 100644
--- a/branches/2.0/doubango/bindings/java/android/InviteEvent.java
+++ b/branches/2.0/doubango/bindings/java/android/InviteEvent.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * 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 InviteEvent extends SipEvent {
   private long swigCPtr;
 
   protected InviteEvent(long cPtr, boolean cMemoryOwn) {
-    super(tinyWRAPJNI.InviteEvent_SWIGUpcast(cPtr), cMemoryOwn);
+    super(tinyWRAPJNI.SWIGInviteEventUpcast(cPtr), cMemoryOwn);
     swigCPtr = cPtr;
   }
 
diff --git a/branches/2.0/doubango/bindings/java/android/InviteSession.java b/branches/2.0/doubango/bindings/java/android/InviteSession.java
index bf85bdf4..4fa584c6 100644
--- a/branches/2.0/doubango/bindings/java/android/InviteSession.java
+++ b/branches/2.0/doubango/bindings/java/android/InviteSession.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * 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 InviteSession extends SipSession {
   private long swigCPtr;
 
   protected InviteSession(long cPtr, boolean cMemoryOwn) {
-    super(tinyWRAPJNI.InviteSession_SWIGUpcast(cPtr), cMemoryOwn);
+    super(tinyWRAPJNI.SWIGInviteSessionUpcast(cPtr), cMemoryOwn);
     swigCPtr = cPtr;
   }
 
diff --git a/branches/2.0/doubango/bindings/java/android/MediaContent.java b/branches/2.0/doubango/bindings/java/android/MediaContent.java
index d7ef55fb..ac38c694 100644
--- a/branches/2.0/doubango/bindings/java/android/MediaContent.java
+++ b/branches/2.0/doubango/bindings/java/android/MediaContent.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/java/android/MediaContentCPIM.java b/branches/2.0/doubango/bindings/java/android/MediaContentCPIM.java
index 65bd4ea0..e7fa1588 100644
--- a/branches/2.0/doubango/bindings/java/android/MediaContentCPIM.java
+++ b/branches/2.0/doubango/bindings/java/android/MediaContentCPIM.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * 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 MediaContentCPIM extends MediaContent {
   private long swigCPtr;
 
   protected MediaContentCPIM(long cPtr, boolean cMemoryOwn) {
-    super(tinyWRAPJNI.MediaContentCPIM_SWIGUpcast(cPtr), cMemoryOwn);
+    super(tinyWRAPJNI.SWIGMediaContentCPIMUpcast(cPtr), cMemoryOwn);
     swigCPtr = cPtr;
   }
 
diff --git a/branches/2.0/doubango/bindings/java/android/MediaSessionMgr.java b/branches/2.0/doubango/bindings/java/android/MediaSessionMgr.java
index f5d01772..04a32ece 100644
--- a/branches/2.0/doubango/bindings/java/android/MediaSessionMgr.java
+++ b/branches/2.0/doubango/bindings/java/android/MediaSessionMgr.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/java/android/MessagingEvent.java b/branches/2.0/doubango/bindings/java/android/MessagingEvent.java
index 4d88c330..041945eb 100644
--- a/branches/2.0/doubango/bindings/java/android/MessagingEvent.java
+++ b/branches/2.0/doubango/bindings/java/android/MessagingEvent.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * 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 MessagingEvent extends SipEvent {
   private long swigCPtr;
 
   protected MessagingEvent(long cPtr, boolean cMemoryOwn) {
-    super(tinyWRAPJNI.MessagingEvent_SWIGUpcast(cPtr), cMemoryOwn);
+    super(tinyWRAPJNI.SWIGMessagingEventUpcast(cPtr), cMemoryOwn);
     swigCPtr = cPtr;
   }
 
diff --git a/branches/2.0/doubango/bindings/java/android/MessagingSession.java b/branches/2.0/doubango/bindings/java/android/MessagingSession.java
index 95e03896..6e96c661 100644
--- a/branches/2.0/doubango/bindings/java/android/MessagingSession.java
+++ b/branches/2.0/doubango/bindings/java/android/MessagingSession.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * 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 MessagingSession extends SipSession {
   private long swigCPtr;
 
   protected MessagingSession(long cPtr, boolean cMemoryOwn) {
-    super(tinyWRAPJNI.MessagingSession_SWIGUpcast(cPtr), cMemoryOwn);
+    super(tinyWRAPJNI.SWIGMessagingSessionUpcast(cPtr), cMemoryOwn);
     swigCPtr = cPtr;
   }
 
diff --git a/branches/2.0/doubango/bindings/java/android/MsrpCallback.java b/branches/2.0/doubango/bindings/java/android/MsrpCallback.java
index 55de1a82..4ba40a9b 100644
--- a/branches/2.0/doubango/bindings/java/android/MsrpCallback.java
+++ b/branches/2.0/doubango/bindings/java/android/MsrpCallback.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/java/android/MsrpEvent.java b/branches/2.0/doubango/bindings/java/android/MsrpEvent.java
index 7a024d4f..648ba771 100644
--- a/branches/2.0/doubango/bindings/java/android/MsrpEvent.java
+++ b/branches/2.0/doubango/bindings/java/android/MsrpEvent.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/java/android/MsrpMessage.java b/branches/2.0/doubango/bindings/java/android/MsrpMessage.java
index 8fd6e397..18cabd08 100644
--- a/branches/2.0/doubango/bindings/java/android/MsrpMessage.java
+++ b/branches/2.0/doubango/bindings/java/android/MsrpMessage.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/java/android/MsrpSession.java b/branches/2.0/doubango/bindings/java/android/MsrpSession.java
index 6393dec3..71ff962c 100644
--- a/branches/2.0/doubango/bindings/java/android/MsrpSession.java
+++ b/branches/2.0/doubango/bindings/java/android/MsrpSession.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * 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 MsrpSession extends InviteSession {
   private long swigCPtr;
 
   protected MsrpSession(long cPtr, boolean cMemoryOwn) {
-    super(tinyWRAPJNI.MsrpSession_SWIGUpcast(cPtr), cMemoryOwn);
+    super(tinyWRAPJNI.SWIGMsrpSessionUpcast(cPtr), cMemoryOwn);
     swigCPtr = cPtr;
   }
 
diff --git a/branches/2.0/doubango/bindings/java/android/OptionsEvent.java b/branches/2.0/doubango/bindings/java/android/OptionsEvent.java
index 4dde699d..aec72f9b 100644
--- a/branches/2.0/doubango/bindings/java/android/OptionsEvent.java
+++ b/branches/2.0/doubango/bindings/java/android/OptionsEvent.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * 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 OptionsEvent extends SipEvent {
   private long swigCPtr;
 
   protected OptionsEvent(long cPtr, boolean cMemoryOwn) {
-    super(tinyWRAPJNI.OptionsEvent_SWIGUpcast(cPtr), cMemoryOwn);
+    super(tinyWRAPJNI.SWIGOptionsEventUpcast(cPtr), cMemoryOwn);
     swigCPtr = cPtr;
   }
 
diff --git a/branches/2.0/doubango/bindings/java/android/OptionsSession.java b/branches/2.0/doubango/bindings/java/android/OptionsSession.java
index fb018c4c..67ea8168 100644
--- a/branches/2.0/doubango/bindings/java/android/OptionsSession.java
+++ b/branches/2.0/doubango/bindings/java/android/OptionsSession.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * 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 OptionsSession extends SipSession {
   private long swigCPtr;
 
   protected OptionsSession(long cPtr, boolean cMemoryOwn) {
-    super(tinyWRAPJNI.OptionsSession_SWIGUpcast(cPtr), cMemoryOwn);
+    super(tinyWRAPJNI.SWIGOptionsSessionUpcast(cPtr), cMemoryOwn);
     swigCPtr = cPtr;
   }
 
diff --git a/branches/2.0/doubango/bindings/java/android/ProxyAudioConsumer.java b/branches/2.0/doubango/bindings/java/android/ProxyAudioConsumer.java
index 50c44745..1ef79d41 100644
--- a/branches/2.0/doubango/bindings/java/android/ProxyAudioConsumer.java
+++ b/branches/2.0/doubango/bindings/java/android/ProxyAudioConsumer.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * 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 ProxyAudioConsumer extends ProxyPlugin {
   private long swigCPtr;
 
   protected ProxyAudioConsumer(long cPtr, boolean cMemoryOwn) {
-    super(tinyWRAPJNI.ProxyAudioConsumer_SWIGUpcast(cPtr), cMemoryOwn);
+    super(tinyWRAPJNI.SWIGProxyAudioConsumerUpcast(cPtr), cMemoryOwn);
     swigCPtr = cPtr;
   }
 
diff --git a/branches/2.0/doubango/bindings/java/android/ProxyAudioConsumerCallback.java b/branches/2.0/doubango/bindings/java/android/ProxyAudioConsumerCallback.java
index b48d5d39..8b19039b 100644
--- a/branches/2.0/doubango/bindings/java/android/ProxyAudioConsumerCallback.java
+++ b/branches/2.0/doubango/bindings/java/android/ProxyAudioConsumerCallback.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/java/android/ProxyAudioProducer.java b/branches/2.0/doubango/bindings/java/android/ProxyAudioProducer.java
index 288287aa..ac509271 100644
--- a/branches/2.0/doubango/bindings/java/android/ProxyAudioProducer.java
+++ b/branches/2.0/doubango/bindings/java/android/ProxyAudioProducer.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * 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 ProxyAudioProducer extends ProxyPlugin {
   private long swigCPtr;
 
   protected ProxyAudioProducer(long cPtr, boolean cMemoryOwn) {
-    super(tinyWRAPJNI.ProxyAudioProducer_SWIGUpcast(cPtr), cMemoryOwn);
+    super(tinyWRAPJNI.SWIGProxyAudioProducerUpcast(cPtr), cMemoryOwn);
     swigCPtr = cPtr;
   }
 
diff --git a/branches/2.0/doubango/bindings/java/android/ProxyAudioProducerCallback.java b/branches/2.0/doubango/bindings/java/android/ProxyAudioProducerCallback.java
index 7dc1bfd7..efcb05fa 100644
--- a/branches/2.0/doubango/bindings/java/android/ProxyAudioProducerCallback.java
+++ b/branches/2.0/doubango/bindings/java/android/ProxyAudioProducerCallback.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/java/android/ProxyPlugin.java b/branches/2.0/doubango/bindings/java/android/ProxyPlugin.java
index 6ccfe9bf..7c1eff95 100644
--- a/branches/2.0/doubango/bindings/java/android/ProxyPlugin.java
+++ b/branches/2.0/doubango/bindings/java/android/ProxyPlugin.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/java/android/ProxyPluginMgr.java b/branches/2.0/doubango/bindings/java/android/ProxyPluginMgr.java
index 22ee6dde..6029cbf9 100644
--- a/branches/2.0/doubango/bindings/java/android/ProxyPluginMgr.java
+++ b/branches/2.0/doubango/bindings/java/android/ProxyPluginMgr.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/java/android/ProxyPluginMgrCallback.java b/branches/2.0/doubango/bindings/java/android/ProxyPluginMgrCallback.java
index 7e45b61b..905998c4 100644
--- a/branches/2.0/doubango/bindings/java/android/ProxyPluginMgrCallback.java
+++ b/branches/2.0/doubango/bindings/java/android/ProxyPluginMgrCallback.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/java/android/ProxyVideoConsumer.java b/branches/2.0/doubango/bindings/java/android/ProxyVideoConsumer.java
index 53d7a701..8d9144a6 100644
--- a/branches/2.0/doubango/bindings/java/android/ProxyVideoConsumer.java
+++ b/branches/2.0/doubango/bindings/java/android/ProxyVideoConsumer.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * 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 ProxyVideoConsumer extends ProxyPlugin {
   private long swigCPtr;
 
   protected ProxyVideoConsumer(long cPtr, boolean cMemoryOwn) {
-    super(tinyWRAPJNI.ProxyVideoConsumer_SWIGUpcast(cPtr), cMemoryOwn);
+    super(tinyWRAPJNI.SWIGProxyVideoConsumerUpcast(cPtr), cMemoryOwn);
     swigCPtr = cPtr;
   }
 
diff --git a/branches/2.0/doubango/bindings/java/android/ProxyVideoConsumerCallback.java b/branches/2.0/doubango/bindings/java/android/ProxyVideoConsumerCallback.java
index e2a43494..ab44d808 100644
--- a/branches/2.0/doubango/bindings/java/android/ProxyVideoConsumerCallback.java
+++ b/branches/2.0/doubango/bindings/java/android/ProxyVideoConsumerCallback.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/java/android/ProxyVideoFrame.java b/branches/2.0/doubango/bindings/java/android/ProxyVideoFrame.java
index 8c4ef4c2..169aa53d 100644
--- a/branches/2.0/doubango/bindings/java/android/ProxyVideoFrame.java
+++ b/branches/2.0/doubango/bindings/java/android/ProxyVideoFrame.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/java/android/ProxyVideoProducer.java b/branches/2.0/doubango/bindings/java/android/ProxyVideoProducer.java
index d82cb843..b417ed1a 100644
--- a/branches/2.0/doubango/bindings/java/android/ProxyVideoProducer.java
+++ b/branches/2.0/doubango/bindings/java/android/ProxyVideoProducer.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * 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 ProxyVideoProducer extends ProxyPlugin {
   private long swigCPtr;
 
   protected ProxyVideoProducer(long cPtr, boolean cMemoryOwn) {
-    super(tinyWRAPJNI.ProxyVideoProducer_SWIGUpcast(cPtr), cMemoryOwn);
+    super(tinyWRAPJNI.SWIGProxyVideoProducerUpcast(cPtr), cMemoryOwn);
     swigCPtr = cPtr;
   }
 
diff --git a/branches/2.0/doubango/bindings/java/android/ProxyVideoProducerCallback.java b/branches/2.0/doubango/bindings/java/android/ProxyVideoProducerCallback.java
index c625405f..cf2e7c04 100644
--- a/branches/2.0/doubango/bindings/java/android/ProxyVideoProducerCallback.java
+++ b/branches/2.0/doubango/bindings/java/android/ProxyVideoProducerCallback.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/java/android/PublicationEvent.java b/branches/2.0/doubango/bindings/java/android/PublicationEvent.java
index ba44ed8b..7dd54967 100644
--- a/branches/2.0/doubango/bindings/java/android/PublicationEvent.java
+++ b/branches/2.0/doubango/bindings/java/android/PublicationEvent.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * 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 PublicationEvent extends SipEvent {
   private long swigCPtr;
 
   protected PublicationEvent(long cPtr, boolean cMemoryOwn) {
-    super(tinyWRAPJNI.PublicationEvent_SWIGUpcast(cPtr), cMemoryOwn);
+    super(tinyWRAPJNI.SWIGPublicationEventUpcast(cPtr), cMemoryOwn);
     swigCPtr = cPtr;
   }
 
diff --git a/branches/2.0/doubango/bindings/java/android/PublicationSession.java b/branches/2.0/doubango/bindings/java/android/PublicationSession.java
index adfef9a6..7296d110 100644
--- a/branches/2.0/doubango/bindings/java/android/PublicationSession.java
+++ b/branches/2.0/doubango/bindings/java/android/PublicationSession.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * 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 PublicationSession extends SipSession {
   private long swigCPtr;
 
   protected PublicationSession(long cPtr, boolean cMemoryOwn) {
-    super(tinyWRAPJNI.PublicationSession_SWIGUpcast(cPtr), cMemoryOwn);
+    super(tinyWRAPJNI.SWIGPublicationSessionUpcast(cPtr), cMemoryOwn);
     swigCPtr = cPtr;
   }
 
diff --git a/branches/2.0/doubango/bindings/java/android/RPMessage.java b/branches/2.0/doubango/bindings/java/android/RPMessage.java
index 0e9b864f..5dfae095 100644
--- a/branches/2.0/doubango/bindings/java/android/RPMessage.java
+++ b/branches/2.0/doubango/bindings/java/android/RPMessage.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/java/android/RegistrationEvent.java b/branches/2.0/doubango/bindings/java/android/RegistrationEvent.java
index 5a1cc25d..235cf840 100644
--- a/branches/2.0/doubango/bindings/java/android/RegistrationEvent.java
+++ b/branches/2.0/doubango/bindings/java/android/RegistrationEvent.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * 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 RegistrationEvent extends SipEvent {
   private long swigCPtr;
 
   protected RegistrationEvent(long cPtr, boolean cMemoryOwn) {
-    super(tinyWRAPJNI.RegistrationEvent_SWIGUpcast(cPtr), cMemoryOwn);
+    super(tinyWRAPJNI.SWIGRegistrationEventUpcast(cPtr), cMemoryOwn);
     swigCPtr = cPtr;
   }
 
diff --git a/branches/2.0/doubango/bindings/java/android/RegistrationSession.java b/branches/2.0/doubango/bindings/java/android/RegistrationSession.java
index 2857a721..f414cd94 100644
--- a/branches/2.0/doubango/bindings/java/android/RegistrationSession.java
+++ b/branches/2.0/doubango/bindings/java/android/RegistrationSession.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * 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 RegistrationSession extends SipSession {
   private long swigCPtr;
 
   protected RegistrationSession(long cPtr, boolean cMemoryOwn) {
-    super(tinyWRAPJNI.RegistrationSession_SWIGUpcast(cPtr), cMemoryOwn);
+    super(tinyWRAPJNI.SWIGRegistrationSessionUpcast(cPtr), cMemoryOwn);
     swigCPtr = cPtr;
   }
 
diff --git a/branches/2.0/doubango/bindings/java/android/SMSData.java b/branches/2.0/doubango/bindings/java/android/SMSData.java
index 1ab6479a..6f4d5b80 100644
--- a/branches/2.0/doubango/bindings/java/android/SMSData.java
+++ b/branches/2.0/doubango/bindings/java/android/SMSData.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/java/android/SMSEncoder.java b/branches/2.0/doubango/bindings/java/android/SMSEncoder.java
index 2c0885f7..fff16717 100644
--- a/branches/2.0/doubango/bindings/java/android/SMSEncoder.java
+++ b/branches/2.0/doubango/bindings/java/android/SMSEncoder.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/java/android/SafeObject.java b/branches/2.0/doubango/bindings/java/android/SafeObject.java
index eb984d69..bc54590b 100644
--- a/branches/2.0/doubango/bindings/java/android/SafeObject.java
+++ b/branches/2.0/doubango/bindings/java/android/SafeObject.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/java/android/SdpMessage.java b/branches/2.0/doubango/bindings/java/android/SdpMessage.java
index 742ffb88..64ced0bb 100644
--- a/branches/2.0/doubango/bindings/java/android/SdpMessage.java
+++ b/branches/2.0/doubango/bindings/java/android/SdpMessage.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/java/android/SipCallback.java b/branches/2.0/doubango/bindings/java/android/SipCallback.java
index bcfe0264..003a0814 100644
--- a/branches/2.0/doubango/bindings/java/android/SipCallback.java
+++ b/branches/2.0/doubango/bindings/java/android/SipCallback.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/java/android/SipEvent.java b/branches/2.0/doubango/bindings/java/android/SipEvent.java
index 3d035816..e446bf63 100644
--- a/branches/2.0/doubango/bindings/java/android/SipEvent.java
+++ b/branches/2.0/doubango/bindings/java/android/SipEvent.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/java/android/SipMessage.java b/branches/2.0/doubango/bindings/java/android/SipMessage.java
index ff9b1d14..769811d3 100644
--- a/branches/2.0/doubango/bindings/java/android/SipMessage.java
+++ b/branches/2.0/doubango/bindings/java/android/SipMessage.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/java/android/SipSession.java b/branches/2.0/doubango/bindings/java/android/SipSession.java
index fcb83642..4453e679 100644
--- a/branches/2.0/doubango/bindings/java/android/SipSession.java
+++ b/branches/2.0/doubango/bindings/java/android/SipSession.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/java/android/SipStack.java b/branches/2.0/doubango/bindings/java/android/SipStack.java
index 5e3b41ab..cc21995f 100644
--- a/branches/2.0/doubango/bindings/java/android/SipStack.java
+++ b/branches/2.0/doubango/bindings/java/android/SipStack.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * 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 SipStack extends SafeObject {
   private long swigCPtr;
 
   protected SipStack(long cPtr, boolean cMemoryOwn) {
-    super(tinyWRAPJNI.SipStack_SWIGUpcast(cPtr), cMemoryOwn);
+    super(tinyWRAPJNI.SWIGSipStackUpcast(cPtr), cMemoryOwn);
     swigCPtr = cPtr;
   }
 
diff --git a/branches/2.0/doubango/bindings/java/android/SipUri.java b/branches/2.0/doubango/bindings/java/android/SipUri.java
index 34413ef6..79d493aa 100644
--- a/branches/2.0/doubango/bindings/java/android/SipUri.java
+++ b/branches/2.0/doubango/bindings/java/android/SipUri.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/java/android/StackEvent.java b/branches/2.0/doubango/bindings/java/android/StackEvent.java
index 53a48dd1..fb27e804 100644
--- a/branches/2.0/doubango/bindings/java/android/StackEvent.java
+++ b/branches/2.0/doubango/bindings/java/android/StackEvent.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * 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 StackEvent extends SipEvent {
   private long swigCPtr;
 
   protected StackEvent(long cPtr, boolean cMemoryOwn) {
-    super(tinyWRAPJNI.StackEvent_SWIGUpcast(cPtr), cMemoryOwn);
+    super(tinyWRAPJNI.SWIGStackEventUpcast(cPtr), cMemoryOwn);
     swigCPtr = cPtr;
   }
 
diff --git a/branches/2.0/doubango/bindings/java/android/SubscriptionEvent.java b/branches/2.0/doubango/bindings/java/android/SubscriptionEvent.java
index 96c63fd9..8c2f3a06 100644
--- a/branches/2.0/doubango/bindings/java/android/SubscriptionEvent.java
+++ b/branches/2.0/doubango/bindings/java/android/SubscriptionEvent.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * 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 SubscriptionEvent extends SipEvent {
   private long swigCPtr;
 
   protected SubscriptionEvent(long cPtr, boolean cMemoryOwn) {
-    super(tinyWRAPJNI.SubscriptionEvent_SWIGUpcast(cPtr), cMemoryOwn);
+    super(tinyWRAPJNI.SWIGSubscriptionEventUpcast(cPtr), cMemoryOwn);
     swigCPtr = cPtr;
   }
 
diff --git a/branches/2.0/doubango/bindings/java/android/SubscriptionSession.java b/branches/2.0/doubango/bindings/java/android/SubscriptionSession.java
index bbe9c659..ced7acdf 100644
--- a/branches/2.0/doubango/bindings/java/android/SubscriptionSession.java
+++ b/branches/2.0/doubango/bindings/java/android/SubscriptionSession.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * 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 SubscriptionSession extends SipSession {
   private long swigCPtr;
 
   protected SubscriptionSession(long cPtr, boolean cMemoryOwn) {
-    super(tinyWRAPJNI.SubscriptionSession_SWIGUpcast(cPtr), cMemoryOwn);
+    super(tinyWRAPJNI.SWIGSubscriptionSessionUpcast(cPtr), cMemoryOwn);
     swigCPtr = cPtr;
   }
 
diff --git a/branches/2.0/doubango/bindings/java/android/T140Callback.java b/branches/2.0/doubango/bindings/java/android/T140Callback.java
index c20de22a..56fcf228 100644
--- a/branches/2.0/doubango/bindings/java/android/T140Callback.java
+++ b/branches/2.0/doubango/bindings/java/android/T140Callback.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/java/android/T140CallbackData.java b/branches/2.0/doubango/bindings/java/android/T140CallbackData.java
index b08a9c4b..255e13c1 100644
--- a/branches/2.0/doubango/bindings/java/android/T140CallbackData.java
+++ b/branches/2.0/doubango/bindings/java/android/T140CallbackData.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/java/android/XcapCallback.java b/branches/2.0/doubango/bindings/java/android/XcapCallback.java
index 7976fece..2f8c376f 100644
--- a/branches/2.0/doubango/bindings/java/android/XcapCallback.java
+++ b/branches/2.0/doubango/bindings/java/android/XcapCallback.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/java/android/XcapEvent.java b/branches/2.0/doubango/bindings/java/android/XcapEvent.java
index 1d5f3b44..f41e5144 100644
--- a/branches/2.0/doubango/bindings/java/android/XcapEvent.java
+++ b/branches/2.0/doubango/bindings/java/android/XcapEvent.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/java/android/XcapMessage.java b/branches/2.0/doubango/bindings/java/android/XcapMessage.java
index 93669119..2292b909 100644
--- a/branches/2.0/doubango/bindings/java/android/XcapMessage.java
+++ b/branches/2.0/doubango/bindings/java/android/XcapMessage.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/java/android/XcapSelector.java b/branches/2.0/doubango/bindings/java/android/XcapSelector.java
index 0a0c297c..d648683b 100644
--- a/branches/2.0/doubango/bindings/java/android/XcapSelector.java
+++ b/branches/2.0/doubango/bindings/java/android/XcapSelector.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/java/android/XcapStack.java b/branches/2.0/doubango/bindings/java/android/XcapStack.java
index 80a360a8..d810d141 100644
--- a/branches/2.0/doubango/bindings/java/android/XcapStack.java
+++ b/branches/2.0/doubango/bindings/java/android/XcapStack.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/java/android/tdav_codec_id_t.java b/branches/2.0/doubango/bindings/java/android/tdav_codec_id_t.java
index 25564376..c72c5607 100644
--- a/branches/2.0/doubango/bindings/java/android/tdav_codec_id_t.java
+++ b/branches/2.0/doubango/bindings/java/android/tdav_codec_id_t.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/java/android/thttp_event_type_t.java b/branches/2.0/doubango/bindings/java/android/thttp_event_type_t.java
index 022295bd..eba6a1fe 100644
--- a/branches/2.0/doubango/bindings/java/android/thttp_event_type_t.java
+++ b/branches/2.0/doubango/bindings/java/android/thttp_event_type_t.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/java/android/tinyWRAP.java b/branches/2.0/doubango/bindings/java/android/tinyWRAP.java
index 1accccfe..9b29ff1c 100644
--- a/branches/2.0/doubango/bindings/java/android/tinyWRAP.java
+++ b/branches/2.0/doubango/bindings/java/android/tinyWRAP.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/java/android/tinyWRAPConstants.java b/branches/2.0/doubango/bindings/java/android/tinyWRAPConstants.java
index 5d5f0941..2a7e158e 100644
--- a/branches/2.0/doubango/bindings/java/android/tinyWRAPConstants.java
+++ b/branches/2.0/doubango/bindings/java/android/tinyWRAPConstants.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/java/android/tinyWRAPJNI.java b/branches/2.0/doubango/bindings/java/android/tinyWRAPJNI.java
index f629f555..fa9980be 100644
--- a/branches/2.0/doubango/bindings/java/android/tinyWRAPJNI.java
+++ b/branches/2.0/doubango/bindings/java/android/tinyWRAPJNI.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * 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.doubango.tinyWRAP;
 
-public class tinyWRAPJNI {
+class tinyWRAPJNI {
   public final static native long new_DDebugCallback();
   public final static native void delete_DDebugCallback(long jarg1);
   public final static native int DDebugCallback_OnDebugInfo(long jarg1, DDebugCallback jarg1_, String jarg2);
@@ -641,30 +641,30 @@ public class tinyWRAPJNI {
   public final static native int MsrpCallback_OnEventSwigExplicitMsrpCallback(long jarg1, MsrpCallback jarg1_, long jarg2, MsrpEvent jarg2_);
   public final static native void MsrpCallback_director_connect(MsrpCallback obj, long cptr, boolean mem_own, boolean weak_global);
   public final static native void MsrpCallback_change_ownership(MsrpCallback obj, long cptr, boolean take_or_release);
-  public final static native long MediaContentCPIM_SWIGUpcast(long jarg1);
-  public final static native long DialogEvent_SWIGUpcast(long jarg1);
-  public final static native long StackEvent_SWIGUpcast(long jarg1);
-  public final static native long InviteEvent_SWIGUpcast(long jarg1);
-  public final static native long MessagingEvent_SWIGUpcast(long jarg1);
-  public final static native long InfoEvent_SWIGUpcast(long jarg1);
-  public final static native long OptionsEvent_SWIGUpcast(long jarg1);
-  public final static native long PublicationEvent_SWIGUpcast(long jarg1);
-  public final static native long RegistrationEvent_SWIGUpcast(long jarg1);
-  public final static native long SubscriptionEvent_SWIGUpcast(long jarg1);
-  public final static native long InviteSession_SWIGUpcast(long jarg1);
-  public final static native long CallSession_SWIGUpcast(long jarg1);
-  public final static native long MsrpSession_SWIGUpcast(long jarg1);
-  public final static native long MessagingSession_SWIGUpcast(long jarg1);
-  public final static native long InfoSession_SWIGUpcast(long jarg1);
-  public final static native long OptionsSession_SWIGUpcast(long jarg1);
-  public final static native long PublicationSession_SWIGUpcast(long jarg1);
-  public final static native long RegistrationSession_SWIGUpcast(long jarg1);
-  public final static native long SubscriptionSession_SWIGUpcast(long jarg1);
-  public final static native long ProxyAudioConsumer_SWIGUpcast(long jarg1);
-  public final static native long ProxyVideoConsumer_SWIGUpcast(long jarg1);
-  public final static native long ProxyAudioProducer_SWIGUpcast(long jarg1);
-  public final static native long ProxyVideoProducer_SWIGUpcast(long jarg1);
-  public final static native long SipStack_SWIGUpcast(long jarg1);
+  public final static native long SWIGMediaContentCPIMUpcast(long jarg1);
+  public final static native long SWIGDialogEventUpcast(long jarg1);
+  public final static native long SWIGStackEventUpcast(long jarg1);
+  public final static native long SWIGInviteEventUpcast(long jarg1);
+  public final static native long SWIGMessagingEventUpcast(long jarg1);
+  public final static native long SWIGInfoEventUpcast(long jarg1);
+  public final static native long SWIGOptionsEventUpcast(long jarg1);
+  public final static native long SWIGPublicationEventUpcast(long jarg1);
+  public final static native long SWIGRegistrationEventUpcast(long jarg1);
+  public final static native long SWIGSubscriptionEventUpcast(long jarg1);
+  public final static native long SWIGInviteSessionUpcast(long jarg1);
+  public final static native long SWIGCallSessionUpcast(long jarg1);
+  public final static native long SWIGMsrpSessionUpcast(long jarg1);
+  public final static native long SWIGMessagingSessionUpcast(long jarg1);
+  public final static native long SWIGInfoSessionUpcast(long jarg1);
+  public final static native long SWIGOptionsSessionUpcast(long jarg1);
+  public final static native long SWIGPublicationSessionUpcast(long jarg1);
+  public final static native long SWIGRegistrationSessionUpcast(long jarg1);
+  public final static native long SWIGSubscriptionSessionUpcast(long jarg1);
+  public final static native long SWIGProxyAudioConsumerUpcast(long jarg1);
+  public final static native long SWIGProxyVideoConsumerUpcast(long jarg1);
+  public final static native long SWIGProxyAudioProducerUpcast(long jarg1);
+  public final static native long SWIGProxyVideoProducerUpcast(long jarg1);
+  public final static native long SWIGSipStackUpcast(long jarg1);
 
   public static int SwigDirector_DDebugCallback_OnDebugInfo(DDebugCallback self, String message) {
     return self.OnDebugInfo(message);
diff --git a/branches/2.0/doubango/bindings/java/android/tinyWRAP_wrap.cxx b/branches/2.0/doubango/bindings/java/android/tinyWRAP_wrap.cxx
index 487a6b90..8db2097c 100644
--- a/branches/2.0/doubango/bindings/java/android/tinyWRAP_wrap.cxx
+++ b/branches/2.0/doubango/bindings/java/android/tinyWRAP_wrap.cxx
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  * 
  * 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
@@ -212,6 +212,9 @@ static void SWIGUNUSED SWIG_JavaThrowException(JNIEnv *jenv, SWIG_JavaExceptionC
 #define SWIG_contract_assert(nullreturn, expr, msg) if (!(expr)) {SWIG_JavaThrowException(jenv, SWIG_JavaIllegalArgumentException, msg); return nullreturn; } else
 
 /* -----------------------------------------------------------------------------
+ * See the LICENSE file for information on copyright, usage and redistribution
+ * of SWIG, and the README file for authors - http://www.swig.org/release.html.
+ *
  * director.swg
  *
  * This file contains support for director classes that proxy
@@ -238,9 +241,9 @@ namespace Swig {
 
     bool set(JNIEnv *jenv, jobject jobj, bool mem_own, bool weak_global) {
       if (!jthis_) {
-        weak_global_ = weak_global || !mem_own; // hold as weak global if explicitly requested or not owned
+        weak_global_ = weak_global;
         if (jobj)
-          jthis_ = weak_global_ ? jenv->NewWeakGlobalRef(jobj) : jenv->NewGlobalRef(jobj);
+          jthis_ = ((weak_global_ || !mem_own) ? jenv->NewWeakGlobalRef(jobj) : jenv->NewGlobalRef(jobj));
 #if defined(DEBUG_DIRECTOR_OWNED)
         std::cout << "JObjectWrapper::set(" << jobj << ", " << (weak_global ? "weak_global" : "global_ref") << ") -> " << jthis_ << std::endl;
 #endif
@@ -281,7 +284,6 @@ namespace Swig {
       weak_global_ = true;
     }
 
-    /* Only call peek if you know what you are doing wrt to weak/global references */
     jobject peek() {
       return jthis_;
     }
@@ -326,29 +328,21 @@ namespace Swig {
     class JNIEnvWrapper {
       const Director *director_;
       JNIEnv *jenv_;
-      int env_status;
     public:
-      JNIEnvWrapper(const Director *director) : director_(director), jenv_(0), env_status(0) {
-#if defined(__ANDROID__)
-        JNIEnv **jenv = &jenv_;
-#else
-        void **jenv = (void **)&jenv_;
-#endif
-        env_status = director_->swig_jvm_->GetEnv((void **)&jenv_, JNI_VERSION_1_2);
+      JNIEnvWrapper(const Director *director) : director_(director), jenv_(0) {
 #if defined(SWIG_JAVA_ATTACH_CURRENT_THREAD_AS_DAEMON)
         // Attach a daemon thread to the JVM. Useful when the JVM should not wait for 
         // the thread to exit upon shutdown. Only for jdk-1.4 and later.
-        director_->swig_jvm_->AttachCurrentThreadAsDaemon(jenv, NULL);
+        director_->swig_jvm_->AttachCurrentThreadAsDaemon((void **) &jenv_, NULL);
 #else
-        director_->swig_jvm_->AttachCurrentThread(jenv, NULL);
+        director_->swig_jvm_->AttachCurrentThread((void **) &jenv_, NULL);
 #endif
       }
       ~JNIEnvWrapper() {
 #if !defined(SWIG_JAVA_NO_DETACH_CURRENT_THREAD)
         // Some JVMs, eg jdk-1.4.2 and lower on Solaris have a bug and crash with the DetachCurrentThread call.
         // However, without this call, the JVM hangs on exit when the thread was not created by the JVM and creates a memory leak.
-        if (env_status == JNI_EDETACHED)
-          director_->swig_jvm_->DetachCurrentThread();
+        director_->swig_jvm_->DetachCurrentThread();
 #endif
       }
       JNIEnv *getJNIEnv() const {
@@ -363,7 +357,7 @@ namespace Swig {
     void swig_disconnect_director_self(const char *disconn_method) {
       JNIEnvWrapper jnienv(this) ;
       JNIEnv *jenv = jnienv.getJNIEnv() ;
-      jobject jobj = swig_self_.get(jenv);
+      jobject jobj = swig_self_.peek();
 #if defined(DEBUG_DIRECTOR_OWNED)
       std::cout << "Swig::Director::disconnect_director_self(" << jobj << ")" << std::endl;
 #endif
@@ -376,7 +370,6 @@ namespace Swig {
           jenv->CallVoidMethod(jobj, disconn_meth);
         }
       }
-      jenv->DeleteLocalRef(jobj);
     }
 
   public:
@@ -410,10 +403,8 @@ namespace Swig {
 
 
 namespace Swig {
-  namespace {
-    jclass jclass_tinyWRAPJNI = NULL;
-    jmethodID director_methids[37];
-  }
+  static jclass jclass_tinyWRAPJNI = NULL;
+  static jmethodID director_methids[37];
 }
 
 #include <stdint.h>		// Use the C99 official header
@@ -484,7 +475,7 @@ int SwigDirector_DDebugCallback::OnDebugInfo(char const *message) {
       if (!jmessage) return c_result;
     }
     jresult = (jint) jenv->CallStaticIntMethod(Swig::jclass_tinyWRAPJNI, Swig::director_methids[0], swigjobj, jmessage);
-    if (jenv->ExceptionCheck() == JNI_TRUE) return c_result;
+    if (jenv->ExceptionOccurred()) return c_result;
     c_result = (int)jresult; 
   } else {
     SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null upcall object");
@@ -512,7 +503,7 @@ int SwigDirector_DDebugCallback::OnDebugWarn(char const *message) {
       if (!jmessage) return c_result;
     }
     jresult = (jint) jenv->CallStaticIntMethod(Swig::jclass_tinyWRAPJNI, Swig::director_methids[1], swigjobj, jmessage);
-    if (jenv->ExceptionCheck() == JNI_TRUE) return c_result;
+    if (jenv->ExceptionOccurred()) return c_result;
     c_result = (int)jresult; 
   } else {
     SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null upcall object");
@@ -540,7 +531,7 @@ int SwigDirector_DDebugCallback::OnDebugError(char const *message) {
       if (!jmessage) return c_result;
     }
     jresult = (jint) jenv->CallStaticIntMethod(Swig::jclass_tinyWRAPJNI, Swig::director_methids[2], swigjobj, jmessage);
-    if (jenv->ExceptionCheck() == JNI_TRUE) return c_result;
+    if (jenv->ExceptionOccurred()) return c_result;
     c_result = (int)jresult; 
   } else {
     SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null upcall object");
@@ -568,7 +559,7 @@ int SwigDirector_DDebugCallback::OnDebugFatal(char const *message) {
       if (!jmessage) return c_result;
     }
     jresult = (jint) jenv->CallStaticIntMethod(Swig::jclass_tinyWRAPJNI, Swig::director_methids[3], swigjobj, jmessage);
-    if (jenv->ExceptionCheck() == JNI_TRUE) return c_result;
+    if (jenv->ExceptionOccurred()) return c_result;
     c_result = (int)jresult; 
   } else {
     SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null upcall object");
@@ -645,7 +636,7 @@ int SwigDirector_T140Callback::ondata(T140CallbackData const *pData) {
   if (swigjobj && jenv->IsSameObject(swigjobj, NULL) == JNI_FALSE) {
     *((T140CallbackData **)&jpData) = (T140CallbackData *) pData; 
     jresult = (jint) jenv->CallStaticIntMethod(Swig::jclass_tinyWRAPJNI, Swig::director_methids[4], swigjobj, jpData);
-    if (jenv->ExceptionCheck() == JNI_TRUE) return c_result;
+    if (jenv->ExceptionOccurred()) return c_result;
     c_result = (int)jresult; 
   } else {
     SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null upcall object");
@@ -731,7 +722,7 @@ int SwigDirector_ProxyPluginMgrCallback::OnPluginCreated(uint64_t id, enum twrap
     }
     jtype = (jint) type;
     jresult = (jint) jenv->CallStaticIntMethod(Swig::jclass_tinyWRAPJNI, Swig::director_methids[5], swigjobj, jid, jtype);
-    if (jenv->ExceptionCheck() == JNI_TRUE) return c_result;
+    if (jenv->ExceptionOccurred()) return c_result;
     c_result = (int)jresult; 
   } else {
     SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null upcall object");
@@ -773,7 +764,7 @@ int SwigDirector_ProxyPluginMgrCallback::OnPluginDestroyed(uint64_t id, enum twr
     }
     jtype = (jint) type;
     jresult = (jint) jenv->CallStaticIntMethod(Swig::jclass_tinyWRAPJNI, Swig::director_methids[6], swigjobj, jid, jtype);
-    if (jenv->ExceptionCheck() == JNI_TRUE) return c_result;
+    if (jenv->ExceptionOccurred()) return c_result;
     c_result = (int)jresult; 
   } else {
     SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null upcall object");
@@ -848,7 +839,7 @@ int SwigDirector_ProxyAudioConsumerCallback::prepare(int ptime, int rate, int ch
     jrate = (jint) rate;
     jchannels = (jint) channels;
     jresult = (jint) jenv->CallStaticIntMethod(Swig::jclass_tinyWRAPJNI, Swig::director_methids[7], swigjobj, jptime, jrate, jchannels);
-    if (jenv->ExceptionCheck() == JNI_TRUE) return c_result;
+    if (jenv->ExceptionOccurred()) return c_result;
     c_result = (int)jresult; 
   } else {
     SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null upcall object");
@@ -870,7 +861,7 @@ int SwigDirector_ProxyAudioConsumerCallback::start() {
   swigjobj = swig_get_self(jenv);
   if (swigjobj && jenv->IsSameObject(swigjobj, NULL) == JNI_FALSE) {
     jresult = (jint) jenv->CallStaticIntMethod(Swig::jclass_tinyWRAPJNI, Swig::director_methids[8], swigjobj);
-    if (jenv->ExceptionCheck() == JNI_TRUE) return c_result;
+    if (jenv->ExceptionOccurred()) return c_result;
     c_result = (int)jresult; 
   } else {
     SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null upcall object");
@@ -892,7 +883,7 @@ int SwigDirector_ProxyAudioConsumerCallback::pause() {
   swigjobj = swig_get_self(jenv);
   if (swigjobj && jenv->IsSameObject(swigjobj, NULL) == JNI_FALSE) {
     jresult = (jint) jenv->CallStaticIntMethod(Swig::jclass_tinyWRAPJNI, Swig::director_methids[9], swigjobj);
-    if (jenv->ExceptionCheck() == JNI_TRUE) return c_result;
+    if (jenv->ExceptionOccurred()) return c_result;
     c_result = (int)jresult; 
   } else {
     SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null upcall object");
@@ -914,7 +905,7 @@ int SwigDirector_ProxyAudioConsumerCallback::stop() {
   swigjobj = swig_get_self(jenv);
   if (swigjobj && jenv->IsSameObject(swigjobj, NULL) == JNI_FALSE) {
     jresult = (jint) jenv->CallStaticIntMethod(Swig::jclass_tinyWRAPJNI, Swig::director_methids[10], swigjobj);
-    if (jenv->ExceptionCheck() == JNI_TRUE) return c_result;
+    if (jenv->ExceptionOccurred()) return c_result;
     c_result = (int)jresult; 
   } else {
     SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null upcall object");
@@ -995,7 +986,7 @@ int SwigDirector_ProxyVideoConsumerCallback::prepare(int nWidth, int nHeight, in
     jnHeight = (jint) nHeight;
     jnFps = (jint) nFps;
     jresult = (jint) jenv->CallStaticIntMethod(Swig::jclass_tinyWRAPJNI, Swig::director_methids[11], swigjobj, jnWidth, jnHeight, jnFps);
-    if (jenv->ExceptionCheck() == JNI_TRUE) return c_result;
+    if (jenv->ExceptionOccurred()) return c_result;
     c_result = (int)jresult; 
   } else {
     SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null upcall object");
@@ -1019,7 +1010,7 @@ int SwigDirector_ProxyVideoConsumerCallback::consume(ProxyVideoFrame const *fram
   if (swigjobj && jenv->IsSameObject(swigjobj, NULL) == JNI_FALSE) {
     *((ProxyVideoFrame **)&jframe) = (ProxyVideoFrame *) frame; 
     jresult = (jint) jenv->CallStaticIntMethod(Swig::jclass_tinyWRAPJNI, Swig::director_methids[12], swigjobj, jframe);
-    if (jenv->ExceptionCheck() == JNI_TRUE) return c_result;
+    if (jenv->ExceptionOccurred()) return c_result;
     c_result = (int)jresult; 
   } else {
     SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null upcall object");
@@ -1045,7 +1036,7 @@ int SwigDirector_ProxyVideoConsumerCallback::bufferCopied(unsigned int nCopiedSi
     jnCopiedSize = (jlong) nCopiedSize;
     jnAvailableSize = (jlong) nAvailableSize;
     jresult = (jint) jenv->CallStaticIntMethod(Swig::jclass_tinyWRAPJNI, Swig::director_methids[13], swigjobj, jnCopiedSize, jnAvailableSize);
-    if (jenv->ExceptionCheck() == JNI_TRUE) return c_result;
+    if (jenv->ExceptionOccurred()) return c_result;
     c_result = (int)jresult; 
   } else {
     SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null upcall object");
@@ -1067,7 +1058,7 @@ int SwigDirector_ProxyVideoConsumerCallback::start() {
   swigjobj = swig_get_self(jenv);
   if (swigjobj && jenv->IsSameObject(swigjobj, NULL) == JNI_FALSE) {
     jresult = (jint) jenv->CallStaticIntMethod(Swig::jclass_tinyWRAPJNI, Swig::director_methids[14], swigjobj);
-    if (jenv->ExceptionCheck() == JNI_TRUE) return c_result;
+    if (jenv->ExceptionOccurred()) return c_result;
     c_result = (int)jresult; 
   } else {
     SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null upcall object");
@@ -1089,7 +1080,7 @@ int SwigDirector_ProxyVideoConsumerCallback::pause() {
   swigjobj = swig_get_self(jenv);
   if (swigjobj && jenv->IsSameObject(swigjobj, NULL) == JNI_FALSE) {
     jresult = (jint) jenv->CallStaticIntMethod(Swig::jclass_tinyWRAPJNI, Swig::director_methids[15], swigjobj);
-    if (jenv->ExceptionCheck() == JNI_TRUE) return c_result;
+    if (jenv->ExceptionOccurred()) return c_result;
     c_result = (int)jresult; 
   } else {
     SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null upcall object");
@@ -1111,7 +1102,7 @@ int SwigDirector_ProxyVideoConsumerCallback::stop() {
   swigjobj = swig_get_self(jenv);
   if (swigjobj && jenv->IsSameObject(swigjobj, NULL) == JNI_FALSE) {
     jresult = (jint) jenv->CallStaticIntMethod(Swig::jclass_tinyWRAPJNI, Swig::director_methids[16], swigjobj);
-    if (jenv->ExceptionCheck() == JNI_TRUE) return c_result;
+    if (jenv->ExceptionOccurred()) return c_result;
     c_result = (int)jresult; 
   } else {
     SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null upcall object");
@@ -1198,7 +1189,7 @@ int SwigDirector_ProxyAudioProducerCallback::prepare(int ptime, int rate, int ch
     jrate = (jint) rate;
     jchannels = (jint) channels;
     jresult = (jint) jenv->CallStaticIntMethod(Swig::jclass_tinyWRAPJNI, Swig::director_methids[17], swigjobj, jptime, jrate, jchannels);
-    if (jenv->ExceptionCheck() == JNI_TRUE) return c_result;
+    if (jenv->ExceptionOccurred()) return c_result;
     c_result = (int)jresult; 
   } else {
     SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null upcall object");
@@ -1220,7 +1211,7 @@ int SwigDirector_ProxyAudioProducerCallback::start() {
   swigjobj = swig_get_self(jenv);
   if (swigjobj && jenv->IsSameObject(swigjobj, NULL) == JNI_FALSE) {
     jresult = (jint) jenv->CallStaticIntMethod(Swig::jclass_tinyWRAPJNI, Swig::director_methids[18], swigjobj);
-    if (jenv->ExceptionCheck() == JNI_TRUE) return c_result;
+    if (jenv->ExceptionOccurred()) return c_result;
     c_result = (int)jresult; 
   } else {
     SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null upcall object");
@@ -1242,7 +1233,7 @@ int SwigDirector_ProxyAudioProducerCallback::pause() {
   swigjobj = swig_get_self(jenv);
   if (swigjobj && jenv->IsSameObject(swigjobj, NULL) == JNI_FALSE) {
     jresult = (jint) jenv->CallStaticIntMethod(Swig::jclass_tinyWRAPJNI, Swig::director_methids[19], swigjobj);
-    if (jenv->ExceptionCheck() == JNI_TRUE) return c_result;
+    if (jenv->ExceptionOccurred()) return c_result;
     c_result = (int)jresult; 
   } else {
     SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null upcall object");
@@ -1264,7 +1255,7 @@ int SwigDirector_ProxyAudioProducerCallback::stop() {
   swigjobj = swig_get_self(jenv);
   if (swigjobj && jenv->IsSameObject(swigjobj, NULL) == JNI_FALSE) {
     jresult = (jint) jenv->CallStaticIntMethod(Swig::jclass_tinyWRAPJNI, Swig::director_methids[20], swigjobj);
-    if (jenv->ExceptionCheck() == JNI_TRUE) return c_result;
+    if (jenv->ExceptionOccurred()) return c_result;
     c_result = (int)jresult; 
   } else {
     SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null upcall object");
@@ -1286,7 +1277,7 @@ int SwigDirector_ProxyAudioProducerCallback::fillPushBuffer() {
   swigjobj = swig_get_self(jenv);
   if (swigjobj && jenv->IsSameObject(swigjobj, NULL) == JNI_FALSE) {
     jresult = (jint) jenv->CallStaticIntMethod(Swig::jclass_tinyWRAPJNI, Swig::director_methids[21], swigjobj);
-    if (jenv->ExceptionCheck() == JNI_TRUE) return c_result;
+    if (jenv->ExceptionOccurred()) return c_result;
     c_result = (int)jresult; 
   } else {
     SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null upcall object");
@@ -1370,7 +1361,7 @@ int SwigDirector_ProxyVideoProducerCallback::prepare(int width, int height, int
     jheight = (jint) height;
     jfps = (jint) fps;
     jresult = (jint) jenv->CallStaticIntMethod(Swig::jclass_tinyWRAPJNI, Swig::director_methids[22], swigjobj, jwidth, jheight, jfps);
-    if (jenv->ExceptionCheck() == JNI_TRUE) return c_result;
+    if (jenv->ExceptionOccurred()) return c_result;
     c_result = (int)jresult; 
   } else {
     SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null upcall object");
@@ -1392,7 +1383,7 @@ int SwigDirector_ProxyVideoProducerCallback::start() {
   swigjobj = swig_get_self(jenv);
   if (swigjobj && jenv->IsSameObject(swigjobj, NULL) == JNI_FALSE) {
     jresult = (jint) jenv->CallStaticIntMethod(Swig::jclass_tinyWRAPJNI, Swig::director_methids[23], swigjobj);
-    if (jenv->ExceptionCheck() == JNI_TRUE) return c_result;
+    if (jenv->ExceptionOccurred()) return c_result;
     c_result = (int)jresult; 
   } else {
     SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null upcall object");
@@ -1414,7 +1405,7 @@ int SwigDirector_ProxyVideoProducerCallback::pause() {
   swigjobj = swig_get_self(jenv);
   if (swigjobj && jenv->IsSameObject(swigjobj, NULL) == JNI_FALSE) {
     jresult = (jint) jenv->CallStaticIntMethod(Swig::jclass_tinyWRAPJNI, Swig::director_methids[24], swigjobj);
-    if (jenv->ExceptionCheck() == JNI_TRUE) return c_result;
+    if (jenv->ExceptionOccurred()) return c_result;
     c_result = (int)jresult; 
   } else {
     SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null upcall object");
@@ -1436,7 +1427,7 @@ int SwigDirector_ProxyVideoProducerCallback::stop() {
   swigjobj = swig_get_self(jenv);
   if (swigjobj && jenv->IsSameObject(swigjobj, NULL) == JNI_FALSE) {
     jresult = (jint) jenv->CallStaticIntMethod(Swig::jclass_tinyWRAPJNI, Swig::director_methids[25], swigjobj);
-    if (jenv->ExceptionCheck() == JNI_TRUE) return c_result;
+    if (jenv->ExceptionOccurred()) return c_result;
     c_result = (int)jresult; 
   } else {
     SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null upcall object");
@@ -1513,7 +1504,7 @@ int SwigDirector_SipCallback::OnDialogEvent(DialogEvent const *e) {
   if (swigjobj && jenv->IsSameObject(swigjobj, NULL) == JNI_FALSE) {
     *((DialogEvent **)&je) = (DialogEvent *) e; 
     jresult = (jint) jenv->CallStaticIntMethod(Swig::jclass_tinyWRAPJNI, Swig::director_methids[26], swigjobj, je);
-    if (jenv->ExceptionCheck() == JNI_TRUE) return c_result;
+    if (jenv->ExceptionOccurred()) return c_result;
     c_result = (int)jresult; 
   } else {
     SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null upcall object");
@@ -1537,7 +1528,7 @@ int SwigDirector_SipCallback::OnStackEvent(StackEvent const *e) {
   if (swigjobj && jenv->IsSameObject(swigjobj, NULL) == JNI_FALSE) {
     *((StackEvent **)&je) = (StackEvent *) e; 
     jresult = (jint) jenv->CallStaticIntMethod(Swig::jclass_tinyWRAPJNI, Swig::director_methids[27], swigjobj, je);
-    if (jenv->ExceptionCheck() == JNI_TRUE) return c_result;
+    if (jenv->ExceptionOccurred()) return c_result;
     c_result = (int)jresult; 
   } else {
     SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null upcall object");
@@ -1561,7 +1552,7 @@ int SwigDirector_SipCallback::OnInviteEvent(InviteEvent const *e) {
   if (swigjobj && jenv->IsSameObject(swigjobj, NULL) == JNI_FALSE) {
     *((InviteEvent **)&je) = (InviteEvent *) e; 
     jresult = (jint) jenv->CallStaticIntMethod(Swig::jclass_tinyWRAPJNI, Swig::director_methids[28], swigjobj, je);
-    if (jenv->ExceptionCheck() == JNI_TRUE) return c_result;
+    if (jenv->ExceptionOccurred()) return c_result;
     c_result = (int)jresult; 
   } else {
     SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null upcall object");
@@ -1585,7 +1576,7 @@ int SwigDirector_SipCallback::OnMessagingEvent(MessagingEvent const *e) {
   if (swigjobj && jenv->IsSameObject(swigjobj, NULL) == JNI_FALSE) {
     *((MessagingEvent **)&je) = (MessagingEvent *) e; 
     jresult = (jint) jenv->CallStaticIntMethod(Swig::jclass_tinyWRAPJNI, Swig::director_methids[29], swigjobj, je);
-    if (jenv->ExceptionCheck() == JNI_TRUE) return c_result;
+    if (jenv->ExceptionOccurred()) return c_result;
     c_result = (int)jresult; 
   } else {
     SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null upcall object");
@@ -1609,7 +1600,7 @@ int SwigDirector_SipCallback::OnInfoEvent(InfoEvent const *e) {
   if (swigjobj && jenv->IsSameObject(swigjobj, NULL) == JNI_FALSE) {
     *((InfoEvent **)&je) = (InfoEvent *) e; 
     jresult = (jint) jenv->CallStaticIntMethod(Swig::jclass_tinyWRAPJNI, Swig::director_methids[30], swigjobj, je);
-    if (jenv->ExceptionCheck() == JNI_TRUE) return c_result;
+    if (jenv->ExceptionOccurred()) return c_result;
     c_result = (int)jresult; 
   } else {
     SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null upcall object");
@@ -1633,7 +1624,7 @@ int SwigDirector_SipCallback::OnOptionsEvent(OptionsEvent const *e) {
   if (swigjobj && jenv->IsSameObject(swigjobj, NULL) == JNI_FALSE) {
     *((OptionsEvent **)&je) = (OptionsEvent *) e; 
     jresult = (jint) jenv->CallStaticIntMethod(Swig::jclass_tinyWRAPJNI, Swig::director_methids[31], swigjobj, je);
-    if (jenv->ExceptionCheck() == JNI_TRUE) return c_result;
+    if (jenv->ExceptionOccurred()) return c_result;
     c_result = (int)jresult; 
   } else {
     SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null upcall object");
@@ -1657,7 +1648,7 @@ int SwigDirector_SipCallback::OnPublicationEvent(PublicationEvent const *e) {
   if (swigjobj && jenv->IsSameObject(swigjobj, NULL) == JNI_FALSE) {
     *((PublicationEvent **)&je) = (PublicationEvent *) e; 
     jresult = (jint) jenv->CallStaticIntMethod(Swig::jclass_tinyWRAPJNI, Swig::director_methids[32], swigjobj, je);
-    if (jenv->ExceptionCheck() == JNI_TRUE) return c_result;
+    if (jenv->ExceptionOccurred()) return c_result;
     c_result = (int)jresult; 
   } else {
     SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null upcall object");
@@ -1681,7 +1672,7 @@ int SwigDirector_SipCallback::OnRegistrationEvent(RegistrationEvent const *e) {
   if (swigjobj && jenv->IsSameObject(swigjobj, NULL) == JNI_FALSE) {
     *((RegistrationEvent **)&je) = (RegistrationEvent *) e; 
     jresult = (jint) jenv->CallStaticIntMethod(Swig::jclass_tinyWRAPJNI, Swig::director_methids[33], swigjobj, je);
-    if (jenv->ExceptionCheck() == JNI_TRUE) return c_result;
+    if (jenv->ExceptionOccurred()) return c_result;
     c_result = (int)jresult; 
   } else {
     SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null upcall object");
@@ -1705,7 +1696,7 @@ int SwigDirector_SipCallback::OnSubscriptionEvent(SubscriptionEvent const *e) {
   if (swigjobj && jenv->IsSameObject(swigjobj, NULL) == JNI_FALSE) {
     *((SubscriptionEvent **)&je) = (SubscriptionEvent *) e; 
     jresult = (jint) jenv->CallStaticIntMethod(Swig::jclass_tinyWRAPJNI, Swig::director_methids[34], swigjobj, je);
-    if (jenv->ExceptionCheck() == JNI_TRUE) return c_result;
+    if (jenv->ExceptionOccurred()) return c_result;
     c_result = (int)jresult; 
   } else {
     SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null upcall object");
@@ -1797,7 +1788,7 @@ int SwigDirector_XcapCallback::onEvent(XcapEvent const *e) const {
   if (swigjobj && jenv->IsSameObject(swigjobj, NULL) == JNI_FALSE) {
     *((XcapEvent **)&je) = (XcapEvent *) e; 
     jresult = (jint) jenv->CallStaticIntMethod(Swig::jclass_tinyWRAPJNI, Swig::director_methids[35], swigjobj, je);
-    if (jenv->ExceptionCheck() == JNI_TRUE) return c_result;
+    if (jenv->ExceptionOccurred()) return c_result;
     c_result = (int)jresult; 
   } else {
     SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null upcall object");
@@ -1865,7 +1856,7 @@ int SwigDirector_MsrpCallback::OnEvent(MsrpEvent const *e) {
   if (swigjobj && jenv->IsSameObject(swigjobj, NULL) == JNI_FALSE) {
     *((MsrpEvent **)&je) = (MsrpEvent *) e; 
     jresult = (jint) jenv->CallStaticIntMethod(Swig::jclass_tinyWRAPJNI, Swig::director_methids[36], swigjobj, je);
-    if (jenv->ExceptionCheck() == JNI_TRUE) return c_result;
+    if (jenv->ExceptionOccurred()) return c_result;
     c_result = (int)jresult; 
   } else {
     SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null upcall object");
@@ -11078,7 +11069,6 @@ SWIGEXPORT jstring JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_SipStack_1dnsN
       SWIG_JavaThrowException(jenv, SWIG_JavaIndexOutOfBoundsException, "Array must contain at least 1 element");
       return 0;
     }
-    temp4 = (unsigned short)0;
     arg4 = &temp4; 
   }
   result = (char *)(arg1)->dnsNaptrSrv((char const *)arg2,(char const *)arg3,arg4);
@@ -11121,7 +11111,6 @@ SWIGEXPORT jstring JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_SipStack_1dnsS
       SWIG_JavaThrowException(jenv, SWIG_JavaIndexOutOfBoundsException, "Array must contain at least 1 element");
       return 0;
     }
-    temp3 = (unsigned short)0;
     arg3 = &temp3; 
   }
   result = (char *)(arg1)->dnsSrv((char const *)arg2,arg3);
@@ -11180,7 +11169,6 @@ SWIGEXPORT jstring JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_SipStack_1getL
       SWIG_JavaThrowException(jenv, SWIG_JavaIndexOutOfBoundsException, "Array must contain at least 1 element");
       return 0;
     }
-    temp3 = (unsigned short)0;
     arg3 = &temp3; 
   }
   result = (char *)(arg1)->getLocalIPnPort((char const *)arg2,arg3);
@@ -12840,7 +12828,6 @@ SWIGEXPORT void JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_MsrpMessage_1getB
       SWIG_JavaThrowException(jenv, SWIG_JavaIndexOutOfBoundsException, "Array must contain at least 1 element");
       return ;
     }
-    temp2 = (int64_t)0;
     arg2 = &temp2; 
   }
   {
@@ -12852,7 +12839,6 @@ SWIGEXPORT void JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_MsrpMessage_1getB
       SWIG_JavaThrowException(jenv, SWIG_JavaIndexOutOfBoundsException, "Array must contain at least 1 element");
       return ;
     }
-    temp3 = (int64_t)0;
     arg3 = &temp3; 
   }
   {
@@ -12864,7 +12850,6 @@ SWIGEXPORT void JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_MsrpMessage_1getB
       SWIG_JavaThrowException(jenv, SWIG_JavaIndexOutOfBoundsException, "Array must contain at least 1 element");
       return ;
     }
-    temp4 = (int64_t)0;
     arg4 = &temp4; 
   }
   (arg1)->getByteRange(arg2,arg3,arg4);
@@ -13153,7 +13138,7 @@ SWIGEXPORT void JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_MsrpCallback_1cha
 }
 
 
-SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_MediaContentCPIM_1SWIGUpcast(JNIEnv *jenv, jclass jcls, jlong jarg1) {
+SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_SWIGMediaContentCPIMUpcast(JNIEnv *jenv, jclass jcls, jlong jarg1) {
     jlong baseptr = 0;
     (void)jenv;
     (void)jcls;
@@ -13161,7 +13146,7 @@ SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_MediaContentCPIM
     return baseptr;
 }
 
-SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_DialogEvent_1SWIGUpcast(JNIEnv *jenv, jclass jcls, jlong jarg1) {
+SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_SWIGDialogEventUpcast(JNIEnv *jenv, jclass jcls, jlong jarg1) {
     jlong baseptr = 0;
     (void)jenv;
     (void)jcls;
@@ -13169,7 +13154,7 @@ SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_DialogEvent_1SWI
     return baseptr;
 }
 
-SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_StackEvent_1SWIGUpcast(JNIEnv *jenv, jclass jcls, jlong jarg1) {
+SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_SWIGStackEventUpcast(JNIEnv *jenv, jclass jcls, jlong jarg1) {
     jlong baseptr = 0;
     (void)jenv;
     (void)jcls;
@@ -13177,7 +13162,7 @@ SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_StackEvent_1SWIG
     return baseptr;
 }
 
-SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_InviteEvent_1SWIGUpcast(JNIEnv *jenv, jclass jcls, jlong jarg1) {
+SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_SWIGInviteEventUpcast(JNIEnv *jenv, jclass jcls, jlong jarg1) {
     jlong baseptr = 0;
     (void)jenv;
     (void)jcls;
@@ -13185,7 +13170,7 @@ SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_InviteEvent_1SWI
     return baseptr;
 }
 
-SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_MessagingEvent_1SWIGUpcast(JNIEnv *jenv, jclass jcls, jlong jarg1) {
+SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_SWIGMessagingEventUpcast(JNIEnv *jenv, jclass jcls, jlong jarg1) {
     jlong baseptr = 0;
     (void)jenv;
     (void)jcls;
@@ -13193,7 +13178,7 @@ SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_MessagingEvent_1
     return baseptr;
 }
 
-SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_InfoEvent_1SWIGUpcast(JNIEnv *jenv, jclass jcls, jlong jarg1) {
+SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_SWIGInfoEventUpcast(JNIEnv *jenv, jclass jcls, jlong jarg1) {
     jlong baseptr = 0;
     (void)jenv;
     (void)jcls;
@@ -13201,7 +13186,7 @@ SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_InfoEvent_1SWIGU
     return baseptr;
 }
 
-SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_OptionsEvent_1SWIGUpcast(JNIEnv *jenv, jclass jcls, jlong jarg1) {
+SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_SWIGOptionsEventUpcast(JNIEnv *jenv, jclass jcls, jlong jarg1) {
     jlong baseptr = 0;
     (void)jenv;
     (void)jcls;
@@ -13209,7 +13194,7 @@ SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_OptionsEvent_1SW
     return baseptr;
 }
 
-SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_PublicationEvent_1SWIGUpcast(JNIEnv *jenv, jclass jcls, jlong jarg1) {
+SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_SWIGPublicationEventUpcast(JNIEnv *jenv, jclass jcls, jlong jarg1) {
     jlong baseptr = 0;
     (void)jenv;
     (void)jcls;
@@ -13217,7 +13202,7 @@ SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_PublicationEvent
     return baseptr;
 }
 
-SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_RegistrationEvent_1SWIGUpcast(JNIEnv *jenv, jclass jcls, jlong jarg1) {
+SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_SWIGRegistrationEventUpcast(JNIEnv *jenv, jclass jcls, jlong jarg1) {
     jlong baseptr = 0;
     (void)jenv;
     (void)jcls;
@@ -13225,7 +13210,7 @@ SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_RegistrationEven
     return baseptr;
 }
 
-SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_SubscriptionEvent_1SWIGUpcast(JNIEnv *jenv, jclass jcls, jlong jarg1) {
+SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_SWIGSubscriptionEventUpcast(JNIEnv *jenv, jclass jcls, jlong jarg1) {
     jlong baseptr = 0;
     (void)jenv;
     (void)jcls;
@@ -13233,7 +13218,7 @@ SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_SubscriptionEven
     return baseptr;
 }
 
-SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_InviteSession_1SWIGUpcast(JNIEnv *jenv, jclass jcls, jlong jarg1) {
+SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_SWIGInviteSessionUpcast(JNIEnv *jenv, jclass jcls, jlong jarg1) {
     jlong baseptr = 0;
     (void)jenv;
     (void)jcls;
@@ -13241,7 +13226,7 @@ SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_InviteSession_1S
     return baseptr;
 }
 
-SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_CallSession_1SWIGUpcast(JNIEnv *jenv, jclass jcls, jlong jarg1) {
+SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_SWIGCallSessionUpcast(JNIEnv *jenv, jclass jcls, jlong jarg1) {
     jlong baseptr = 0;
     (void)jenv;
     (void)jcls;
@@ -13249,7 +13234,7 @@ SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_CallSession_1SWI
     return baseptr;
 }
 
-SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_MsrpSession_1SWIGUpcast(JNIEnv *jenv, jclass jcls, jlong jarg1) {
+SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_SWIGMsrpSessionUpcast(JNIEnv *jenv, jclass jcls, jlong jarg1) {
     jlong baseptr = 0;
     (void)jenv;
     (void)jcls;
@@ -13257,7 +13242,7 @@ SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_MsrpSession_1SWI
     return baseptr;
 }
 
-SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_MessagingSession_1SWIGUpcast(JNIEnv *jenv, jclass jcls, jlong jarg1) {
+SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_SWIGMessagingSessionUpcast(JNIEnv *jenv, jclass jcls, jlong jarg1) {
     jlong baseptr = 0;
     (void)jenv;
     (void)jcls;
@@ -13265,7 +13250,7 @@ SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_MessagingSession
     return baseptr;
 }
 
-SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_InfoSession_1SWIGUpcast(JNIEnv *jenv, jclass jcls, jlong jarg1) {
+SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_SWIGInfoSessionUpcast(JNIEnv *jenv, jclass jcls, jlong jarg1) {
     jlong baseptr = 0;
     (void)jenv;
     (void)jcls;
@@ -13273,7 +13258,7 @@ SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_InfoSession_1SWI
     return baseptr;
 }
 
-SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_OptionsSession_1SWIGUpcast(JNIEnv *jenv, jclass jcls, jlong jarg1) {
+SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_SWIGOptionsSessionUpcast(JNIEnv *jenv, jclass jcls, jlong jarg1) {
     jlong baseptr = 0;
     (void)jenv;
     (void)jcls;
@@ -13281,7 +13266,7 @@ SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_OptionsSession_1
     return baseptr;
 }
 
-SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_PublicationSession_1SWIGUpcast(JNIEnv *jenv, jclass jcls, jlong jarg1) {
+SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_SWIGPublicationSessionUpcast(JNIEnv *jenv, jclass jcls, jlong jarg1) {
     jlong baseptr = 0;
     (void)jenv;
     (void)jcls;
@@ -13289,7 +13274,7 @@ SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_PublicationSessi
     return baseptr;
 }
 
-SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_RegistrationSession_1SWIGUpcast(JNIEnv *jenv, jclass jcls, jlong jarg1) {
+SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_SWIGRegistrationSessionUpcast(JNIEnv *jenv, jclass jcls, jlong jarg1) {
     jlong baseptr = 0;
     (void)jenv;
     (void)jcls;
@@ -13297,7 +13282,7 @@ SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_RegistrationSess
     return baseptr;
 }
 
-SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_SubscriptionSession_1SWIGUpcast(JNIEnv *jenv, jclass jcls, jlong jarg1) {
+SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_SWIGSubscriptionSessionUpcast(JNIEnv *jenv, jclass jcls, jlong jarg1) {
     jlong baseptr = 0;
     (void)jenv;
     (void)jcls;
@@ -13305,7 +13290,7 @@ SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_SubscriptionSess
     return baseptr;
 }
 
-SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_ProxyAudioConsumer_1SWIGUpcast(JNIEnv *jenv, jclass jcls, jlong jarg1) {
+SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_SWIGProxyAudioConsumerUpcast(JNIEnv *jenv, jclass jcls, jlong jarg1) {
     jlong baseptr = 0;
     (void)jenv;
     (void)jcls;
@@ -13313,7 +13298,7 @@ SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_ProxyAudioConsum
     return baseptr;
 }
 
-SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_ProxyVideoConsumer_1SWIGUpcast(JNIEnv *jenv, jclass jcls, jlong jarg1) {
+SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_SWIGProxyVideoConsumerUpcast(JNIEnv *jenv, jclass jcls, jlong jarg1) {
     jlong baseptr = 0;
     (void)jenv;
     (void)jcls;
@@ -13321,7 +13306,7 @@ SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_ProxyVideoConsum
     return baseptr;
 }
 
-SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_ProxyAudioProducer_1SWIGUpcast(JNIEnv *jenv, jclass jcls, jlong jarg1) {
+SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_SWIGProxyAudioProducerUpcast(JNIEnv *jenv, jclass jcls, jlong jarg1) {
     jlong baseptr = 0;
     (void)jenv;
     (void)jcls;
@@ -13329,7 +13314,7 @@ SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_ProxyAudioProduc
     return baseptr;
 }
 
-SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_ProxyVideoProducer_1SWIGUpcast(JNIEnv *jenv, jclass jcls, jlong jarg1) {
+SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_SWIGProxyVideoProducerUpcast(JNIEnv *jenv, jclass jcls, jlong jarg1) {
     jlong baseptr = 0;
     (void)jenv;
     (void)jcls;
@@ -13337,7 +13322,7 @@ SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_ProxyVideoProduc
     return baseptr;
 }
 
-SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_SipStack_1SWIGUpcast(JNIEnv *jenv, jclass jcls, jlong jarg1) {
+SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_SWIGSipStackUpcast(JNIEnv *jenv, jclass jcls, jlong jarg1) {
     jlong baseptr = 0;
     (void)jenv;
     (void)jcls;
diff --git a/branches/2.0/doubango/bindings/java/android/tinyWRAP_wrap.h b/branches/2.0/doubango/bindings/java/android/tinyWRAP_wrap.h
index 847b552b..e1abd04d 100644
--- a/branches/2.0/doubango/bindings/java/android/tinyWRAP_wrap.h
+++ b/branches/2.0/doubango/bindings/java/android/tinyWRAP_wrap.h
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  * 
  * 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
diff --git a/branches/2.0/doubango/bindings/java/android/tmedia_bandwidth_level_t.java b/branches/2.0/doubango/bindings/java/android/tmedia_bandwidth_level_t.java
index bc7d6368..32d8b5c6 100644
--- a/branches/2.0/doubango/bindings/java/android/tmedia_bandwidth_level_t.java
+++ b/branches/2.0/doubango/bindings/java/android/tmedia_bandwidth_level_t.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/java/android/tmedia_chroma_t.java b/branches/2.0/doubango/bindings/java/android/tmedia_chroma_t.java
index b899b6df..0be93c23 100644
--- a/branches/2.0/doubango/bindings/java/android/tmedia_chroma_t.java
+++ b/branches/2.0/doubango/bindings/java/android/tmedia_chroma_t.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -19,7 +19,9 @@ public enum tmedia_chroma_t {
   tmedia_chroma_nv21,
   tmedia_chroma_yuv422p,
   tmedia_chroma_uyvy422,
-  tmedia_chroma_yuv420p;
+  tmedia_chroma_yuv420p,
+  tmedia_chroma_mjpeg,
+  tmedia_chroma_yuyv422;
 
   public final int swigValue() {
     return swigValue;
diff --git a/branches/2.0/doubango/bindings/java/android/tmedia_codec_id_t.java b/branches/2.0/doubango/bindings/java/android/tmedia_codec_id_t.java
index 604270ef..ffafebae 100644
--- a/branches/2.0/doubango/bindings/java/android/tmedia_codec_id_t.java
+++ b/branches/2.0/doubango/bindings/java/android/tmedia_codec_id_t.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/java/android/tmedia_mode_t.java b/branches/2.0/doubango/bindings/java/android/tmedia_mode_t.java
index 83527ca3..e7fc8585 100644
--- a/branches/2.0/doubango/bindings/java/android/tmedia_mode_t.java
+++ b/branches/2.0/doubango/bindings/java/android/tmedia_mode_t.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/java/android/tmedia_pref_video_size_t.java b/branches/2.0/doubango/bindings/java/android/tmedia_pref_video_size_t.java
index 96e57174..567b2097 100644
--- a/branches/2.0/doubango/bindings/java/android/tmedia_pref_video_size_t.java
+++ b/branches/2.0/doubango/bindings/java/android/tmedia_pref_video_size_t.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -16,6 +16,7 @@ public enum tmedia_pref_video_size_t {
   tmedia_pref_video_size_hvga,
   tmedia_pref_video_size_vga,
   tmedia_pref_video_size_4cif,
+  tmedia_pref_video_size_wvga,
   tmedia_pref_video_size_svga,
   tmedia_pref_video_size_480p,
   tmedia_pref_video_size_720p,
diff --git a/branches/2.0/doubango/bindings/java/android/tmedia_profile_t.java b/branches/2.0/doubango/bindings/java/android/tmedia_profile_t.java
index bfb8f607..b0b47318 100644
--- a/branches/2.0/doubango/bindings/java/android/tmedia_profile_t.java
+++ b/branches/2.0/doubango/bindings/java/android/tmedia_profile_t.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/java/android/tmedia_qos_strength_t.java b/branches/2.0/doubango/bindings/java/android/tmedia_qos_strength_t.java
index 8f8e4652..5b70298d 100644
--- a/branches/2.0/doubango/bindings/java/android/tmedia_qos_strength_t.java
+++ b/branches/2.0/doubango/bindings/java/android/tmedia_qos_strength_t.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/java/android/tmedia_qos_stype_t.java b/branches/2.0/doubango/bindings/java/android/tmedia_qos_stype_t.java
index f19af372..3bc44934 100644
--- a/branches/2.0/doubango/bindings/java/android/tmedia_qos_stype_t.java
+++ b/branches/2.0/doubango/bindings/java/android/tmedia_qos_stype_t.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/java/android/tmedia_srtp_mode_t.java b/branches/2.0/doubango/bindings/java/android/tmedia_srtp_mode_t.java
index 42a6f1c5..9d6fffbc 100644
--- a/branches/2.0/doubango/bindings/java/android/tmedia_srtp_mode_t.java
+++ b/branches/2.0/doubango/bindings/java/android/tmedia_srtp_mode_t.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/java/android/tmedia_srtp_type_t.java b/branches/2.0/doubango/bindings/java/android/tmedia_srtp_type_t.java
index a33778ba..22f07d49 100644
--- a/branches/2.0/doubango/bindings/java/android/tmedia_srtp_type_t.java
+++ b/branches/2.0/doubango/bindings/java/android/tmedia_srtp_type_t.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/java/android/tmedia_t140_data_type_t.java b/branches/2.0/doubango/bindings/java/android/tmedia_t140_data_type_t.java
index 4eb7a5fc..b3b20606 100644
--- a/branches/2.0/doubango/bindings/java/android/tmedia_t140_data_type_t.java
+++ b/branches/2.0/doubango/bindings/java/android/tmedia_t140_data_type_t.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/java/android/tmsrp_event_type_t.java b/branches/2.0/doubango/bindings/java/android/tmsrp_event_type_t.java
index dc832bd9..6c88f50a 100644
--- a/branches/2.0/doubango/bindings/java/android/tmsrp_event_type_t.java
+++ b/branches/2.0/doubango/bindings/java/android/tmsrp_event_type_t.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/java/android/tmsrp_request_type_t.java b/branches/2.0/doubango/bindings/java/android/tmsrp_request_type_t.java
index 49147bd0..317d7a39 100644
--- a/branches/2.0/doubango/bindings/java/android/tmsrp_request_type_t.java
+++ b/branches/2.0/doubango/bindings/java/android/tmsrp_request_type_t.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/java/android/tsip_event_type_t.java b/branches/2.0/doubango/bindings/java/android/tsip_event_type_t.java
index 7519707d..ce546b38 100644
--- a/branches/2.0/doubango/bindings/java/android/tsip_event_type_t.java
+++ b/branches/2.0/doubango/bindings/java/android/tsip_event_type_t.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/java/android/tsip_info_event_type_t.java b/branches/2.0/doubango/bindings/java/android/tsip_info_event_type_t.java
index 96a20644..42937368 100644
--- a/branches/2.0/doubango/bindings/java/android/tsip_info_event_type_t.java
+++ b/branches/2.0/doubango/bindings/java/android/tsip_info_event_type_t.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/java/android/tsip_invite_event_type_t.java b/branches/2.0/doubango/bindings/java/android/tsip_invite_event_type_t.java
index 9c84c577..bedee901 100644
--- a/branches/2.0/doubango/bindings/java/android/tsip_invite_event_type_t.java
+++ b/branches/2.0/doubango/bindings/java/android/tsip_invite_event_type_t.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/java/android/tsip_message_event_type_t.java b/branches/2.0/doubango/bindings/java/android/tsip_message_event_type_t.java
index cbf332bf..da69c10b 100644
--- a/branches/2.0/doubango/bindings/java/android/tsip_message_event_type_t.java
+++ b/branches/2.0/doubango/bindings/java/android/tsip_message_event_type_t.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/java/android/tsip_options_event_type_t.java b/branches/2.0/doubango/bindings/java/android/tsip_options_event_type_t.java
index ca5ab1e2..6d1d33f0 100644
--- a/branches/2.0/doubango/bindings/java/android/tsip_options_event_type_t.java
+++ b/branches/2.0/doubango/bindings/java/android/tsip_options_event_type_t.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/java/android/tsip_publish_event_type_t.java b/branches/2.0/doubango/bindings/java/android/tsip_publish_event_type_t.java
index c04e0aee..e5d47e39 100644
--- a/branches/2.0/doubango/bindings/java/android/tsip_publish_event_type_t.java
+++ b/branches/2.0/doubango/bindings/java/android/tsip_publish_event_type_t.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/java/android/tsip_register_event_type_t.java b/branches/2.0/doubango/bindings/java/android/tsip_register_event_type_t.java
index e95d1f4a..8e07c91e 100644
--- a/branches/2.0/doubango/bindings/java/android/tsip_register_event_type_t.java
+++ b/branches/2.0/doubango/bindings/java/android/tsip_register_event_type_t.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/java/android/tsip_request_type_t.java b/branches/2.0/doubango/bindings/java/android/tsip_request_type_t.java
index a96be991..88ca85a0 100644
--- a/branches/2.0/doubango/bindings/java/android/tsip_request_type_t.java
+++ b/branches/2.0/doubango/bindings/java/android/tsip_request_type_t.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/java/android/tsip_stack_mode_t.java b/branches/2.0/doubango/bindings/java/android/tsip_stack_mode_t.java
index 5dcec38d..50741ac8 100644
--- a/branches/2.0/doubango/bindings/java/android/tsip_stack_mode_t.java
+++ b/branches/2.0/doubango/bindings/java/android/tsip_stack_mode_t.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/java/android/tsip_subscribe_event_type_t.java b/branches/2.0/doubango/bindings/java/android/tsip_subscribe_event_type_t.java
index 03cab19b..34231525 100644
--- a/branches/2.0/doubango/bindings/java/android/tsip_subscribe_event_type_t.java
+++ b/branches/2.0/doubango/bindings/java/android/tsip_subscribe_event_type_t.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/java/android/twrap_media_type_t.java b/branches/2.0/doubango/bindings/java/android/twrap_media_type_t.java
index 25924a76..1ac01a59 100644
--- a/branches/2.0/doubango/bindings/java/android/twrap_media_type_t.java
+++ b/branches/2.0/doubango/bindings/java/android/twrap_media_type_t.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/java/android/twrap_proxy_plugin_type_t.java b/branches/2.0/doubango/bindings/java/android/twrap_proxy_plugin_type_t.java
index eb8eb083..23206684 100644
--- a/branches/2.0/doubango/bindings/java/android/twrap_proxy_plugin_type_t.java
+++ b/branches/2.0/doubango/bindings/java/android/twrap_proxy_plugin_type_t.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/java/android/twrap_rpmessage_type_t.java b/branches/2.0/doubango/bindings/java/android/twrap_rpmessage_type_t.java
index 9e879b17..aceb366d 100644
--- a/branches/2.0/doubango/bindings/java/android/twrap_rpmessage_type_t.java
+++ b/branches/2.0/doubango/bindings/java/android/twrap_rpmessage_type_t.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/java/android/twrap_sms_type_t.java b/branches/2.0/doubango/bindings/java/android/twrap_sms_type_t.java
index 8d5a9104..2a615c6b 100644
--- a/branches/2.0/doubango/bindings/java/android/twrap_sms_type_t.java
+++ b/branches/2.0/doubango/bindings/java/android/twrap_sms_type_t.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/java/tdav_codec_id_t.java b/branches/2.0/doubango/bindings/java/tdav_codec_id_t.java
index 25564376..c72c5607 100644
--- a/branches/2.0/doubango/bindings/java/tdav_codec_id_t.java
+++ b/branches/2.0/doubango/bindings/java/tdav_codec_id_t.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/java/thttp_event_type_t.java b/branches/2.0/doubango/bindings/java/thttp_event_type_t.java
index 022295bd..eba6a1fe 100644
--- a/branches/2.0/doubango/bindings/java/thttp_event_type_t.java
+++ b/branches/2.0/doubango/bindings/java/thttp_event_type_t.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/java/tinyWRAP.java b/branches/2.0/doubango/bindings/java/tinyWRAP.java
index 1accccfe..9b29ff1c 100644
--- a/branches/2.0/doubango/bindings/java/tinyWRAP.java
+++ b/branches/2.0/doubango/bindings/java/tinyWRAP.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/java/tinyWRAPConstants.java b/branches/2.0/doubango/bindings/java/tinyWRAPConstants.java
index 5d5f0941..2a7e158e 100644
--- a/branches/2.0/doubango/bindings/java/tinyWRAPConstants.java
+++ b/branches/2.0/doubango/bindings/java/tinyWRAPConstants.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/java/tinyWRAPJNI.java b/branches/2.0/doubango/bindings/java/tinyWRAPJNI.java
index f629f555..fa9980be 100644
--- a/branches/2.0/doubango/bindings/java/tinyWRAPJNI.java
+++ b/branches/2.0/doubango/bindings/java/tinyWRAPJNI.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * 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.doubango.tinyWRAP;
 
-public class tinyWRAPJNI {
+class tinyWRAPJNI {
   public final static native long new_DDebugCallback();
   public final static native void delete_DDebugCallback(long jarg1);
   public final static native int DDebugCallback_OnDebugInfo(long jarg1, DDebugCallback jarg1_, String jarg2);
@@ -641,30 +641,30 @@ public class tinyWRAPJNI {
   public final static native int MsrpCallback_OnEventSwigExplicitMsrpCallback(long jarg1, MsrpCallback jarg1_, long jarg2, MsrpEvent jarg2_);
   public final static native void MsrpCallback_director_connect(MsrpCallback obj, long cptr, boolean mem_own, boolean weak_global);
   public final static native void MsrpCallback_change_ownership(MsrpCallback obj, long cptr, boolean take_or_release);
-  public final static native long MediaContentCPIM_SWIGUpcast(long jarg1);
-  public final static native long DialogEvent_SWIGUpcast(long jarg1);
-  public final static native long StackEvent_SWIGUpcast(long jarg1);
-  public final static native long InviteEvent_SWIGUpcast(long jarg1);
-  public final static native long MessagingEvent_SWIGUpcast(long jarg1);
-  public final static native long InfoEvent_SWIGUpcast(long jarg1);
-  public final static native long OptionsEvent_SWIGUpcast(long jarg1);
-  public final static native long PublicationEvent_SWIGUpcast(long jarg1);
-  public final static native long RegistrationEvent_SWIGUpcast(long jarg1);
-  public final static native long SubscriptionEvent_SWIGUpcast(long jarg1);
-  public final static native long InviteSession_SWIGUpcast(long jarg1);
-  public final static native long CallSession_SWIGUpcast(long jarg1);
-  public final static native long MsrpSession_SWIGUpcast(long jarg1);
-  public final static native long MessagingSession_SWIGUpcast(long jarg1);
-  public final static native long InfoSession_SWIGUpcast(long jarg1);
-  public final static native long OptionsSession_SWIGUpcast(long jarg1);
-  public final static native long PublicationSession_SWIGUpcast(long jarg1);
-  public final static native long RegistrationSession_SWIGUpcast(long jarg1);
-  public final static native long SubscriptionSession_SWIGUpcast(long jarg1);
-  public final static native long ProxyAudioConsumer_SWIGUpcast(long jarg1);
-  public final static native long ProxyVideoConsumer_SWIGUpcast(long jarg1);
-  public final static native long ProxyAudioProducer_SWIGUpcast(long jarg1);
-  public final static native long ProxyVideoProducer_SWIGUpcast(long jarg1);
-  public final static native long SipStack_SWIGUpcast(long jarg1);
+  public final static native long SWIGMediaContentCPIMUpcast(long jarg1);
+  public final static native long SWIGDialogEventUpcast(long jarg1);
+  public final static native long SWIGStackEventUpcast(long jarg1);
+  public final static native long SWIGInviteEventUpcast(long jarg1);
+  public final static native long SWIGMessagingEventUpcast(long jarg1);
+  public final static native long SWIGInfoEventUpcast(long jarg1);
+  public final static native long SWIGOptionsEventUpcast(long jarg1);
+  public final static native long SWIGPublicationEventUpcast(long jarg1);
+  public final static native long SWIGRegistrationEventUpcast(long jarg1);
+  public final static native long SWIGSubscriptionEventUpcast(long jarg1);
+  public final static native long SWIGInviteSessionUpcast(long jarg1);
+  public final static native long SWIGCallSessionUpcast(long jarg1);
+  public final static native long SWIGMsrpSessionUpcast(long jarg1);
+  public final static native long SWIGMessagingSessionUpcast(long jarg1);
+  public final static native long SWIGInfoSessionUpcast(long jarg1);
+  public final static native long SWIGOptionsSessionUpcast(long jarg1);
+  public final static native long SWIGPublicationSessionUpcast(long jarg1);
+  public final static native long SWIGRegistrationSessionUpcast(long jarg1);
+  public final static native long SWIGSubscriptionSessionUpcast(long jarg1);
+  public final static native long SWIGProxyAudioConsumerUpcast(long jarg1);
+  public final static native long SWIGProxyVideoConsumerUpcast(long jarg1);
+  public final static native long SWIGProxyAudioProducerUpcast(long jarg1);
+  public final static native long SWIGProxyVideoProducerUpcast(long jarg1);
+  public final static native long SWIGSipStackUpcast(long jarg1);
 
   public static int SwigDirector_DDebugCallback_OnDebugInfo(DDebugCallback self, String message) {
     return self.OnDebugInfo(message);
diff --git a/branches/2.0/doubango/bindings/java/tinyWRAP_wrap.cxx b/branches/2.0/doubango/bindings/java/tinyWRAP_wrap.cxx
index 8c59951c..17ceceae 100644
--- a/branches/2.0/doubango/bindings/java/tinyWRAP_wrap.cxx
+++ b/branches/2.0/doubango/bindings/java/tinyWRAP_wrap.cxx
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  * 
  * 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
@@ -212,6 +212,9 @@ static void SWIGUNUSED SWIG_JavaThrowException(JNIEnv *jenv, SWIG_JavaExceptionC
 #define SWIG_contract_assert(nullreturn, expr, msg) if (!(expr)) {SWIG_JavaThrowException(jenv, SWIG_JavaIllegalArgumentException, msg); return nullreturn; } else
 
 /* -----------------------------------------------------------------------------
+ * See the LICENSE file for information on copyright, usage and redistribution
+ * of SWIG, and the README file for authors - http://www.swig.org/release.html.
+ *
  * director.swg
  *
  * This file contains support for director classes that proxy
@@ -238,9 +241,9 @@ namespace Swig {
 
     bool set(JNIEnv *jenv, jobject jobj, bool mem_own, bool weak_global) {
       if (!jthis_) {
-        weak_global_ = weak_global || !mem_own; // hold as weak global if explicitly requested or not owned
+        weak_global_ = weak_global;
         if (jobj)
-          jthis_ = weak_global_ ? jenv->NewWeakGlobalRef(jobj) : jenv->NewGlobalRef(jobj);
+          jthis_ = ((weak_global_ || !mem_own) ? jenv->NewWeakGlobalRef(jobj) : jenv->NewGlobalRef(jobj));
 #if defined(DEBUG_DIRECTOR_OWNED)
         std::cout << "JObjectWrapper::set(" << jobj << ", " << (weak_global ? "weak_global" : "global_ref") << ") -> " << jthis_ << std::endl;
 #endif
@@ -281,7 +284,6 @@ namespace Swig {
       weak_global_ = true;
     }
 
-    /* Only call peek if you know what you are doing wrt to weak/global references */
     jobject peek() {
       return jthis_;
     }
@@ -326,29 +328,21 @@ namespace Swig {
     class JNIEnvWrapper {
       const Director *director_;
       JNIEnv *jenv_;
-      int env_status;
     public:
-      JNIEnvWrapper(const Director *director) : director_(director), jenv_(0), env_status(0) {
-#if defined(__ANDROID__)
-        JNIEnv **jenv = &jenv_;
-#else
-        void **jenv = (void **)&jenv_;
-#endif
-        env_status = director_->swig_jvm_->GetEnv((void **)&jenv_, JNI_VERSION_1_2);
+      JNIEnvWrapper(const Director *director) : director_(director), jenv_(0) {
 #if defined(SWIG_JAVA_ATTACH_CURRENT_THREAD_AS_DAEMON)
         // Attach a daemon thread to the JVM. Useful when the JVM should not wait for 
         // the thread to exit upon shutdown. Only for jdk-1.4 and later.
-        director_->swig_jvm_->AttachCurrentThreadAsDaemon(jenv, NULL);
+        director_->swig_jvm_->AttachCurrentThreadAsDaemon((void **) &jenv_, NULL);
 #else
-        director_->swig_jvm_->AttachCurrentThread(jenv, NULL);
+        director_->swig_jvm_->AttachCurrentThread((void **) &jenv_, NULL);
 #endif
       }
       ~JNIEnvWrapper() {
 #if !defined(SWIG_JAVA_NO_DETACH_CURRENT_THREAD)
         // Some JVMs, eg jdk-1.4.2 and lower on Solaris have a bug and crash with the DetachCurrentThread call.
         // However, without this call, the JVM hangs on exit when the thread was not created by the JVM and creates a memory leak.
-        if (env_status == JNI_EDETACHED)
-          director_->swig_jvm_->DetachCurrentThread();
+        director_->swig_jvm_->DetachCurrentThread();
 #endif
       }
       JNIEnv *getJNIEnv() const {
@@ -363,7 +357,7 @@ namespace Swig {
     void swig_disconnect_director_self(const char *disconn_method) {
       JNIEnvWrapper jnienv(this) ;
       JNIEnv *jenv = jnienv.getJNIEnv() ;
-      jobject jobj = swig_self_.get(jenv);
+      jobject jobj = swig_self_.peek();
 #if defined(DEBUG_DIRECTOR_OWNED)
       std::cout << "Swig::Director::disconnect_director_self(" << jobj << ")" << std::endl;
 #endif
@@ -376,7 +370,6 @@ namespace Swig {
           jenv->CallVoidMethod(jobj, disconn_meth);
         }
       }
-      jenv->DeleteLocalRef(jobj);
     }
 
   public:
@@ -410,10 +403,8 @@ namespace Swig {
 
 
 namespace Swig {
-  namespace {
-    jclass jclass_tinyWRAPJNI = NULL;
-    jmethodID director_methids[37];
-  }
+  static jclass jclass_tinyWRAPJNI = NULL;
+  static jmethodID director_methids[37];
 }
 
 #include <stdint.h>		// Use the C99 official header
@@ -484,7 +475,7 @@ int SwigDirector_DDebugCallback::OnDebugInfo(char const *message) {
       if (!jmessage) return c_result;
     }
     jresult = (jint) jenv->CallStaticIntMethod(Swig::jclass_tinyWRAPJNI, Swig::director_methids[0], swigjobj, jmessage);
-    if (jenv->ExceptionCheck() == JNI_TRUE) return c_result;
+    if (jenv->ExceptionOccurred()) return c_result;
     c_result = (int)jresult; 
   } else {
     SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null upcall object");
@@ -512,7 +503,7 @@ int SwigDirector_DDebugCallback::OnDebugWarn(char const *message) {
       if (!jmessage) return c_result;
     }
     jresult = (jint) jenv->CallStaticIntMethod(Swig::jclass_tinyWRAPJNI, Swig::director_methids[1], swigjobj, jmessage);
-    if (jenv->ExceptionCheck() == JNI_TRUE) return c_result;
+    if (jenv->ExceptionOccurred()) return c_result;
     c_result = (int)jresult; 
   } else {
     SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null upcall object");
@@ -540,7 +531,7 @@ int SwigDirector_DDebugCallback::OnDebugError(char const *message) {
       if (!jmessage) return c_result;
     }
     jresult = (jint) jenv->CallStaticIntMethod(Swig::jclass_tinyWRAPJNI, Swig::director_methids[2], swigjobj, jmessage);
-    if (jenv->ExceptionCheck() == JNI_TRUE) return c_result;
+    if (jenv->ExceptionOccurred()) return c_result;
     c_result = (int)jresult; 
   } else {
     SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null upcall object");
@@ -568,7 +559,7 @@ int SwigDirector_DDebugCallback::OnDebugFatal(char const *message) {
       if (!jmessage) return c_result;
     }
     jresult = (jint) jenv->CallStaticIntMethod(Swig::jclass_tinyWRAPJNI, Swig::director_methids[3], swigjobj, jmessage);
-    if (jenv->ExceptionCheck() == JNI_TRUE) return c_result;
+    if (jenv->ExceptionOccurred()) return c_result;
     c_result = (int)jresult; 
   } else {
     SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null upcall object");
@@ -645,7 +636,7 @@ int SwigDirector_T140Callback::ondata(T140CallbackData const *pData) {
   if (swigjobj && jenv->IsSameObject(swigjobj, NULL) == JNI_FALSE) {
     *((T140CallbackData **)&jpData) = (T140CallbackData *) pData; 
     jresult = (jint) jenv->CallStaticIntMethod(Swig::jclass_tinyWRAPJNI, Swig::director_methids[4], swigjobj, jpData);
-    if (jenv->ExceptionCheck() == JNI_TRUE) return c_result;
+    if (jenv->ExceptionOccurred()) return c_result;
     c_result = (int)jresult; 
   } else {
     SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null upcall object");
@@ -731,7 +722,7 @@ int SwigDirector_ProxyPluginMgrCallback::OnPluginCreated(uint64_t id, enum twrap
     }
     jtype = (jint) type;
     jresult = (jint) jenv->CallStaticIntMethod(Swig::jclass_tinyWRAPJNI, Swig::director_methids[5], swigjobj, jid, jtype);
-    if (jenv->ExceptionCheck() == JNI_TRUE) return c_result;
+    if (jenv->ExceptionOccurred()) return c_result;
     c_result = (int)jresult; 
   } else {
     SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null upcall object");
@@ -773,7 +764,7 @@ int SwigDirector_ProxyPluginMgrCallback::OnPluginDestroyed(uint64_t id, enum twr
     }
     jtype = (jint) type;
     jresult = (jint) jenv->CallStaticIntMethod(Swig::jclass_tinyWRAPJNI, Swig::director_methids[6], swigjobj, jid, jtype);
-    if (jenv->ExceptionCheck() == JNI_TRUE) return c_result;
+    if (jenv->ExceptionOccurred()) return c_result;
     c_result = (int)jresult; 
   } else {
     SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null upcall object");
@@ -848,7 +839,7 @@ int SwigDirector_ProxyAudioConsumerCallback::prepare(int ptime, int rate, int ch
     jrate = (jint) rate;
     jchannels = (jint) channels;
     jresult = (jint) jenv->CallStaticIntMethod(Swig::jclass_tinyWRAPJNI, Swig::director_methids[7], swigjobj, jptime, jrate, jchannels);
-    if (jenv->ExceptionCheck() == JNI_TRUE) return c_result;
+    if (jenv->ExceptionOccurred()) return c_result;
     c_result = (int)jresult; 
   } else {
     SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null upcall object");
@@ -870,7 +861,7 @@ int SwigDirector_ProxyAudioConsumerCallback::start() {
   swigjobj = swig_get_self(jenv);
   if (swigjobj && jenv->IsSameObject(swigjobj, NULL) == JNI_FALSE) {
     jresult = (jint) jenv->CallStaticIntMethod(Swig::jclass_tinyWRAPJNI, Swig::director_methids[8], swigjobj);
-    if (jenv->ExceptionCheck() == JNI_TRUE) return c_result;
+    if (jenv->ExceptionOccurred()) return c_result;
     c_result = (int)jresult; 
   } else {
     SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null upcall object");
@@ -892,7 +883,7 @@ int SwigDirector_ProxyAudioConsumerCallback::pause() {
   swigjobj = swig_get_self(jenv);
   if (swigjobj && jenv->IsSameObject(swigjobj, NULL) == JNI_FALSE) {
     jresult = (jint) jenv->CallStaticIntMethod(Swig::jclass_tinyWRAPJNI, Swig::director_methids[9], swigjobj);
-    if (jenv->ExceptionCheck() == JNI_TRUE) return c_result;
+    if (jenv->ExceptionOccurred()) return c_result;
     c_result = (int)jresult; 
   } else {
     SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null upcall object");
@@ -914,7 +905,7 @@ int SwigDirector_ProxyAudioConsumerCallback::stop() {
   swigjobj = swig_get_self(jenv);
   if (swigjobj && jenv->IsSameObject(swigjobj, NULL) == JNI_FALSE) {
     jresult = (jint) jenv->CallStaticIntMethod(Swig::jclass_tinyWRAPJNI, Swig::director_methids[10], swigjobj);
-    if (jenv->ExceptionCheck() == JNI_TRUE) return c_result;
+    if (jenv->ExceptionOccurred()) return c_result;
     c_result = (int)jresult; 
   } else {
     SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null upcall object");
@@ -995,7 +986,7 @@ int SwigDirector_ProxyVideoConsumerCallback::prepare(int nWidth, int nHeight, in
     jnHeight = (jint) nHeight;
     jnFps = (jint) nFps;
     jresult = (jint) jenv->CallStaticIntMethod(Swig::jclass_tinyWRAPJNI, Swig::director_methids[11], swigjobj, jnWidth, jnHeight, jnFps);
-    if (jenv->ExceptionCheck() == JNI_TRUE) return c_result;
+    if (jenv->ExceptionOccurred()) return c_result;
     c_result = (int)jresult; 
   } else {
     SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null upcall object");
@@ -1019,7 +1010,7 @@ int SwigDirector_ProxyVideoConsumerCallback::consume(ProxyVideoFrame const *fram
   if (swigjobj && jenv->IsSameObject(swigjobj, NULL) == JNI_FALSE) {
     *((ProxyVideoFrame **)&jframe) = (ProxyVideoFrame *) frame; 
     jresult = (jint) jenv->CallStaticIntMethod(Swig::jclass_tinyWRAPJNI, Swig::director_methids[12], swigjobj, jframe);
-    if (jenv->ExceptionCheck() == JNI_TRUE) return c_result;
+    if (jenv->ExceptionOccurred()) return c_result;
     c_result = (int)jresult; 
   } else {
     SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null upcall object");
@@ -1045,7 +1036,7 @@ int SwigDirector_ProxyVideoConsumerCallback::bufferCopied(unsigned int nCopiedSi
     jnCopiedSize = (jlong) nCopiedSize;
     jnAvailableSize = (jlong) nAvailableSize;
     jresult = (jint) jenv->CallStaticIntMethod(Swig::jclass_tinyWRAPJNI, Swig::director_methids[13], swigjobj, jnCopiedSize, jnAvailableSize);
-    if (jenv->ExceptionCheck() == JNI_TRUE) return c_result;
+    if (jenv->ExceptionOccurred()) return c_result;
     c_result = (int)jresult; 
   } else {
     SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null upcall object");
@@ -1067,7 +1058,7 @@ int SwigDirector_ProxyVideoConsumerCallback::start() {
   swigjobj = swig_get_self(jenv);
   if (swigjobj && jenv->IsSameObject(swigjobj, NULL) == JNI_FALSE) {
     jresult = (jint) jenv->CallStaticIntMethod(Swig::jclass_tinyWRAPJNI, Swig::director_methids[14], swigjobj);
-    if (jenv->ExceptionCheck() == JNI_TRUE) return c_result;
+    if (jenv->ExceptionOccurred()) return c_result;
     c_result = (int)jresult; 
   } else {
     SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null upcall object");
@@ -1089,7 +1080,7 @@ int SwigDirector_ProxyVideoConsumerCallback::pause() {
   swigjobj = swig_get_self(jenv);
   if (swigjobj && jenv->IsSameObject(swigjobj, NULL) == JNI_FALSE) {
     jresult = (jint) jenv->CallStaticIntMethod(Swig::jclass_tinyWRAPJNI, Swig::director_methids[15], swigjobj);
-    if (jenv->ExceptionCheck() == JNI_TRUE) return c_result;
+    if (jenv->ExceptionOccurred()) return c_result;
     c_result = (int)jresult; 
   } else {
     SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null upcall object");
@@ -1111,7 +1102,7 @@ int SwigDirector_ProxyVideoConsumerCallback::stop() {
   swigjobj = swig_get_self(jenv);
   if (swigjobj && jenv->IsSameObject(swigjobj, NULL) == JNI_FALSE) {
     jresult = (jint) jenv->CallStaticIntMethod(Swig::jclass_tinyWRAPJNI, Swig::director_methids[16], swigjobj);
-    if (jenv->ExceptionCheck() == JNI_TRUE) return c_result;
+    if (jenv->ExceptionOccurred()) return c_result;
     c_result = (int)jresult; 
   } else {
     SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null upcall object");
@@ -1198,7 +1189,7 @@ int SwigDirector_ProxyAudioProducerCallback::prepare(int ptime, int rate, int ch
     jrate = (jint) rate;
     jchannels = (jint) channels;
     jresult = (jint) jenv->CallStaticIntMethod(Swig::jclass_tinyWRAPJNI, Swig::director_methids[17], swigjobj, jptime, jrate, jchannels);
-    if (jenv->ExceptionCheck() == JNI_TRUE) return c_result;
+    if (jenv->ExceptionOccurred()) return c_result;
     c_result = (int)jresult; 
   } else {
     SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null upcall object");
@@ -1220,7 +1211,7 @@ int SwigDirector_ProxyAudioProducerCallback::start() {
   swigjobj = swig_get_self(jenv);
   if (swigjobj && jenv->IsSameObject(swigjobj, NULL) == JNI_FALSE) {
     jresult = (jint) jenv->CallStaticIntMethod(Swig::jclass_tinyWRAPJNI, Swig::director_methids[18], swigjobj);
-    if (jenv->ExceptionCheck() == JNI_TRUE) return c_result;
+    if (jenv->ExceptionOccurred()) return c_result;
     c_result = (int)jresult; 
   } else {
     SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null upcall object");
@@ -1242,7 +1233,7 @@ int SwigDirector_ProxyAudioProducerCallback::pause() {
   swigjobj = swig_get_self(jenv);
   if (swigjobj && jenv->IsSameObject(swigjobj, NULL) == JNI_FALSE) {
     jresult = (jint) jenv->CallStaticIntMethod(Swig::jclass_tinyWRAPJNI, Swig::director_methids[19], swigjobj);
-    if (jenv->ExceptionCheck() == JNI_TRUE) return c_result;
+    if (jenv->ExceptionOccurred()) return c_result;
     c_result = (int)jresult; 
   } else {
     SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null upcall object");
@@ -1264,7 +1255,7 @@ int SwigDirector_ProxyAudioProducerCallback::stop() {
   swigjobj = swig_get_self(jenv);
   if (swigjobj && jenv->IsSameObject(swigjobj, NULL) == JNI_FALSE) {
     jresult = (jint) jenv->CallStaticIntMethod(Swig::jclass_tinyWRAPJNI, Swig::director_methids[20], swigjobj);
-    if (jenv->ExceptionCheck() == JNI_TRUE) return c_result;
+    if (jenv->ExceptionOccurred()) return c_result;
     c_result = (int)jresult; 
   } else {
     SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null upcall object");
@@ -1286,7 +1277,7 @@ int SwigDirector_ProxyAudioProducerCallback::fillPushBuffer() {
   swigjobj = swig_get_self(jenv);
   if (swigjobj && jenv->IsSameObject(swigjobj, NULL) == JNI_FALSE) {
     jresult = (jint) jenv->CallStaticIntMethod(Swig::jclass_tinyWRAPJNI, Swig::director_methids[21], swigjobj);
-    if (jenv->ExceptionCheck() == JNI_TRUE) return c_result;
+    if (jenv->ExceptionOccurred()) return c_result;
     c_result = (int)jresult; 
   } else {
     SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null upcall object");
@@ -1370,7 +1361,7 @@ int SwigDirector_ProxyVideoProducerCallback::prepare(int width, int height, int
     jheight = (jint) height;
     jfps = (jint) fps;
     jresult = (jint) jenv->CallStaticIntMethod(Swig::jclass_tinyWRAPJNI, Swig::director_methids[22], swigjobj, jwidth, jheight, jfps);
-    if (jenv->ExceptionCheck() == JNI_TRUE) return c_result;
+    if (jenv->ExceptionOccurred()) return c_result;
     c_result = (int)jresult; 
   } else {
     SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null upcall object");
@@ -1392,7 +1383,7 @@ int SwigDirector_ProxyVideoProducerCallback::start() {
   swigjobj = swig_get_self(jenv);
   if (swigjobj && jenv->IsSameObject(swigjobj, NULL) == JNI_FALSE) {
     jresult = (jint) jenv->CallStaticIntMethod(Swig::jclass_tinyWRAPJNI, Swig::director_methids[23], swigjobj);
-    if (jenv->ExceptionCheck() == JNI_TRUE) return c_result;
+    if (jenv->ExceptionOccurred()) return c_result;
     c_result = (int)jresult; 
   } else {
     SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null upcall object");
@@ -1414,7 +1405,7 @@ int SwigDirector_ProxyVideoProducerCallback::pause() {
   swigjobj = swig_get_self(jenv);
   if (swigjobj && jenv->IsSameObject(swigjobj, NULL) == JNI_FALSE) {
     jresult = (jint) jenv->CallStaticIntMethod(Swig::jclass_tinyWRAPJNI, Swig::director_methids[24], swigjobj);
-    if (jenv->ExceptionCheck() == JNI_TRUE) return c_result;
+    if (jenv->ExceptionOccurred()) return c_result;
     c_result = (int)jresult; 
   } else {
     SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null upcall object");
@@ -1436,7 +1427,7 @@ int SwigDirector_ProxyVideoProducerCallback::stop() {
   swigjobj = swig_get_self(jenv);
   if (swigjobj && jenv->IsSameObject(swigjobj, NULL) == JNI_FALSE) {
     jresult = (jint) jenv->CallStaticIntMethod(Swig::jclass_tinyWRAPJNI, Swig::director_methids[25], swigjobj);
-    if (jenv->ExceptionCheck() == JNI_TRUE) return c_result;
+    if (jenv->ExceptionOccurred()) return c_result;
     c_result = (int)jresult; 
   } else {
     SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null upcall object");
@@ -1513,7 +1504,7 @@ int SwigDirector_SipCallback::OnDialogEvent(DialogEvent const *e) {
   if (swigjobj && jenv->IsSameObject(swigjobj, NULL) == JNI_FALSE) {
     *((DialogEvent **)&je) = (DialogEvent *) e; 
     jresult = (jint) jenv->CallStaticIntMethod(Swig::jclass_tinyWRAPJNI, Swig::director_methids[26], swigjobj, je);
-    if (jenv->ExceptionCheck() == JNI_TRUE) return c_result;
+    if (jenv->ExceptionOccurred()) return c_result;
     c_result = (int)jresult; 
   } else {
     SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null upcall object");
@@ -1537,7 +1528,7 @@ int SwigDirector_SipCallback::OnStackEvent(StackEvent const *e) {
   if (swigjobj && jenv->IsSameObject(swigjobj, NULL) == JNI_FALSE) {
     *((StackEvent **)&je) = (StackEvent *) e; 
     jresult = (jint) jenv->CallStaticIntMethod(Swig::jclass_tinyWRAPJNI, Swig::director_methids[27], swigjobj, je);
-    if (jenv->ExceptionCheck() == JNI_TRUE) return c_result;
+    if (jenv->ExceptionOccurred()) return c_result;
     c_result = (int)jresult; 
   } else {
     SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null upcall object");
@@ -1561,7 +1552,7 @@ int SwigDirector_SipCallback::OnInviteEvent(InviteEvent const *e) {
   if (swigjobj && jenv->IsSameObject(swigjobj, NULL) == JNI_FALSE) {
     *((InviteEvent **)&je) = (InviteEvent *) e; 
     jresult = (jint) jenv->CallStaticIntMethod(Swig::jclass_tinyWRAPJNI, Swig::director_methids[28], swigjobj, je);
-    if (jenv->ExceptionCheck() == JNI_TRUE) return c_result;
+    if (jenv->ExceptionOccurred()) return c_result;
     c_result = (int)jresult; 
   } else {
     SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null upcall object");
@@ -1585,7 +1576,7 @@ int SwigDirector_SipCallback::OnMessagingEvent(MessagingEvent const *e) {
   if (swigjobj && jenv->IsSameObject(swigjobj, NULL) == JNI_FALSE) {
     *((MessagingEvent **)&je) = (MessagingEvent *) e; 
     jresult = (jint) jenv->CallStaticIntMethod(Swig::jclass_tinyWRAPJNI, Swig::director_methids[29], swigjobj, je);
-    if (jenv->ExceptionCheck() == JNI_TRUE) return c_result;
+    if (jenv->ExceptionOccurred()) return c_result;
     c_result = (int)jresult; 
   } else {
     SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null upcall object");
@@ -1609,7 +1600,7 @@ int SwigDirector_SipCallback::OnInfoEvent(InfoEvent const *e) {
   if (swigjobj && jenv->IsSameObject(swigjobj, NULL) == JNI_FALSE) {
     *((InfoEvent **)&je) = (InfoEvent *) e; 
     jresult = (jint) jenv->CallStaticIntMethod(Swig::jclass_tinyWRAPJNI, Swig::director_methids[30], swigjobj, je);
-    if (jenv->ExceptionCheck() == JNI_TRUE) return c_result;
+    if (jenv->ExceptionOccurred()) return c_result;
     c_result = (int)jresult; 
   } else {
     SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null upcall object");
@@ -1633,7 +1624,7 @@ int SwigDirector_SipCallback::OnOptionsEvent(OptionsEvent const *e) {
   if (swigjobj && jenv->IsSameObject(swigjobj, NULL) == JNI_FALSE) {
     *((OptionsEvent **)&je) = (OptionsEvent *) e; 
     jresult = (jint) jenv->CallStaticIntMethod(Swig::jclass_tinyWRAPJNI, Swig::director_methids[31], swigjobj, je);
-    if (jenv->ExceptionCheck() == JNI_TRUE) return c_result;
+    if (jenv->ExceptionOccurred()) return c_result;
     c_result = (int)jresult; 
   } else {
     SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null upcall object");
@@ -1657,7 +1648,7 @@ int SwigDirector_SipCallback::OnPublicationEvent(PublicationEvent const *e) {
   if (swigjobj && jenv->IsSameObject(swigjobj, NULL) == JNI_FALSE) {
     *((PublicationEvent **)&je) = (PublicationEvent *) e; 
     jresult = (jint) jenv->CallStaticIntMethod(Swig::jclass_tinyWRAPJNI, Swig::director_methids[32], swigjobj, je);
-    if (jenv->ExceptionCheck() == JNI_TRUE) return c_result;
+    if (jenv->ExceptionOccurred()) return c_result;
     c_result = (int)jresult; 
   } else {
     SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null upcall object");
@@ -1681,7 +1672,7 @@ int SwigDirector_SipCallback::OnRegistrationEvent(RegistrationEvent const *e) {
   if (swigjobj && jenv->IsSameObject(swigjobj, NULL) == JNI_FALSE) {
     *((RegistrationEvent **)&je) = (RegistrationEvent *) e; 
     jresult = (jint) jenv->CallStaticIntMethod(Swig::jclass_tinyWRAPJNI, Swig::director_methids[33], swigjobj, je);
-    if (jenv->ExceptionCheck() == JNI_TRUE) return c_result;
+    if (jenv->ExceptionOccurred()) return c_result;
     c_result = (int)jresult; 
   } else {
     SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null upcall object");
@@ -1705,7 +1696,7 @@ int SwigDirector_SipCallback::OnSubscriptionEvent(SubscriptionEvent const *e) {
   if (swigjobj && jenv->IsSameObject(swigjobj, NULL) == JNI_FALSE) {
     *((SubscriptionEvent **)&je) = (SubscriptionEvent *) e; 
     jresult = (jint) jenv->CallStaticIntMethod(Swig::jclass_tinyWRAPJNI, Swig::director_methids[34], swigjobj, je);
-    if (jenv->ExceptionCheck() == JNI_TRUE) return c_result;
+    if (jenv->ExceptionOccurred()) return c_result;
     c_result = (int)jresult; 
   } else {
     SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null upcall object");
@@ -1797,7 +1788,7 @@ int SwigDirector_XcapCallback::onEvent(XcapEvent const *e) const {
   if (swigjobj && jenv->IsSameObject(swigjobj, NULL) == JNI_FALSE) {
     *((XcapEvent **)&je) = (XcapEvent *) e; 
     jresult = (jint) jenv->CallStaticIntMethod(Swig::jclass_tinyWRAPJNI, Swig::director_methids[35], swigjobj, je);
-    if (jenv->ExceptionCheck() == JNI_TRUE) return c_result;
+    if (jenv->ExceptionOccurred()) return c_result;
     c_result = (int)jresult; 
   } else {
     SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null upcall object");
@@ -1865,7 +1856,7 @@ int SwigDirector_MsrpCallback::OnEvent(MsrpEvent const *e) {
   if (swigjobj && jenv->IsSameObject(swigjobj, NULL) == JNI_FALSE) {
     *((MsrpEvent **)&je) = (MsrpEvent *) e; 
     jresult = (jint) jenv->CallStaticIntMethod(Swig::jclass_tinyWRAPJNI, Swig::director_methids[36], swigjobj, je);
-    if (jenv->ExceptionCheck() == JNI_TRUE) return c_result;
+    if (jenv->ExceptionOccurred()) return c_result;
     c_result = (int)jresult; 
   } else {
     SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null upcall object");
@@ -11078,7 +11069,6 @@ SWIGEXPORT jstring JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_SipStack_1dnsN
       SWIG_JavaThrowException(jenv, SWIG_JavaIndexOutOfBoundsException, "Array must contain at least 1 element");
       return 0;
     }
-    temp4 = (unsigned short)0;
     arg4 = &temp4; 
   }
   result = (char *)(arg1)->dnsNaptrSrv((char const *)arg2,(char const *)arg3,arg4);
@@ -11121,7 +11111,6 @@ SWIGEXPORT jstring JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_SipStack_1dnsS
       SWIG_JavaThrowException(jenv, SWIG_JavaIndexOutOfBoundsException, "Array must contain at least 1 element");
       return 0;
     }
-    temp3 = (unsigned short)0;
     arg3 = &temp3; 
   }
   result = (char *)(arg1)->dnsSrv((char const *)arg2,arg3);
@@ -11180,7 +11169,6 @@ SWIGEXPORT jstring JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_SipStack_1getL
       SWIG_JavaThrowException(jenv, SWIG_JavaIndexOutOfBoundsException, "Array must contain at least 1 element");
       return 0;
     }
-    temp3 = (unsigned short)0;
     arg3 = &temp3; 
   }
   result = (char *)(arg1)->getLocalIPnPort((char const *)arg2,arg3);
@@ -12840,7 +12828,6 @@ SWIGEXPORT void JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_MsrpMessage_1getB
       SWIG_JavaThrowException(jenv, SWIG_JavaIndexOutOfBoundsException, "Array must contain at least 1 element");
       return ;
     }
-    temp2 = (int64_t)0;
     arg2 = &temp2; 
   }
   {
@@ -12852,7 +12839,6 @@ SWIGEXPORT void JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_MsrpMessage_1getB
       SWIG_JavaThrowException(jenv, SWIG_JavaIndexOutOfBoundsException, "Array must contain at least 1 element");
       return ;
     }
-    temp3 = (int64_t)0;
     arg3 = &temp3; 
   }
   {
@@ -12864,7 +12850,6 @@ SWIGEXPORT void JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_MsrpMessage_1getB
       SWIG_JavaThrowException(jenv, SWIG_JavaIndexOutOfBoundsException, "Array must contain at least 1 element");
       return ;
     }
-    temp4 = (int64_t)0;
     arg4 = &temp4; 
   }
   (arg1)->getByteRange(arg2,arg3,arg4);
@@ -13153,7 +13138,7 @@ SWIGEXPORT void JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_MsrpCallback_1cha
 }
 
 
-SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_MediaContentCPIM_1SWIGUpcast(JNIEnv *jenv, jclass jcls, jlong jarg1) {
+SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_SWIGMediaContentCPIMUpcast(JNIEnv *jenv, jclass jcls, jlong jarg1) {
     jlong baseptr = 0;
     (void)jenv;
     (void)jcls;
@@ -13161,7 +13146,7 @@ SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_MediaContentCPIM
     return baseptr;
 }
 
-SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_DialogEvent_1SWIGUpcast(JNIEnv *jenv, jclass jcls, jlong jarg1) {
+SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_SWIGDialogEventUpcast(JNIEnv *jenv, jclass jcls, jlong jarg1) {
     jlong baseptr = 0;
     (void)jenv;
     (void)jcls;
@@ -13169,7 +13154,7 @@ SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_DialogEvent_1SWI
     return baseptr;
 }
 
-SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_StackEvent_1SWIGUpcast(JNIEnv *jenv, jclass jcls, jlong jarg1) {
+SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_SWIGStackEventUpcast(JNIEnv *jenv, jclass jcls, jlong jarg1) {
     jlong baseptr = 0;
     (void)jenv;
     (void)jcls;
@@ -13177,7 +13162,7 @@ SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_StackEvent_1SWIG
     return baseptr;
 }
 
-SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_InviteEvent_1SWIGUpcast(JNIEnv *jenv, jclass jcls, jlong jarg1) {
+SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_SWIGInviteEventUpcast(JNIEnv *jenv, jclass jcls, jlong jarg1) {
     jlong baseptr = 0;
     (void)jenv;
     (void)jcls;
@@ -13185,7 +13170,7 @@ SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_InviteEvent_1SWI
     return baseptr;
 }
 
-SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_MessagingEvent_1SWIGUpcast(JNIEnv *jenv, jclass jcls, jlong jarg1) {
+SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_SWIGMessagingEventUpcast(JNIEnv *jenv, jclass jcls, jlong jarg1) {
     jlong baseptr = 0;
     (void)jenv;
     (void)jcls;
@@ -13193,7 +13178,7 @@ SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_MessagingEvent_1
     return baseptr;
 }
 
-SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_InfoEvent_1SWIGUpcast(JNIEnv *jenv, jclass jcls, jlong jarg1) {
+SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_SWIGInfoEventUpcast(JNIEnv *jenv, jclass jcls, jlong jarg1) {
     jlong baseptr = 0;
     (void)jenv;
     (void)jcls;
@@ -13201,7 +13186,7 @@ SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_InfoEvent_1SWIGU
     return baseptr;
 }
 
-SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_OptionsEvent_1SWIGUpcast(JNIEnv *jenv, jclass jcls, jlong jarg1) {
+SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_SWIGOptionsEventUpcast(JNIEnv *jenv, jclass jcls, jlong jarg1) {
     jlong baseptr = 0;
     (void)jenv;
     (void)jcls;
@@ -13209,7 +13194,7 @@ SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_OptionsEvent_1SW
     return baseptr;
 }
 
-SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_PublicationEvent_1SWIGUpcast(JNIEnv *jenv, jclass jcls, jlong jarg1) {
+SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_SWIGPublicationEventUpcast(JNIEnv *jenv, jclass jcls, jlong jarg1) {
     jlong baseptr = 0;
     (void)jenv;
     (void)jcls;
@@ -13217,7 +13202,7 @@ SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_PublicationEvent
     return baseptr;
 }
 
-SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_RegistrationEvent_1SWIGUpcast(JNIEnv *jenv, jclass jcls, jlong jarg1) {
+SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_SWIGRegistrationEventUpcast(JNIEnv *jenv, jclass jcls, jlong jarg1) {
     jlong baseptr = 0;
     (void)jenv;
     (void)jcls;
@@ -13225,7 +13210,7 @@ SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_RegistrationEven
     return baseptr;
 }
 
-SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_SubscriptionEvent_1SWIGUpcast(JNIEnv *jenv, jclass jcls, jlong jarg1) {
+SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_SWIGSubscriptionEventUpcast(JNIEnv *jenv, jclass jcls, jlong jarg1) {
     jlong baseptr = 0;
     (void)jenv;
     (void)jcls;
@@ -13233,7 +13218,7 @@ SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_SubscriptionEven
     return baseptr;
 }
 
-SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_InviteSession_1SWIGUpcast(JNIEnv *jenv, jclass jcls, jlong jarg1) {
+SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_SWIGInviteSessionUpcast(JNIEnv *jenv, jclass jcls, jlong jarg1) {
     jlong baseptr = 0;
     (void)jenv;
     (void)jcls;
@@ -13241,7 +13226,7 @@ SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_InviteSession_1S
     return baseptr;
 }
 
-SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_CallSession_1SWIGUpcast(JNIEnv *jenv, jclass jcls, jlong jarg1) {
+SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_SWIGCallSessionUpcast(JNIEnv *jenv, jclass jcls, jlong jarg1) {
     jlong baseptr = 0;
     (void)jenv;
     (void)jcls;
@@ -13249,7 +13234,7 @@ SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_CallSession_1SWI
     return baseptr;
 }
 
-SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_MsrpSession_1SWIGUpcast(JNIEnv *jenv, jclass jcls, jlong jarg1) {
+SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_SWIGMsrpSessionUpcast(JNIEnv *jenv, jclass jcls, jlong jarg1) {
     jlong baseptr = 0;
     (void)jenv;
     (void)jcls;
@@ -13257,7 +13242,7 @@ SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_MsrpSession_1SWI
     return baseptr;
 }
 
-SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_MessagingSession_1SWIGUpcast(JNIEnv *jenv, jclass jcls, jlong jarg1) {
+SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_SWIGMessagingSessionUpcast(JNIEnv *jenv, jclass jcls, jlong jarg1) {
     jlong baseptr = 0;
     (void)jenv;
     (void)jcls;
@@ -13265,7 +13250,7 @@ SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_MessagingSession
     return baseptr;
 }
 
-SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_InfoSession_1SWIGUpcast(JNIEnv *jenv, jclass jcls, jlong jarg1) {
+SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_SWIGInfoSessionUpcast(JNIEnv *jenv, jclass jcls, jlong jarg1) {
     jlong baseptr = 0;
     (void)jenv;
     (void)jcls;
@@ -13273,7 +13258,7 @@ SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_InfoSession_1SWI
     return baseptr;
 }
 
-SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_OptionsSession_1SWIGUpcast(JNIEnv *jenv, jclass jcls, jlong jarg1) {
+SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_SWIGOptionsSessionUpcast(JNIEnv *jenv, jclass jcls, jlong jarg1) {
     jlong baseptr = 0;
     (void)jenv;
     (void)jcls;
@@ -13281,7 +13266,7 @@ SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_OptionsSession_1
     return baseptr;
 }
 
-SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_PublicationSession_1SWIGUpcast(JNIEnv *jenv, jclass jcls, jlong jarg1) {
+SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_SWIGPublicationSessionUpcast(JNIEnv *jenv, jclass jcls, jlong jarg1) {
     jlong baseptr = 0;
     (void)jenv;
     (void)jcls;
@@ -13289,7 +13274,7 @@ SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_PublicationSessi
     return baseptr;
 }
 
-SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_RegistrationSession_1SWIGUpcast(JNIEnv *jenv, jclass jcls, jlong jarg1) {
+SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_SWIGRegistrationSessionUpcast(JNIEnv *jenv, jclass jcls, jlong jarg1) {
     jlong baseptr = 0;
     (void)jenv;
     (void)jcls;
@@ -13297,7 +13282,7 @@ SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_RegistrationSess
     return baseptr;
 }
 
-SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_SubscriptionSession_1SWIGUpcast(JNIEnv *jenv, jclass jcls, jlong jarg1) {
+SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_SWIGSubscriptionSessionUpcast(JNIEnv *jenv, jclass jcls, jlong jarg1) {
     jlong baseptr = 0;
     (void)jenv;
     (void)jcls;
@@ -13305,7 +13290,7 @@ SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_SubscriptionSess
     return baseptr;
 }
 
-SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_ProxyAudioConsumer_1SWIGUpcast(JNIEnv *jenv, jclass jcls, jlong jarg1) {
+SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_SWIGProxyAudioConsumerUpcast(JNIEnv *jenv, jclass jcls, jlong jarg1) {
     jlong baseptr = 0;
     (void)jenv;
     (void)jcls;
@@ -13313,7 +13298,7 @@ SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_ProxyAudioConsum
     return baseptr;
 }
 
-SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_ProxyVideoConsumer_1SWIGUpcast(JNIEnv *jenv, jclass jcls, jlong jarg1) {
+SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_SWIGProxyVideoConsumerUpcast(JNIEnv *jenv, jclass jcls, jlong jarg1) {
     jlong baseptr = 0;
     (void)jenv;
     (void)jcls;
@@ -13321,7 +13306,7 @@ SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_ProxyVideoConsum
     return baseptr;
 }
 
-SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_ProxyAudioProducer_1SWIGUpcast(JNIEnv *jenv, jclass jcls, jlong jarg1) {
+SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_SWIGProxyAudioProducerUpcast(JNIEnv *jenv, jclass jcls, jlong jarg1) {
     jlong baseptr = 0;
     (void)jenv;
     (void)jcls;
@@ -13329,7 +13314,7 @@ SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_ProxyAudioProduc
     return baseptr;
 }
 
-SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_ProxyVideoProducer_1SWIGUpcast(JNIEnv *jenv, jclass jcls, jlong jarg1) {
+SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_SWIGProxyVideoProducerUpcast(JNIEnv *jenv, jclass jcls, jlong jarg1) {
     jlong baseptr = 0;
     (void)jenv;
     (void)jcls;
@@ -13337,7 +13322,7 @@ SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_ProxyVideoProduc
     return baseptr;
 }
 
-SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_SipStack_1SWIGUpcast(JNIEnv *jenv, jclass jcls, jlong jarg1) {
+SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_SWIGSipStackUpcast(JNIEnv *jenv, jclass jcls, jlong jarg1) {
     jlong baseptr = 0;
     (void)jenv;
     (void)jcls;
diff --git a/branches/2.0/doubango/bindings/java/tinyWRAP_wrap.h b/branches/2.0/doubango/bindings/java/tinyWRAP_wrap.h
index 847b552b..e1abd04d 100644
--- a/branches/2.0/doubango/bindings/java/tinyWRAP_wrap.h
+++ b/branches/2.0/doubango/bindings/java/tinyWRAP_wrap.h
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  * 
  * 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
diff --git a/branches/2.0/doubango/bindings/java/tmedia_bandwidth_level_t.java b/branches/2.0/doubango/bindings/java/tmedia_bandwidth_level_t.java
index bc7d6368..32d8b5c6 100644
--- a/branches/2.0/doubango/bindings/java/tmedia_bandwidth_level_t.java
+++ b/branches/2.0/doubango/bindings/java/tmedia_bandwidth_level_t.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/java/tmedia_chroma_t.java b/branches/2.0/doubango/bindings/java/tmedia_chroma_t.java
index b899b6df..0be93c23 100644
--- a/branches/2.0/doubango/bindings/java/tmedia_chroma_t.java
+++ b/branches/2.0/doubango/bindings/java/tmedia_chroma_t.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -19,7 +19,9 @@ public enum tmedia_chroma_t {
   tmedia_chroma_nv21,
   tmedia_chroma_yuv422p,
   tmedia_chroma_uyvy422,
-  tmedia_chroma_yuv420p;
+  tmedia_chroma_yuv420p,
+  tmedia_chroma_mjpeg,
+  tmedia_chroma_yuyv422;
 
   public final int swigValue() {
     return swigValue;
diff --git a/branches/2.0/doubango/bindings/java/tmedia_codec_id_t.java b/branches/2.0/doubango/bindings/java/tmedia_codec_id_t.java
index 604270ef..ffafebae 100644
--- a/branches/2.0/doubango/bindings/java/tmedia_codec_id_t.java
+++ b/branches/2.0/doubango/bindings/java/tmedia_codec_id_t.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/java/tmedia_mode_t.java b/branches/2.0/doubango/bindings/java/tmedia_mode_t.java
index 83527ca3..e7fc8585 100644
--- a/branches/2.0/doubango/bindings/java/tmedia_mode_t.java
+++ b/branches/2.0/doubango/bindings/java/tmedia_mode_t.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/java/tmedia_pref_video_size_t.java b/branches/2.0/doubango/bindings/java/tmedia_pref_video_size_t.java
index 96e57174..567b2097 100644
--- a/branches/2.0/doubango/bindings/java/tmedia_pref_video_size_t.java
+++ b/branches/2.0/doubango/bindings/java/tmedia_pref_video_size_t.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -16,6 +16,7 @@ public enum tmedia_pref_video_size_t {
   tmedia_pref_video_size_hvga,
   tmedia_pref_video_size_vga,
   tmedia_pref_video_size_4cif,
+  tmedia_pref_video_size_wvga,
   tmedia_pref_video_size_svga,
   tmedia_pref_video_size_480p,
   tmedia_pref_video_size_720p,
diff --git a/branches/2.0/doubango/bindings/java/tmedia_profile_t.java b/branches/2.0/doubango/bindings/java/tmedia_profile_t.java
index bfb8f607..b0b47318 100644
--- a/branches/2.0/doubango/bindings/java/tmedia_profile_t.java
+++ b/branches/2.0/doubango/bindings/java/tmedia_profile_t.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/java/tmedia_qos_strength_t.java b/branches/2.0/doubango/bindings/java/tmedia_qos_strength_t.java
index 8f8e4652..5b70298d 100644
--- a/branches/2.0/doubango/bindings/java/tmedia_qos_strength_t.java
+++ b/branches/2.0/doubango/bindings/java/tmedia_qos_strength_t.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/java/tmedia_qos_stype_t.java b/branches/2.0/doubango/bindings/java/tmedia_qos_stype_t.java
index f19af372..3bc44934 100644
--- a/branches/2.0/doubango/bindings/java/tmedia_qos_stype_t.java
+++ b/branches/2.0/doubango/bindings/java/tmedia_qos_stype_t.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/java/tmedia_srtp_mode_t.java b/branches/2.0/doubango/bindings/java/tmedia_srtp_mode_t.java
index 42a6f1c5..9d6fffbc 100644
--- a/branches/2.0/doubango/bindings/java/tmedia_srtp_mode_t.java
+++ b/branches/2.0/doubango/bindings/java/tmedia_srtp_mode_t.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/java/tmedia_srtp_type_t.java b/branches/2.0/doubango/bindings/java/tmedia_srtp_type_t.java
index a33778ba..22f07d49 100644
--- a/branches/2.0/doubango/bindings/java/tmedia_srtp_type_t.java
+++ b/branches/2.0/doubango/bindings/java/tmedia_srtp_type_t.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/java/tmedia_t140_data_type_t.java b/branches/2.0/doubango/bindings/java/tmedia_t140_data_type_t.java
index 4eb7a5fc..b3b20606 100644
--- a/branches/2.0/doubango/bindings/java/tmedia_t140_data_type_t.java
+++ b/branches/2.0/doubango/bindings/java/tmedia_t140_data_type_t.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/java/tmsrp_event_type_t.java b/branches/2.0/doubango/bindings/java/tmsrp_event_type_t.java
index dc832bd9..6c88f50a 100644
--- a/branches/2.0/doubango/bindings/java/tmsrp_event_type_t.java
+++ b/branches/2.0/doubango/bindings/java/tmsrp_event_type_t.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/java/tmsrp_request_type_t.java b/branches/2.0/doubango/bindings/java/tmsrp_request_type_t.java
index 49147bd0..317d7a39 100644
--- a/branches/2.0/doubango/bindings/java/tmsrp_request_type_t.java
+++ b/branches/2.0/doubango/bindings/java/tmsrp_request_type_t.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/java/tsip_event_type_t.java b/branches/2.0/doubango/bindings/java/tsip_event_type_t.java
index 7519707d..ce546b38 100644
--- a/branches/2.0/doubango/bindings/java/tsip_event_type_t.java
+++ b/branches/2.0/doubango/bindings/java/tsip_event_type_t.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/java/tsip_info_event_type_t.java b/branches/2.0/doubango/bindings/java/tsip_info_event_type_t.java
index 96a20644..42937368 100644
--- a/branches/2.0/doubango/bindings/java/tsip_info_event_type_t.java
+++ b/branches/2.0/doubango/bindings/java/tsip_info_event_type_t.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/java/tsip_invite_event_type_t.java b/branches/2.0/doubango/bindings/java/tsip_invite_event_type_t.java
index 9c84c577..bedee901 100644
--- a/branches/2.0/doubango/bindings/java/tsip_invite_event_type_t.java
+++ b/branches/2.0/doubango/bindings/java/tsip_invite_event_type_t.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/java/tsip_message_event_type_t.java b/branches/2.0/doubango/bindings/java/tsip_message_event_type_t.java
index cbf332bf..da69c10b 100644
--- a/branches/2.0/doubango/bindings/java/tsip_message_event_type_t.java
+++ b/branches/2.0/doubango/bindings/java/tsip_message_event_type_t.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/java/tsip_options_event_type_t.java b/branches/2.0/doubango/bindings/java/tsip_options_event_type_t.java
index ca5ab1e2..6d1d33f0 100644
--- a/branches/2.0/doubango/bindings/java/tsip_options_event_type_t.java
+++ b/branches/2.0/doubango/bindings/java/tsip_options_event_type_t.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/java/tsip_publish_event_type_t.java b/branches/2.0/doubango/bindings/java/tsip_publish_event_type_t.java
index c04e0aee..e5d47e39 100644
--- a/branches/2.0/doubango/bindings/java/tsip_publish_event_type_t.java
+++ b/branches/2.0/doubango/bindings/java/tsip_publish_event_type_t.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/java/tsip_register_event_type_t.java b/branches/2.0/doubango/bindings/java/tsip_register_event_type_t.java
index e95d1f4a..8e07c91e 100644
--- a/branches/2.0/doubango/bindings/java/tsip_register_event_type_t.java
+++ b/branches/2.0/doubango/bindings/java/tsip_register_event_type_t.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/java/tsip_request_type_t.java b/branches/2.0/doubango/bindings/java/tsip_request_type_t.java
index a96be991..88ca85a0 100644
--- a/branches/2.0/doubango/bindings/java/tsip_request_type_t.java
+++ b/branches/2.0/doubango/bindings/java/tsip_request_type_t.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/java/tsip_stack_mode_t.java b/branches/2.0/doubango/bindings/java/tsip_stack_mode_t.java
index 5dcec38d..50741ac8 100644
--- a/branches/2.0/doubango/bindings/java/tsip_stack_mode_t.java
+++ b/branches/2.0/doubango/bindings/java/tsip_stack_mode_t.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/java/tsip_subscribe_event_type_t.java b/branches/2.0/doubango/bindings/java/tsip_subscribe_event_type_t.java
index 03cab19b..34231525 100644
--- a/branches/2.0/doubango/bindings/java/tsip_subscribe_event_type_t.java
+++ b/branches/2.0/doubango/bindings/java/tsip_subscribe_event_type_t.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/java/twrap_media_type_t.java b/branches/2.0/doubango/bindings/java/twrap_media_type_t.java
index 25924a76..1ac01a59 100644
--- a/branches/2.0/doubango/bindings/java/twrap_media_type_t.java
+++ b/branches/2.0/doubango/bindings/java/twrap_media_type_t.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/java/twrap_proxy_plugin_type_t.java b/branches/2.0/doubango/bindings/java/twrap_proxy_plugin_type_t.java
index eb8eb083..23206684 100644
--- a/branches/2.0/doubango/bindings/java/twrap_proxy_plugin_type_t.java
+++ b/branches/2.0/doubango/bindings/java/twrap_proxy_plugin_type_t.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/java/twrap_rpmessage_type_t.java b/branches/2.0/doubango/bindings/java/twrap_rpmessage_type_t.java
index 9e879b17..aceb366d 100644
--- a/branches/2.0/doubango/bindings/java/twrap_rpmessage_type_t.java
+++ b/branches/2.0/doubango/bindings/java/twrap_rpmessage_type_t.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/java/twrap_sms_type_t.java b/branches/2.0/doubango/bindings/java/twrap_sms_type_t.java
index 8d5a9104..2a615c6b 100644
--- a/branches/2.0/doubango/bindings/java/twrap_sms_type_t.java
+++ b/branches/2.0/doubango/bindings/java/twrap_sms_type_t.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/branches/2.0/doubango/bindings/python/tinyWRAP.py b/branches/2.0/doubango/bindings/python/tinyWRAP.py
index 4f2b7efc..c4b4bc54 100644
--- a/branches/2.0/doubango/bindings/python/tinyWRAP.py
+++ b/branches/2.0/doubango/bindings/python/tinyWRAP.py
@@ -1,10 +1,9 @@
 # This file was automatically generated by SWIG (http://www.swig.org).
-# Version 2.0.9
+# Version 1.3.40
 #
 # Do not make changes to this file unless you know what you are doing--modify
 # the SWIG interface file instead.
-
-
+# This file is compatible with both classic and new-style classes.
 
 from sys import version_info
 if version_info >= (2,6,0):
@@ -40,7 +39,7 @@ def _swig_setattr_nondynamic(self,class_type,name,value,static=1):
             return
     method = class_type.__swig_setmethods__.get(name,None)
     if method: return method(self,value)
-    if (not static):
+    if (not static) or hasattr(self,name):
         self.__dict__[name] = value
     else:
         raise AttributeError("You cannot add attributes to %s" % self)
@@ -1736,6 +1735,8 @@ tmedia_chroma_nv21 = _tinyWRAP.tmedia_chroma_nv21
 tmedia_chroma_yuv422p = _tinyWRAP.tmedia_chroma_yuv422p
 tmedia_chroma_uyvy422 = _tinyWRAP.tmedia_chroma_uyvy422
 tmedia_chroma_yuv420p = _tinyWRAP.tmedia_chroma_yuv420p
+tmedia_chroma_mjpeg = _tinyWRAP.tmedia_chroma_mjpeg
+tmedia_chroma_yuyv422 = _tinyWRAP.tmedia_chroma_yuyv422
 tmedia_mode_none = _tinyWRAP.tmedia_mode_none
 tmedia_mode_optional = _tinyWRAP.tmedia_mode_optional
 tmedia_mode_mandatory = _tinyWRAP.tmedia_mode_mandatory
@@ -1774,6 +1775,7 @@ tmedia_pref_video_size_cif = _tinyWRAP.tmedia_pref_video_size_cif
 tmedia_pref_video_size_hvga = _tinyWRAP.tmedia_pref_video_size_hvga
 tmedia_pref_video_size_vga = _tinyWRAP.tmedia_pref_video_size_vga
 tmedia_pref_video_size_4cif = _tinyWRAP.tmedia_pref_video_size_4cif
+tmedia_pref_video_size_wvga = _tinyWRAP.tmedia_pref_video_size_wvga
 tmedia_pref_video_size_svga = _tinyWRAP.tmedia_pref_video_size_svga
 tmedia_pref_video_size_480p = _tinyWRAP.tmedia_pref_video_size_480p
 tmedia_pref_video_size_720p = _tinyWRAP.tmedia_pref_video_size_720p
@@ -2133,6 +2135,5 @@ tmsrp_event_type_none = _tinyWRAP.tmsrp_event_type_none
 tmsrp_event_type_connected = _tinyWRAP.tmsrp_event_type_connected
 tmsrp_event_type_disconnected = _tinyWRAP.tmsrp_event_type_disconnected
 tmsrp_event_type_message = _tinyWRAP.tmsrp_event_type_message
-# This file is compatible with both classic and new-style classes.
 
 
diff --git a/branches/2.0/doubango/bindings/python/tinyWRAP_wrap.cxx b/branches/2.0/doubango/bindings/python/tinyWRAP_wrap.cxx
index 4897cd46..eb69e8f1 100644
--- a/branches/2.0/doubango/bindings/python/tinyWRAP_wrap.cxx
+++ b/branches/2.0/doubango/bindings/python/tinyWRAP_wrap.cxx
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  * 
  * 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
@@ -202,7 +202,7 @@ template <typename T> T SwigValueInit() {
 /* 
    Flags/methods for returning states.
    
-   The SWIG conversion methods, as ConvertPtr, return an integer 
+   The SWIG conversion methods, as ConvertPtr, return and integer 
    that tells if the conversion was successful or not. And if not,
    an error code can be returned (see swigerrors.swg for the codes).
    
@@ -757,16 +757,7 @@ SWIG_UnpackDataName(const char *c, void *ptr, size_t sz, const char *name) {
 #define PyInt_Check(x) PyLong_Check(x)
 #define PyInt_AsLong(x) PyLong_AsLong(x)
 #define PyInt_FromLong(x) PyLong_FromLong(x)
-#define PyInt_FromSize_t(x) PyLong_FromSize_t(x)
-#define PyString_Check(name) PyBytes_Check(name)
-#define PyString_FromString(x) PyUnicode_FromString(x)
 #define PyString_Format(fmt, args)  PyUnicode_Format(fmt, args)
-#define PyString_AsString(str) PyBytes_AsString(str)
-#define PyString_Size(str) PyBytes_Size(str)	
-#define PyString_InternFromString(key) PyUnicode_InternFromString(key)
-#define Py_TPFLAGS_HAVE_CLASS Py_TPFLAGS_BASETYPE
-#define PyString_AS_STRING(x) PyUnicode_AS_STRING(x)
-#define _PyLong_FromSsize_t(x) PyLong_FromSsize_t(x)
 
 #endif
 
@@ -906,63 +897,6 @@ PyObject *PyBool_FromLong(long ok)
 typedef int Py_ssize_t;
 # define PY_SSIZE_T_MAX INT_MAX
 # define PY_SSIZE_T_MIN INT_MIN
-typedef inquiry lenfunc;
-typedef intargfunc ssizeargfunc;
-typedef intintargfunc ssizessizeargfunc;
-typedef intobjargproc ssizeobjargproc;
-typedef intintobjargproc ssizessizeobjargproc;
-typedef getreadbufferproc readbufferproc;
-typedef getwritebufferproc writebufferproc;
-typedef getsegcountproc segcountproc;
-typedef getcharbufferproc charbufferproc;
-static long PyNumber_AsSsize_t (PyObject *x, void *SWIGUNUSEDPARM(exc))
-{
-  long result = 0;
-  PyObject *i = PyNumber_Int(x);
-  if (i) {
-    result = PyInt_AsLong(i);
-    Py_DECREF(i);
-  }
-  return result;
-}
-#endif
-
-#if PY_VERSION_HEX < 0x02040000
-#define Py_VISIT(op)				\
-  do { 						\
-    if (op) {					\
-      int vret = visit((op), arg);		\
-      if (vret)					\
-        return vret;				\
-    }						\
-  } while (0)
-#endif
-
-#if PY_VERSION_HEX < 0x02030000
-typedef struct {
-  PyTypeObject type;
-  PyNumberMethods as_number;
-  PyMappingMethods as_mapping;
-  PySequenceMethods as_sequence;
-  PyBufferProcs as_buffer;
-  PyObject *name, *slots;
-} PyHeapTypeObject;
-#endif
-
-#if PY_VERSION_HEX < 0x02030000
-typedef destructor freefunc;
-#endif
-
-#if ((PY_MAJOR_VERSION == 2 && PY_MINOR_VERSION > 6) || \
-     (PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION > 0) || \
-     (PY_MAJOR_VERSION > 3))
-# define SWIGPY_USE_CAPSULE
-# define SWIGPY_CAPSULE_NAME ((char*)"swig_runtime_data" SWIG_RUNTIME_VERSION ".type_pointer_capsule" SWIG_TYPE_TABLE_NAME)
-#endif
-
-#if PY_VERSION_HEX < 0x03020000
-#define PyDescr_TYPE(x) (((PyDescrObject *)(x))->d_type)
-#define PyDescr_NAME(x) (((PyDescrObject *)(x))->d_name)
 #endif
 
 /* -----------------------------------------------------------------------------
@@ -1109,6 +1043,9 @@ SWIG_Python_AddErrorMsg(const char* mesg)
 
 #ifdef __cplusplus
 extern "C" {
+#if 0
+} /* cc-mode */
+#endif
 #endif
 
 /* -----------------------------------------------------------------------------
@@ -1134,24 +1071,27 @@ typedef struct swig_const_info {
  * Wrapper of PyInstanceMethod_New() used in Python 3
  * It is exported to the generated module, used for -fastproxy
  * ----------------------------------------------------------------------------- */
+SWIGRUNTIME PyObject* SWIG_PyInstanceMethod_New(PyObject *self, PyObject *func)
+{
 #if PY_VERSION_HEX >= 0x03000000
-SWIGRUNTIME PyObject* SWIG_PyInstanceMethod_New(PyObject *SWIGUNUSEDPARM(self), PyObject *func)
-{
   return PyInstanceMethod_New(func);
-}
 #else
-SWIGRUNTIME PyObject* SWIG_PyInstanceMethod_New(PyObject *SWIGUNUSEDPARM(self), PyObject *SWIGUNUSEDPARM(func))
-{
   return NULL;
-}
 #endif
+}
 
 #ifdef __cplusplus
+#if 0
+{ /* cc-mode */
+#endif
 }
 #endif
 
 
 /* -----------------------------------------------------------------------------
+ * See the LICENSE file for information on copyright, usage and redistribution
+ * of SWIG, and the README file for authors - http://www.swig.org/release.html.
+ *
  * pyrun.swg
  *
  * This file contains the runtime support for Python modules
@@ -1166,15 +1106,7 @@ SWIGRUNTIME PyObject* SWIG_PyInstanceMethod_New(PyObject *SWIGUNUSEDPARM(self),
 #define SWIG_Python_ConvertPtr(obj, pptr, type, flags)  SWIG_Python_ConvertPtrAndOwn(obj, pptr, type, flags, 0)
 #define SWIG_ConvertPtr(obj, pptr, type, flags)         SWIG_Python_ConvertPtr(obj, pptr, type, flags)
 #define SWIG_ConvertPtrAndOwn(obj,pptr,type,flags,own)  SWIG_Python_ConvertPtrAndOwn(obj, pptr, type, flags, own)
-
-#ifdef SWIGPYTHON_BUILTIN
-#define SWIG_NewPointerObj(ptr, type, flags)            SWIG_Python_NewPointerObj(self, ptr, type, flags)
-#else
-#define SWIG_NewPointerObj(ptr, type, flags)            SWIG_Python_NewPointerObj(NULL, ptr, type, flags)
-#endif
-
-#define SWIG_InternalNewPointerObj(ptr, type, flags)	SWIG_Python_NewPointerObj(NULL, ptr, type, flags)
-
+#define SWIG_NewPointerObj(ptr, type, flags)            SWIG_Python_NewPointerObj(ptr, type, flags)
 #define SWIG_CheckImplicit(ty)                          SWIG_Python_CheckImplicit(ty) 
 #define SWIG_AcquirePtr(ptr, src)                       SWIG_Python_AcquirePtr(ptr, src)
 #define swig_owntype                                    int
@@ -1189,7 +1121,7 @@ SWIGRUNTIME PyObject* SWIG_PyInstanceMethod_New(PyObject *SWIGUNUSEDPARM(self),
 
 /* for C or C++ function pointers */
 #define SWIG_ConvertFunctionPtr(obj, pptr, type)        SWIG_Python_ConvertFunctionPtr(obj, pptr, type)
-#define SWIG_NewFunctionPtrObj(ptr, type)               SWIG_Python_NewPointerObj(NULL, ptr, type, 0)
+#define SWIG_NewFunctionPtrObj(ptr, type)               SWIG_Python_NewPointerObj(ptr, type, 0)
 
 /* for C++ member pointers, ie, member methods */
 #define SWIG_ConvertMember(obj, ptr, sz, ty)            SWIG_Python_ConvertPacked(obj, ptr, sz, ty)
@@ -1198,7 +1130,7 @@ SWIGRUNTIME PyObject* SWIG_PyInstanceMethod_New(PyObject *SWIGUNUSEDPARM(self),
 
 /* Runtime API */
 
-#define SWIG_GetModule(clientdata)                      SWIG_Python_GetModule(clientdata)
+#define SWIG_GetModule(clientdata)                      SWIG_Python_GetModule()
 #define SWIG_SetModule(clientdata, pointer)             SWIG_Python_SetModule(pointer)
 #define SWIG_NewClientData(obj)                         SwigPyClientData_New(obj)
 
@@ -1224,7 +1156,7 @@ SWIG_Python_SetErrorObj(PyObject *errtype, PyObject *obj) {
 SWIGINTERN void 
 SWIG_Python_SetErrorMsg(PyObject *errtype, const char *msg) {
   SWIG_PYTHON_THREAD_BEGIN_BLOCK;
-  PyErr_SetString(errtype, msg);
+  PyErr_SetString(errtype, (char *) msg);
   SWIG_PYTHON_THREAD_END_BLOCK;
 }
 
@@ -1232,41 +1164,12 @@ SWIG_Python_SetErrorMsg(PyObject *errtype, const char *msg) {
 
 /* Set a constant value */
 
-#if defined(SWIGPYTHON_BUILTIN)
-
-SWIGINTERN void
-SwigPyBuiltin_AddPublicSymbol(PyObject *seq, const char *key) {
-  PyObject *s = PyString_InternFromString(key);
-  PyList_Append(seq, s);
-  Py_DECREF(s);
-}
-
-SWIGINTERN void
-SWIG_Python_SetConstant(PyObject *d, PyObject *public_interface, const char *name, PyObject *obj) {   
-#if PY_VERSION_HEX < 0x02030000
-  PyDict_SetItemString(d, (char *)name, obj);
-#else
-  PyDict_SetItemString(d, name, obj);
-#endif
-  Py_DECREF(obj);
-  if (public_interface)
-    SwigPyBuiltin_AddPublicSymbol(public_interface, name);
-}
-
-#else
-
 SWIGINTERN void
 SWIG_Python_SetConstant(PyObject *d, const char *name, PyObject *obj) {   
-#if PY_VERSION_HEX < 0x02030000
-  PyDict_SetItemString(d, (char *)name, obj);
-#else
-  PyDict_SetItemString(d, name, obj);
-#endif
+  PyDict_SetItemString(d, (char*) name, obj);
   Py_DECREF(obj);                            
 }
 
-#endif
-
 /* Append a value to the result obj */
 
 SWIGINTERN PyObject*
@@ -1327,14 +1230,6 @@ SWIG_Python_UnpackTuple(PyObject *args, const char *name, Py_ssize_t min, Py_ssi
     }
   }  
   if (!PyTuple_Check(args)) {
-    if (min <= 1 && max >= 1) {
-      register int i;
-      objs[0] = args;
-      for (i = 1; i < max; ++i) {
-	objs[i] = 0;
-      }
-      return 2;
-    }
     PyErr_SetString(PyExc_SystemError, "UnpackTuple() argument list is not a tuple");
     return 0;
   } else {
@@ -1387,11 +1282,11 @@ SWIG_Python_UnpackTuple(PyObject *args, const char *name, Py_ssize_t min, Py_ssi
 
 #define SWIG_POINTER_IMPLICIT_CONV  (SWIG_POINTER_DISOWN   << 1)
 
-#define SWIG_BUILTIN_TP_INIT	    (SWIG_POINTER_OWN << 2)
-#define SWIG_BUILTIN_INIT	    (SWIG_BUILTIN_TP_INIT | SWIG_POINTER_OWN)
-
 #ifdef __cplusplus
 extern "C" {
+#if 0
+} /* cc-mode */
+#endif
 #endif
 
 /*  How to access Py_None */
@@ -1442,7 +1337,6 @@ typedef struct {
   PyObject *destroy;
   int delargs;
   int implicitconv;
-  PyTypeObject *pytype;
 } SwigPyClientData;
 
 SWIGRUNTIMEINLINE int 
@@ -1509,13 +1403,13 @@ SwigPyClientData_New(PyObject* obj)
       data->delargs = 0;
     }
     data->implicitconv = 0;
-    data->pytype = 0;
     return data;
   }
 }
 
 SWIGRUNTIME void 
-SwigPyClientData_Del(SwigPyClientData *data) {
+SwigPyClientData_Del(SwigPyClientData* data)
+{
   Py_XDECREF(data->newraw);
   Py_XDECREF(data->newargs);
   Py_XDECREF(data->destroy);
@@ -1529,9 +1423,6 @@ typedef struct {
   swig_type_info *ty;
   int own;
   PyObject *next;
-#ifdef SWIGPYTHON_BUILTIN
-  PyObject *dict;
-#endif
 } SwigPyObject;
 
 SWIGRUNTIME PyObject *
@@ -1582,21 +1473,21 @@ SwigPyObject_repr(SwigPyObject *v, PyObject *args)
 #endif
 {
   const char *name = SWIG_TypePrettyName(v->ty);
-  PyObject *repr = SWIG_Python_str_FromFormat("<Swig Object of type '%s' at %p>", (name ? name : "unknown"), (void *)v);
+  PyObject *repr = SWIG_Python_str_FromFormat("<Swig Object of type '%s' at %p>", name, v);
   if (v->next) {
-# ifdef METH_NOARGS
+#ifdef METH_NOARGS
     PyObject *nrep = SwigPyObject_repr((SwigPyObject *)v->next);
-# else
+#else
     PyObject *nrep = SwigPyObject_repr((SwigPyObject *)v->next, args);
-# endif
-# if PY_VERSION_HEX >= 0x03000000
+#endif
+#if PY_VERSION_HEX >= 0x03000000
     PyObject *joined = PyUnicode_Concat(repr, nrep);
     Py_DecRef(repr);
     Py_DecRef(nrep);
     repr = joined;
-# else
+#else
     PyString_ConcatAndDel(&repr,nrep);
-# endif
+#endif
   }
   return repr;  
 }
@@ -1646,43 +1537,27 @@ SwigPyObject_richcompare(SwigPyObject *v, SwigPyObject *w, int op)
     Py_INCREF(Py_NotImplemented);
     return Py_NotImplemented;
   }
-  res = PyBool_FromLong( (SwigPyObject_compare(v, w)==0) == (op == Py_EQ) ? 1 : 0);
+  if( (SwigPyObject_compare(v, w)==0) == (op == Py_EQ) )
+    res = Py_True;
+  else
+    res = Py_False;
+  Py_INCREF(res);
   return res;  
 }
 
 
-SWIGRUNTIME PyTypeObject* SwigPyObject_TypeOnce(void);
+SWIGRUNTIME PyTypeObject* _PySwigObject_type(void);
 
-#ifdef SWIGPYTHON_BUILTIN
-static swig_type_info *SwigPyObject_stype = 0;
 SWIGRUNTIME PyTypeObject*
 SwigPyObject_type(void) {
-    SwigPyClientData *cd;
-    assert(SwigPyObject_stype);
-    cd = (SwigPyClientData*) SwigPyObject_stype->clientdata;
-    assert(cd);
-    assert(cd->pytype);
-    return cd->pytype;
-}
-#else
-SWIGRUNTIME PyTypeObject*
-SwigPyObject_type(void) {
-  static PyTypeObject *SWIG_STATIC_POINTER(type) = SwigPyObject_TypeOnce();
+  static PyTypeObject *SWIG_STATIC_POINTER(type) = _PySwigObject_type();
   return type;
 }
-#endif
 
 SWIGRUNTIMEINLINE int
 SwigPyObject_Check(PyObject *op) {
-#ifdef SWIGPYTHON_BUILTIN
-  PyTypeObject *target_tp = SwigPyObject_type();
-  if (PyType_IsSubtype(op->ob_type, target_tp))
-    return 1;
-  return (strcmp(op->ob_type->tp_name, "SwigPyObject") == 0);
-#else
   return (Py_TYPE(op) == SwigPyObject_type())
     || (strcmp(Py_TYPE(op)->tp_name,"SwigPyObject") == 0);
-#endif
 }
 
 SWIGRUNTIME PyObject *
@@ -1786,10 +1661,8 @@ SwigPyObject_own(PyObject *v, PyObject *args)
   PyObject *val = 0;
 #if (PY_VERSION_HEX < 0x02020000)
   if (!PyArg_ParseTuple(args,(char *)"|O:own",&val))
-#elif (PY_VERSION_HEX < 0x02050000)
-  if (!PyArg_UnpackTuple(args, (char *)"own", 0, 1, &val)) 
 #else
-  if (!PyArg_UnpackTuple(args, "own", 0, 1, &val)) 
+  if (!PyArg_UnpackTuple(args, (char *)"own", 0, 1, &val)) 
 #endif
     {
       return NULL;
@@ -1850,9 +1723,9 @@ SwigPyObject_getattr(SwigPyObject *sobj,char *name)
 #endif
 
 SWIGRUNTIME PyTypeObject*
-SwigPyObject_TypeOnce(void) {
+_PySwigObject_type(void) {
   static char swigobject_doc[] = "Swig object carries a C/C++ instance pointer";
-
+  
   static PyNumberMethods SwigPyObject_as_number = {
     (binaryfunc)0, /*nb_add*/
     (binaryfunc)0, /*nb_subtract*/
@@ -1899,89 +1772,85 @@ SwigPyObject_TypeOnce(void) {
 #endif
   };
 
-  static PyTypeObject swigpyobject_type;
+  static PyTypeObject swigpyobject_type;  
   static int type_init = 0;
   if (!type_init) {
-    const PyTypeObject tmp = {
-      /* PyObject header changed in Python 3 */
+    const PyTypeObject tmp
+      = {
+	/* PyObject header changed in Python 3 */
 #if PY_VERSION_HEX >= 0x03000000
-      PyVarObject_HEAD_INIT(NULL, 0)
-#else
-      PyObject_HEAD_INIT(NULL)
-      0,                                    /* ob_size */
+	PyVarObject_HEAD_INIT(&PyType_Type, 0)
+#else    
+	PyObject_HEAD_INIT(NULL)
+	0,				    /* ob_size */
 #endif
-      (char *)"SwigPyObject",               /* tp_name */
-      sizeof(SwigPyObject),                 /* tp_basicsize */
-      0,                                    /* tp_itemsize */
-      (destructor)SwigPyObject_dealloc,     /* tp_dealloc */
-      (printfunc)SwigPyObject_print,        /* tp_print */
+	(char *)"SwigPyObject",		    /* tp_name */
+	sizeof(SwigPyObject),		    /* tp_basicsize */
+	0,			            /* tp_itemsize */
+	(destructor)SwigPyObject_dealloc,   /* tp_dealloc */
+	(printfunc)SwigPyObject_print,	    /* tp_print */
 #if PY_VERSION_HEX < 0x02020000
-      (getattrfunc)SwigPyObject_getattr,    /* tp_getattr */
+	(getattrfunc)SwigPyObject_getattr,  /* tp_getattr */ 
 #else
-      (getattrfunc)0,                       /* tp_getattr */
+	(getattrfunc)0,			    /* tp_getattr */ 
 #endif
-      (setattrfunc)0,                       /* tp_setattr */
+	(setattrfunc)0,			    /* tp_setattr */ 
 #if PY_VERSION_HEX >= 0x03000000
     0, /* tp_reserved in 3.0.1, tp_compare in 3.0.0 but not used */
 #else
-      (cmpfunc)SwigPyObject_compare,        /* tp_compare */
+	(cmpfunc)SwigPyObject_compare,	    /* tp_compare */
 #endif
-      (reprfunc)SwigPyObject_repr,          /* tp_repr */
-      &SwigPyObject_as_number,              /* tp_as_number */
-      0,                                    /* tp_as_sequence */
-      0,                                    /* tp_as_mapping */
-      (hashfunc)0,                          /* tp_hash */
-      (ternaryfunc)0,                       /* tp_call */
-      (reprfunc)SwigPyObject_str,           /* tp_str */
-      PyObject_GenericGetAttr,              /* tp_getattro */
-      0,                                    /* tp_setattro */
-      0,                                    /* tp_as_buffer */
-      Py_TPFLAGS_DEFAULT,                   /* tp_flags */
-      swigobject_doc,                       /* tp_doc */
-      0,                                    /* tp_traverse */
-      0,                                    /* tp_clear */
-      (richcmpfunc)SwigPyObject_richcompare,/* tp_richcompare */
-      0,                                    /* tp_weaklistoffset */
+	(reprfunc)SwigPyObject_repr,	    /* tp_repr */    
+	&SwigPyObject_as_number,	    /* tp_as_number */
+	0,				    /* tp_as_sequence */
+	0,				    /* tp_as_mapping */
+	(hashfunc)0,			    /* tp_hash */
+	(ternaryfunc)0,			    /* tp_call */
+	(reprfunc)SwigPyObject_str,	    /* tp_str */
+	PyObject_GenericGetAttr,            /* tp_getattro */
+	0,				    /* tp_setattro */
+	0,		                    /* tp_as_buffer */
+	Py_TPFLAGS_DEFAULT,	            /* tp_flags */
+	swigobject_doc, 	            /* tp_doc */        
+	0,                                  /* tp_traverse */
+	0,                                  /* tp_clear */
+	(richcmpfunc)SwigPyObject_richcompare,           /* tp_richcompare */
+	0,                                  /* tp_weaklistoffset */
 #if PY_VERSION_HEX >= 0x02020000
-      0,                                    /* tp_iter */
-      0,                                    /* tp_iternext */
-      swigobject_methods,                   /* tp_methods */
-      0,                                    /* tp_members */
-      0,                                    /* tp_getset */
-      0,                                    /* tp_base */
-      0,                                    /* tp_dict */
-      0,                                    /* tp_descr_get */
-      0,                                    /* tp_descr_set */
-      0,                                    /* tp_dictoffset */
-      0,                                    /* tp_init */
-      0,                                    /* tp_alloc */
-      0,                                    /* tp_new */
-      0,                                    /* tp_free */
-      0,                                    /* tp_is_gc */
-      0,                                    /* tp_bases */
-      0,                                    /* tp_mro */
-      0,                                    /* tp_cache */
-      0,                                    /* tp_subclasses */
-      0,                                    /* tp_weaklist */
+	0,                                  /* tp_iter */
+	0,                                  /* tp_iternext */
+	swigobject_methods,		    /* tp_methods */ 
+	0,			            /* tp_members */
+	0,				    /* tp_getset */	    	
+	0,			            /* tp_base */	        
+	0,				    /* tp_dict */	    	
+	0,				    /* tp_descr_get */  	
+	0,				    /* tp_descr_set */  	
+	0,				    /* tp_dictoffset */ 	
+	0,				    /* tp_init */	    	
+	0,				    /* tp_alloc */	    	
+	0,			            /* tp_new */	    	
+	0,	                            /* tp_free */	   
+	0,                                  /* tp_is_gc */  
+	0,				    /* tp_bases */   
+	0,				    /* tp_mro */
+	0,				    /* tp_cache */   
+	0,				    /* tp_subclasses */
+	0,				    /* tp_weaklist */
 #endif
 #if PY_VERSION_HEX >= 0x02030000
-      0,                                    /* tp_del */
-#endif
-#if PY_VERSION_HEX >= 0x02060000
-      0,                                    /* tp_version */
+	0,                                  /* tp_del */
 #endif
 #ifdef COUNT_ALLOCS
-      0,0,0,0                               /* tp_alloc -> tp_next */
+	0,0,0,0                             /* tp_alloc -> tp_next */
 #endif
-    };
+      };
     swigpyobject_type = tmp;
-    type_init = 1;
-#if PY_VERSION_HEX < 0x02020000
+    /* for Python 3 we already assigned ob_type in PyVarObject_HEAD_INIT() */
+#if PY_VERSION_HEX < 0x03000000
     swigpyobject_type.ob_type = &PyType_Type;
-#else
-    if (PyType_Ready(&swigpyobject_type) < 0)
-      return NULL;
 #endif
+    type_init = 1;
   }
   return &swigpyobject_type;
 }
@@ -2055,17 +1924,17 @@ SwigPyPacked_compare(SwigPyPacked *v, SwigPyPacked *w)
   return s ? s : strncmp((char *)v->pack, (char *)w->pack, 2*v->size);
 }
 
-SWIGRUNTIME PyTypeObject* SwigPyPacked_TypeOnce(void);
+SWIGRUNTIME PyTypeObject* _PySwigPacked_type(void);
 
 SWIGRUNTIME PyTypeObject*
 SwigPyPacked_type(void) {
-  static PyTypeObject *SWIG_STATIC_POINTER(type) = SwigPyPacked_TypeOnce();
+  static PyTypeObject *SWIG_STATIC_POINTER(type) = _PySwigPacked_type();
   return type;
 }
 
 SWIGRUNTIMEINLINE int
 SwigPyPacked_Check(PyObject *op) {
-  return ((op)->ob_type == SwigPyPacked_TypeOnce()) 
+  return ((op)->ob_type == _PySwigPacked_type()) 
     || (strcmp((op)->ob_type->tp_name,"SwigPyPacked") == 0);
 }
 
@@ -2080,87 +1949,83 @@ SwigPyPacked_dealloc(PyObject *v)
 }
 
 SWIGRUNTIME PyTypeObject*
-SwigPyPacked_TypeOnce(void) {
+_PySwigPacked_type(void) {
   static char swigpacked_doc[] = "Swig object carries a C/C++ instance pointer";
   static PyTypeObject swigpypacked_type;
-  static int type_init = 0;
+  static int type_init = 0;  
   if (!type_init) {
-    const PyTypeObject tmp = {
-      /* PyObject header changed in Python 3 */
+    const PyTypeObject tmp
+      = {
+    /* PyObject header changed in Python 3 */
 #if PY_VERSION_HEX>=0x03000000
-      PyVarObject_HEAD_INIT(NULL, 0)
+    PyVarObject_HEAD_INIT(&PyType_Type, 0)
 #else
-      PyObject_HEAD_INIT(NULL)
-      0,                                    /* ob_size */
+	PyObject_HEAD_INIT(NULL)
+    0,				    /* ob_size */	
 #endif
-      (char *)"SwigPyPacked",               /* tp_name */
-      sizeof(SwigPyPacked),                 /* tp_basicsize */
-      0,                                    /* tp_itemsize */
-      (destructor)SwigPyPacked_dealloc,     /* tp_dealloc */
-      (printfunc)SwigPyPacked_print,        /* tp_print */
-      (getattrfunc)0,                       /* tp_getattr */
-      (setattrfunc)0,                       /* tp_setattr */
+	(char *)"SwigPyPacked",		    /* tp_name */	
+	sizeof(SwigPyPacked),		    /* tp_basicsize */	
+	0,				    /* tp_itemsize */	
+	(destructor)SwigPyPacked_dealloc,   /* tp_dealloc */	
+	(printfunc)SwigPyPacked_print,	    /* tp_print */   	
+	(getattrfunc)0,			    /* tp_getattr */ 	
+	(setattrfunc)0,			    /* tp_setattr */ 	
 #if PY_VERSION_HEX>=0x03000000
-      0, /* tp_reserved in 3.0.1 */
+    0, /* tp_reserved in 3.0.1 */
 #else
-      (cmpfunc)SwigPyPacked_compare,        /* tp_compare */
+    (cmpfunc)SwigPyPacked_compare,	    /* tp_compare */
 #endif
-      (reprfunc)SwigPyPacked_repr,          /* tp_repr */
-      0,                                    /* tp_as_number */
-      0,                                    /* tp_as_sequence */
-      0,                                    /* tp_as_mapping */
-      (hashfunc)0,                          /* tp_hash */
-      (ternaryfunc)0,                       /* tp_call */
-      (reprfunc)SwigPyPacked_str,           /* tp_str */
-      PyObject_GenericGetAttr,              /* tp_getattro */
-      0,                                    /* tp_setattro */
-      0,                                    /* tp_as_buffer */
-      Py_TPFLAGS_DEFAULT,                   /* tp_flags */
-      swigpacked_doc,                       /* tp_doc */
-      0,                                    /* tp_traverse */
-      0,                                    /* tp_clear */
-      0,                                    /* tp_richcompare */
-      0,                                    /* tp_weaklistoffset */
+	(reprfunc)SwigPyPacked_repr,	    /* tp_repr */
+	0,	                            /* tp_as_number */
+	0,				    /* tp_as_sequence */
+	0,				    /* tp_as_mapping */
+	(hashfunc)0,			    /* tp_hash */
+	(ternaryfunc)0,			    /* tp_call */
+	(reprfunc)SwigPyPacked_str,	    /* tp_str */
+	PyObject_GenericGetAttr,            /* tp_getattro */
+	0,				    /* tp_setattro */
+	0,		                    /* tp_as_buffer */
+	Py_TPFLAGS_DEFAULT,	            /* tp_flags */
+	swigpacked_doc, 	            /* tp_doc */
+	0,                                  /* tp_traverse */
+	0,                                  /* tp_clear */
+	0,                                  /* tp_richcompare */
+	0,                                  /* tp_weaklistoffset */
 #if PY_VERSION_HEX >= 0x02020000
-      0,                                    /* tp_iter */
-      0,                                    /* tp_iternext */
-      0,                                    /* tp_methods */
-      0,                                    /* tp_members */
-      0,                                    /* tp_getset */
-      0,                                    /* tp_base */
-      0,                                    /* tp_dict */
-      0,                                    /* tp_descr_get */
-      0,                                    /* tp_descr_set */
-      0,                                    /* tp_dictoffset */
-      0,                                    /* tp_init */
-      0,                                    /* tp_alloc */
-      0,                                    /* tp_new */
-      0,                                    /* tp_free */
-      0,                                    /* tp_is_gc */
-      0,                                    /* tp_bases */
-      0,                                    /* tp_mro */
-      0,                                    /* tp_cache */
-      0,                                    /* tp_subclasses */
-      0,                                    /* tp_weaklist */
+	0,                                  /* tp_iter */
+	0,                                  /* tp_iternext */
+	0,		                    /* tp_methods */ 
+	0,			            /* tp_members */
+	0,				    /* tp_getset */	    	
+	0,			            /* tp_base */	        
+	0,				    /* tp_dict */	    	
+	0,				    /* tp_descr_get */  	
+	0,				    /* tp_descr_set */  	
+	0,				    /* tp_dictoffset */ 	
+	0,				    /* tp_init */	    	
+	0,				    /* tp_alloc */	    	
+	0,			            /* tp_new */	    	
+	0, 	                            /* tp_free */	   
+        0,                                  /* tp_is_gc */  
+	0,				    /* tp_bases */   
+	0,				    /* tp_mro */
+	0,				    /* tp_cache */   
+ 	0,				    /* tp_subclasses */
+	0,				    /* tp_weaklist */
 #endif
 #if PY_VERSION_HEX >= 0x02030000
-      0,                                    /* tp_del */
-#endif
-#if PY_VERSION_HEX >= 0x02060000
-      0,                                    /* tp_version */
+	0,                                  /* tp_del */
 #endif
 #ifdef COUNT_ALLOCS
-      0,0,0,0                               /* tp_alloc -> tp_next */
+	0,0,0,0                             /* tp_alloc -> tp_next */
 #endif
-    };
+      };
     swigpypacked_type = tmp;
-    type_init = 1;
-#if PY_VERSION_HEX < 0x02020000
+    /* for Python 3 the ob_type already assigned in PyVarObject_HEAD_INIT() */
+#if PY_VERSION_HEX < 0x03000000
     swigpypacked_type.ob_type = &PyType_Type;
-#else
-    if (PyType_Ready(&swigpypacked_type) < 0)
-      return NULL;
 #endif
+    type_init = 1;
   }
   return &swigpypacked_type;
 }
@@ -2207,13 +2072,10 @@ _SWIG_This(void)
     return SWIG_Python_str_FromChar("this");
 }
 
-static PyObject *swig_this = NULL;
-
 SWIGRUNTIME PyObject *
 SWIG_This(void)
 {
-  if (swig_this == NULL)
-    swig_this = _SWIG_This();
+  static PyObject *SWIG_STATIC_POINTER(swig_this) = _SWIG_This();
   return swig_this;
 }
 
@@ -2227,65 +2089,50 @@ SWIG_This(void)
 SWIGRUNTIME SwigPyObject *
 SWIG_Python_GetSwigThis(PyObject *pyobj) 
 {
-  PyObject *obj;
-
-  if (SwigPyObject_Check(pyobj))
+  if (SwigPyObject_Check(pyobj)) {
     return (SwigPyObject *) pyobj;
-
-#ifdef SWIGPYTHON_BUILTIN
-  (void)obj;
-# ifdef PyWeakref_CheckProxy
-  if (PyWeakref_CheckProxy(pyobj)) {
-    pyobj = PyWeakref_GET_OBJECT(pyobj);
-    if (pyobj && SwigPyObject_Check(pyobj))
-      return (SwigPyObject*) pyobj;
-  }
-# endif
-  return NULL;
-#else
-
-  obj = 0;
-
-#if (!defined(SWIG_PYTHON_SLOW_GETSET_THIS) && (PY_VERSION_HEX >= 0x02030000))
-  if (PyInstance_Check(pyobj)) {
-    obj = _PyInstance_Lookup(pyobj, SWIG_This());      
   } else {
-    PyObject **dictptr = _PyObject_GetDictPtr(pyobj);
-    if (dictptr != NULL) {
-      PyObject *dict = *dictptr;
-      obj = dict ? PyDict_GetItem(dict, SWIG_This()) : 0;
+    PyObject *obj = 0;
+#if (!defined(SWIG_PYTHON_SLOW_GETSET_THIS) && (PY_VERSION_HEX >= 0x02030000))
+    if (PyInstance_Check(pyobj)) {
+      obj = _PyInstance_Lookup(pyobj, SWIG_This());      
     } else {
-#ifdef PyWeakref_CheckProxy
-      if (PyWeakref_CheckProxy(pyobj)) {
-	PyObject *wobj = PyWeakref_GET_OBJECT(pyobj);
-	return wobj ? SWIG_Python_GetSwigThis(wobj) : 0;
-      }
-#endif
-      obj = PyObject_GetAttr(pyobj,SWIG_This());
-      if (obj) {
-	Py_DECREF(obj);
+      PyObject **dictptr = _PyObject_GetDictPtr(pyobj);
+      if (dictptr != NULL) {
+	PyObject *dict = *dictptr;
+	obj = dict ? PyDict_GetItem(dict, SWIG_This()) : 0;
       } else {
-	if (PyErr_Occurred()) PyErr_Clear();
-	return 0;
+#ifdef PyWeakref_CheckProxy
+	if (PyWeakref_CheckProxy(pyobj)) {
+	  PyObject *wobj = PyWeakref_GET_OBJECT(pyobj);
+	  return wobj ? SWIG_Python_GetSwigThis(wobj) : 0;
+	}
+#endif
+	obj = PyObject_GetAttr(pyobj,SWIG_This());
+	if (obj) {
+	  Py_DECREF(obj);
+	} else {
+	  if (PyErr_Occurred()) PyErr_Clear();
+	  return 0;
+	}
       }
     }
-  }
 #else
-  obj = PyObject_GetAttr(pyobj,SWIG_This());
-  if (obj) {
-    Py_DECREF(obj);
-  } else {
-    if (PyErr_Occurred()) PyErr_Clear();
-    return 0;
-  }
+    obj = PyObject_GetAttr(pyobj,SWIG_This());
+    if (obj) {
+      Py_DECREF(obj);
+    } else {
+      if (PyErr_Occurred()) PyErr_Clear();
+      return 0;
+    }
 #endif
-  if (obj && !SwigPyObject_Check(obj)) {
-    /* a PyObject is called 'this', try to get the 'real this'
-       SwigPyObject from it */ 
-    return SWIG_Python_GetSwigThis(obj);
+    if (obj && !SwigPyObject_Check(obj)) {
+      /* a PyObject is called 'this', try to get the 'real this'
+	 SwigPyObject from it */ 
+      return SWIG_Python_GetSwigThis(obj);
+    }
+    return (SwigPyObject *)obj;
   }
-  return (SwigPyObject *)obj;
-#endif
 }
 
 /* Acquire a pointer value */
@@ -2307,97 +2154,91 @@ SWIG_Python_AcquirePtr(PyObject *obj, int own) {
 
 SWIGRUNTIME int
 SWIG_Python_ConvertPtrAndOwn(PyObject *obj, void **ptr, swig_type_info *ty, int flags, int *own) {
-  int res;
-  SwigPyObject *sobj;
-
-  if (!obj)
-    return SWIG_ERROR;
+  if (!obj) return SWIG_ERROR;
   if (obj == Py_None) {
-    if (ptr)
-      *ptr = 0;
+    if (ptr) *ptr = 0;
     return SWIG_OK;
-  }
-
-  res = SWIG_ERROR;
-
-  sobj = SWIG_Python_GetSwigThis(obj);
-  if (own)
-    *own = 0;
-  while (sobj) {
-    void *vptr = sobj->ptr;
-    if (ty) {
-      swig_type_info *to = sobj->ty;
-      if (to == ty) {
-        /* no type cast needed */
-        if (ptr) *ptr = vptr;
-        break;
-      } else {
-        swig_cast_info *tc = SWIG_TypeCheck(to->name,ty);
-        if (!tc) {
-          sobj = (SwigPyObject *)sobj->next;
-        } else {
-          if (ptr) {
-            int newmemory = 0;
-            *ptr = SWIG_TypeCast(tc,vptr,&newmemory);
-            if (newmemory == SWIG_CAST_NEW_MEMORY) {
-              assert(own); /* badly formed typemap which will lead to a memory leak - it must set and use own to delete *ptr */
-              if (own)
-                *own = *own | SWIG_CAST_NEW_MEMORY;
-            }
-          }
-          break;
-        }
-      }
-    } else {
-      if (ptr) *ptr = vptr;
-      break;
-    }
-  }
-  if (sobj) {
-    if (own)
-      *own = *own | sobj->own;
-    if (flags & SWIG_POINTER_DISOWN) {
-      sobj->own = 0;
-    }
-    res = SWIG_OK;
   } else {
-    if (flags & SWIG_POINTER_IMPLICIT_CONV) {
-      SwigPyClientData *data = ty ? (SwigPyClientData *) ty->clientdata : 0;
-      if (data && !data->implicitconv) {
-        PyObject *klass = data->klass;
-        if (klass) {
-          PyObject *impconv;
-          data->implicitconv = 1; /* avoid recursion and call 'explicit' constructors*/
-          impconv = SWIG_Python_CallFunctor(klass, obj);
-          data->implicitconv = 0;
-          if (PyErr_Occurred()) {
-            PyErr_Clear();
-            impconv = 0;
-          }
-          if (impconv) {
-            SwigPyObject *iobj = SWIG_Python_GetSwigThis(impconv);
-            if (iobj) {
-              void *vptr;
-              res = SWIG_Python_ConvertPtrAndOwn((PyObject*)iobj, &vptr, ty, 0, 0);
-              if (SWIG_IsOK(res)) {
-                if (ptr) {
-                  *ptr = vptr;
-                  /* transfer the ownership to 'ptr' */
-                  iobj->own = 0;
-                  res = SWIG_AddCast(res);
-                  res = SWIG_AddNewMask(res);
-                } else {
-                  res = SWIG_AddCast(res);		    
-                }
+    SwigPyObject *sobj = SWIG_Python_GetSwigThis(obj);
+    if (own)
+      *own = 0;
+    while (sobj) {
+      void *vptr = sobj->ptr;
+      if (ty) {
+	swig_type_info *to = sobj->ty;
+	if (to == ty) {
+	  /* no type cast needed */
+	  if (ptr) *ptr = vptr;
+	  break;
+	} else {
+	  swig_cast_info *tc = SWIG_TypeCheck(to->name,ty);
+	  if (!tc) {
+	    sobj = (SwigPyObject *)sobj->next;
+	  } else {
+	    if (ptr) {
+              int newmemory = 0;
+              *ptr = SWIG_TypeCast(tc,vptr,&newmemory);
+              if (newmemory == SWIG_CAST_NEW_MEMORY) {
+                assert(own);
+                if (own)
+                  *own = *own | SWIG_CAST_NEW_MEMORY;
               }
             }
-            Py_DECREF(impconv);
-          }
-        }
+	    break;
+	  }
+	}
+      } else {
+	if (ptr) *ptr = vptr;
+	break;
       }
     }
+    if (sobj) {
+      if (own)
+        *own = *own | sobj->own;
+      if (flags & SWIG_POINTER_DISOWN) {
+	sobj->own = 0;
+      }
+      return SWIG_OK;
+    } else {
+      int res = SWIG_ERROR;
+      if (flags & SWIG_POINTER_IMPLICIT_CONV) {
+	SwigPyClientData *data = ty ? (SwigPyClientData *) ty->clientdata : 0;
+	if (data && !data->implicitconv) {
+	  PyObject *klass = data->klass;
+	  if (klass) {
+	    PyObject *impconv;
+	    data->implicitconv = 1; /* avoid recursion and call 'explicit' constructors*/
+	    impconv = SWIG_Python_CallFunctor(klass, obj);
+	    data->implicitconv = 0;
+	    if (PyErr_Occurred()) {
+	      PyErr_Clear();
+	      impconv = 0;
+	    }
+	    if (impconv) {
+	      SwigPyObject *iobj = SWIG_Python_GetSwigThis(impconv);
+	      if (iobj) {
+		void *vptr;
+		res = SWIG_Python_ConvertPtrAndOwn((PyObject*)iobj, &vptr, ty, 0, 0);
+		if (SWIG_IsOK(res)) {
+		  if (ptr) {
+		    *ptr = vptr;
+		    /* transfer the ownership to 'ptr' */
+		    iobj->own = 0;
+		    res = SWIG_AddCast(res);
+		    res = SWIG_AddNewMask(res);
+		  } else {
+		    res = SWIG_AddCast(res);		    
+		  }
+		}
+	      }
+	      Py_DECREF(impconv);
+	    }
+	  }
+	}
+      }
+      return res;
+    }
   }
-  return res;
 }
 
 /* Convert a function ptr value */
@@ -2484,29 +2325,23 @@ SWIG_Python_NewShadowInstance(SwigPyClientData *data, PyObject *swig_this)
   } else {
 #if PY_VERSION_HEX >= 0x03000000
     inst = PyBaseObject_Type.tp_new((PyTypeObject*) data->newargs, Py_None, Py_None);
-    if (inst) {
-      PyObject_SetAttr(inst, SWIG_This(), swig_this);
-      Py_TYPE(inst)->tp_flags &= ~Py_TPFLAGS_VALID_VERSION_TAG;
-    }
+    PyObject_SetAttr(inst, SWIG_This(), swig_this);
+    Py_TYPE(inst)->tp_flags &= ~Py_TPFLAGS_VALID_VERSION_TAG;
 #else
     PyObject *dict = PyDict_New();
-    if (dict) {
-      PyDict_SetItem(dict, SWIG_This(), swig_this);
-      inst = PyInstance_NewRaw(data->newargs, dict);
-      Py_DECREF(dict);
-    }
+    PyDict_SetItem(dict, SWIG_This(), swig_this);
+    inst = PyInstance_NewRaw(data->newargs, dict);
+    Py_DECREF(dict);
 #endif
   }
   return inst;
 #else
 #if (PY_VERSION_HEX >= 0x02010000)
-  PyObject *inst = 0;
+  PyObject *inst;
   PyObject *dict = PyDict_New();
-  if (dict) {
-    PyDict_SetItem(dict, SWIG_This(), swig_this);
-    inst = PyInstance_NewRaw(data->newargs, dict);
-    Py_DECREF(dict);
-  }
+  PyDict_SetItem(dict, SWIG_This(), swig_this);
+  inst = PyInstance_NewRaw(data->newargs, dict);
+  Py_DECREF(dict);
   return (PyObject *) inst;
 #else
   PyInstanceObject *inst = PyObject_NEW(PyInstanceObject, &PyInstance_Type);
@@ -2557,7 +2392,7 @@ SWIG_Python_SetSwigThis(PyObject *inst, PyObject *swig_this)
 SWIGINTERN PyObject *
 SWIG_Python_InitShadowInstance(PyObject *args) {
   PyObject *obj[2];
-  if (!SWIG_Python_UnpackTuple(args, "swiginit", 2, 2, obj)) {
+  if (!SWIG_Python_UnpackTuple(args,(char*)"swiginit", 2, 2, obj)) {
     return NULL;
   } else {
     SwigPyObject *sthis = SWIG_Python_GetSwigThis(obj[0]);
@@ -2573,52 +2408,22 @@ SWIG_Python_InitShadowInstance(PyObject *args) {
 /* Create a new pointer object */
 
 SWIGRUNTIME PyObject *
-SWIG_Python_NewPointerObj(PyObject *self, void *ptr, swig_type_info *type, int flags) {
-  SwigPyClientData *clientdata;
-  PyObject * robj;
-  int own;
-
-  if (!ptr)
+SWIG_Python_NewPointerObj(void *ptr, swig_type_info *type, int flags) {
+  if (!ptr) {
     return SWIG_Py_Void();
-
-  clientdata = type ? (SwigPyClientData *)(type->clientdata) : 0;
-  own = (flags & SWIG_POINTER_OWN) ? SWIG_POINTER_OWN : 0;
-  if (clientdata && clientdata->pytype) {
-    SwigPyObject *newobj;
-    if (flags & SWIG_BUILTIN_TP_INIT) {
-      newobj = (SwigPyObject*) self;
-      if (newobj->ptr) {
-        PyObject *next_self = clientdata->pytype->tp_alloc(clientdata->pytype, 0);
-        while (newobj->next)
-	  newobj = (SwigPyObject *) newobj->next;
-        newobj->next = next_self;
-        newobj = (SwigPyObject *)next_self;
+  } else {
+    int own = (flags & SWIG_POINTER_OWN) ? SWIG_POINTER_OWN : 0;
+    PyObject *robj = SwigPyObject_New(ptr, type, own);
+    SwigPyClientData *clientdata = type ? (SwigPyClientData *)(type->clientdata) : 0;
+    if (clientdata && !(flags & SWIG_POINTER_NOSHADOW)) {
+      PyObject *inst = SWIG_Python_NewShadowInstance(clientdata, robj);
+      if (inst) {
+	Py_DECREF(robj);
+	robj = inst;
       }
-    } else {
-      newobj = PyObject_New(SwigPyObject, clientdata->pytype);
     }
-    if (newobj) {
-      newobj->ptr = ptr;
-      newobj->ty = type;
-      newobj->own = own;
-      newobj->next = 0;
-#ifdef SWIGPYTHON_BUILTIN
-      newobj->dict = 0;
-#endif
-      return (PyObject*) newobj;
-    }
-    return SWIG_Py_Void();
+    return robj;
   }
-
-  assert(!(flags & SWIG_BUILTIN_TP_INIT));
-
-  robj = SwigPyObject_New(ptr, type, own);
-  if (robj && clientdata && !(flags & SWIG_POINTER_NOSHADOW)) {
-    PyObject *inst = SWIG_Python_NewShadowInstance(clientdata, robj);
-    Py_DECREF(robj);
-    robj = inst;
-  }
-  return robj;
 }
 
 /* Create a new packed object */
@@ -2637,19 +2442,15 @@ void *SWIG_ReturnGlobalTypeList(void *);
 #endif
 
 SWIGRUNTIME swig_module_info *
-SWIG_Python_GetModule(void *SWIGUNUSEDPARM(clientdata)) {
+SWIG_Python_GetModule(void) {
   static void *type_pointer = (void *)0;
   /* first check if module already created */
   if (!type_pointer) {
 #ifdef SWIG_LINK_RUNTIME
     type_pointer = SWIG_ReturnGlobalTypeList((void *)0);
 #else
-# ifdef SWIGPY_USE_CAPSULE
-    type_pointer = PyCapsule_Import(SWIGPY_CAPSULE_NAME, 0);
-# else
     type_pointer = PyCObject_Import((char*)"swig_runtime_data" SWIG_RUNTIME_VERSION,
 				    (char*)"type_pointer" SWIG_TYPE_TABLE_NAME);
-# endif
     if (PyErr_Occurred()) {
       PyErr_Clear();
       type_pointer = (void *)0;
@@ -2692,17 +2493,9 @@ PyModule_AddObject(PyObject *m, char *name, PyObject *o)
 #endif
 
 SWIGRUNTIME void
-#ifdef SWIGPY_USE_CAPSULE
-SWIG_Python_DestroyModule(PyObject *obj)
-#else
 SWIG_Python_DestroyModule(void *vptr)
-#endif
 {
-#ifdef SWIGPY_USE_CAPSULE
-  swig_module_info *swig_module = (swig_module_info *) PyCapsule_GetPointer(obj, SWIGPY_CAPSULE_NAME);
-#else
   swig_module_info *swig_module = (swig_module_info *) vptr;
-#endif
   swig_type_info **types = swig_module->types;
   size_t i;
   for (i =0; i < swig_module->size; ++i) {
@@ -2713,33 +2506,25 @@ SWIG_Python_DestroyModule(void *vptr)
     }
   }
   Py_DECREF(SWIG_This());
-  swig_this = NULL;
 }
 
 SWIGRUNTIME void
 SWIG_Python_SetModule(swig_module_info *swig_module) {
+  static PyMethodDef swig_empty_runtime_method_table[] = { {NULL, NULL, 0, NULL} };/* Sentinel */
+
 #if PY_VERSION_HEX >= 0x03000000
  /* Add a dummy module object into sys.modules */
   PyObject *module = PyImport_AddModule((char*)"swig_runtime_data" SWIG_RUNTIME_VERSION);
 #else
-  static PyMethodDef swig_empty_runtime_method_table[] = { {NULL, NULL, 0, NULL} }; /* Sentinel */
-  PyObject *module = Py_InitModule((char*)"swig_runtime_data" SWIG_RUNTIME_VERSION, swig_empty_runtime_method_table);
+  PyObject *module = Py_InitModule((char*)"swig_runtime_data" SWIG_RUNTIME_VERSION,
+				   swig_empty_runtime_method_table);
 #endif
-#ifdef SWIGPY_USE_CAPSULE
-  PyObject *pointer = PyCapsule_New((void *) swig_module, SWIGPY_CAPSULE_NAME, SWIG_Python_DestroyModule);
-  if (pointer && module) {
-    PyModule_AddObject(module, (char*)"type_pointer_capsule" SWIG_TYPE_TABLE_NAME, pointer);
-  } else {
-    Py_XDECREF(pointer);
-  }
-#else
   PyObject *pointer = PyCObject_FromVoidPtr((void *) swig_module, SWIG_Python_DestroyModule);
   if (pointer && module) {
     PyModule_AddObject(module, (char*)"type_pointer" SWIG_TYPE_TABLE_NAME, pointer);
   } else {
     Py_XDECREF(pointer);
   }
-#endif
 }
 
 /* The python cached type query */
@@ -2757,20 +2542,12 @@ SWIG_Python_TypeQuery(const char *type)
   PyObject *obj = PyDict_GetItem(cache, key);
   swig_type_info *descriptor;
   if (obj) {
-#ifdef SWIGPY_USE_CAPSULE
-    descriptor = (swig_type_info *) PyCapsule_GetPointer(obj, NULL);
-#else
     descriptor = (swig_type_info *) PyCObject_AsVoidPtr(obj);
-#endif
   } else {
-    swig_module_info *swig_module = SWIG_GetModule(0);
+    swig_module_info *swig_module = SWIG_Python_GetModule();
     descriptor = SWIG_TypeQueryModule(swig_module, swig_module, type);
     if (descriptor) {
-#ifdef SWIGPY_USE_CAPSULE
-      obj = PyCapsule_New((void*) descriptor, NULL, NULL);
-#else
       obj = PyCObject_FromVoidPtr(descriptor, NULL);
-#endif
       PyDict_SetItem(cache, key, obj);
       Py_DECREF(obj);
     }
@@ -2831,7 +2608,7 @@ SwigPyObject_GetDesc(PyObject *self)
 {
   SwigPyObject *v = (SwigPyObject *)self;
   swig_type_info *ty = v ? v->ty : 0;
-  return ty ? ty->str : "";
+  return ty ? ty->str : (char*)"";
 }
 
 SWIGRUNTIME void
@@ -2874,7 +2651,7 @@ SWIG_Python_TypeError(const char *type, PyObject *obj)
 
 /* Convert a pointer value, signal an exception on a type mismatch */
 SWIGRUNTIME void *
-SWIG_Python_MustGetPtr(PyObject *obj, swig_type_info *ty, int SWIGUNUSEDPARM(argnum), int flags) {
+SWIG_Python_MustGetPtr(PyObject *obj, swig_type_info *ty, int argnum, int flags) {
   void *result;
   if (SWIG_Python_ConvertPtr(obj, &result, ty, flags) == -1) {
     PyErr_Clear();
@@ -2888,62 +2665,11 @@ SWIG_Python_MustGetPtr(PyObject *obj, swig_type_info *ty, int SWIGUNUSEDPARM(arg
   return result;
 }
 
-#ifdef SWIGPYTHON_BUILTIN
-SWIGRUNTIME int
-SWIG_Python_NonDynamicSetAttr(PyObject *obj, PyObject *name, PyObject *value) {
-  PyTypeObject *tp = obj->ob_type;
-  PyObject *descr;
-  PyObject *encoded_name;
-  descrsetfunc f;
-  int res;
-
-# ifdef Py_USING_UNICODE
-  if (PyString_Check(name)) {
-    name = PyUnicode_Decode(PyString_AsString(name), PyString_Size(name), NULL, NULL);
-    if (!name)
-      return -1;
-  } else if (!PyUnicode_Check(name))
-# else
-  if (!PyString_Check(name))
-# endif
-  {
-    PyErr_Format(PyExc_TypeError, "attribute name must be string, not '%.200s'", name->ob_type->tp_name);
-    return -1;
-  } else {
-    Py_INCREF(name);
-  }
-
-  if (!tp->tp_dict) {
-    if (PyType_Ready(tp) < 0)
-      goto done;
-  }
-
-  res = -1;
-  descr = _PyType_Lookup(tp, name);
-  f = NULL;
-  if (descr != NULL)
-    f = descr->ob_type->tp_descr_set;
-  if (!f) {
-    if (PyString_Check(name)) {
-      encoded_name = name;
-      Py_INCREF(name);
-    } else {
-      encoded_name = PyUnicode_AsUTF8String(name);
-    }
-    PyErr_Format(PyExc_AttributeError, "'%.100s' object has no attribute '%.200s'", tp->tp_name, PyString_AsString(encoded_name));
-    Py_DECREF(encoded_name);
-  } else {
-    res = f(descr, obj, value);
-  }
-  
-  done:
-  Py_DECREF(name);
-  return res;
-}
-#endif
-
 
 #ifdef __cplusplus
+#if 0
+{ /* cc-mode */
+#endif
 }
 #endif
 
@@ -2955,6 +2681,9 @@ SWIG_Python_NonDynamicSetAttr(PyObject *obj, PyObject *name, PyObject *value) {
 
 
 /* -----------------------------------------------------------------------------
+ * See the LICENSE file for information on copyright, usage and redistribution
+ * of SWIG, and the README file for authors - http://www.swig.org/release.html.
+ *
  * director.swg
  *
  * This file contains support for director classes that proxy
@@ -3041,13 +2770,13 @@ namespace Swig {
 }
 # endif /* SWIG_DIRECTOR_RTDIR */
 
-# define SWIG_DIRECTOR_CAST(ARG) Swig::get_rtdir(static_cast<void*>(ARG))
-# define SWIG_DIRECTOR_RGTR(ARG1, ARG2) Swig::set_rtdir(static_cast<void*>(ARG1), ARG2)
+# define SWIG_DIRECTOR_CAST(Arg) Swig::get_rtdir(static_cast<void*>(Arg))
+# define SWIG_DIRECTOR_RGTR(Arg1, Arg2) Swig::set_rtdir(static_cast<void*>(Arg1), Arg2)
 
 #else
 
-# define SWIG_DIRECTOR_CAST(ARG) dynamic_cast<Swig::Director *>(ARG)
-# define SWIG_DIRECTOR_RGTR(ARG1, ARG2)
+# define SWIG_DIRECTOR_CAST(Arg) dynamic_cast<Swig::Director*>(Arg)
+# define SWIG_DIRECTOR_RGTR(Arg1, Arg2)
 
 #endif /* SWIG_DIRECTOR_NORTTI */
 
@@ -3190,7 +2919,7 @@ namespace Swig {
       try {
         throw;
       } catch (DirectorException& e) {
-        std::cerr << "SWIG Director exception caught:" << std::endl
+        std::cerr << "Swig Director exception caught:" << std::endl
                   << e.getMessage() << std::endl;
       } catch (std::exception& e) {
         std::cerr << "std::exception caught: "<< e.what() << std::endl;
@@ -3206,7 +2935,7 @@ namespace Swig {
       std::cerr << "This exception was caught by the SWIG unexpected exception handler." << std::endl
                 << "Try using %feature(\"director:except\") to avoid reaching this point." << std::endl
                 << std::endl
-                << "Exception is being re-thrown, program will likely abort/terminate." << std::endl;
+                << "Exception is being re-thrown, program will like abort/terminate." << std::endl;
       throw;
     }
 
@@ -3229,12 +2958,12 @@ namespace Swig {
   class DirectorTypeMismatchException : public Swig::DirectorException {
   public:
     DirectorTypeMismatchException(PyObject *error, const char* msg="") 
-      : Swig::DirectorException(error, "SWIG director type mismatch", msg)
+      : Swig::DirectorException(error, "Swig director type mismatch", msg)
     {
     }
 
     DirectorTypeMismatchException(const char* msg="") 
-      : Swig::DirectorException(PyExc_TypeError, "SWIG director type mismatch", msg)
+      : Swig::DirectorException(PyExc_TypeError, "Swig director type mismatch", msg)
     {
     }
 
@@ -3253,7 +2982,7 @@ namespace Swig {
   class DirectorMethodException : public Swig::DirectorException {
   public:
     DirectorMethodException(const char* msg = "") 
-      : DirectorException(PyExc_RuntimeError, "SWIG director method error.", msg)
+      : DirectorException(PyExc_RuntimeError, "Swig director method error.", msg)
     {
     }    
 
@@ -3268,7 +2997,7 @@ namespace Swig {
   {
   public:
     DirectorPureVirtualException(const char* msg = "") 
-      : DirectorException(PyExc_RuntimeError, "SWIG director pure virtual method called", msg)
+      : DirectorException(PyExc_RuntimeError, "Swig director pure virtual method called", msg)
     { 
     }
 
@@ -3360,17 +3089,17 @@ namespace Swig {
     }
 
     /* methods to implement pseudo protected director members */
-    virtual bool swig_get_inner(const char* /* swig_protected_method_name */) const {
+    virtual bool swig_get_inner(const char* /* name */) const {
       return true;
     }
     
-    virtual void swig_set_inner(const char* /* swig_protected_method_name */, bool /* swig_val */) const {
+    virtual void swig_set_inner(const char* /* name */, bool /* val */) const {
     }
 
   /* ownership management */
   private:
-    typedef std::map<void*, GCItem_var> swig_ownership_map;
-    mutable swig_ownership_map swig_owner;
+    typedef std::map<void*, GCItem_var> ownership_map;
+    mutable ownership_map owner;
 #ifdef __THREAD__
     static PyThread_type_lock swig_mutex_own;
 #endif
@@ -3381,7 +3110,7 @@ namespace Swig {
     {
       if (vptr) {
         SWIG_GUARD(swig_mutex_own);
-        swig_owner[vptr] = new GCArray_T<Type>(vptr);
+        owner[vptr] = new GCArray_T<Type>(vptr);
       }
     }
     
@@ -3390,7 +3119,7 @@ namespace Swig {
     {
       if (vptr) {
         SWIG_GUARD(swig_mutex_own);
-        swig_owner[vptr] = new GCItem_T<Type>(vptr);
+        owner[vptr] = new GCItem_T<Type>(vptr);
       }
     }
 
@@ -3398,7 +3127,7 @@ namespace Swig {
     {
       if (vptr && own) {
         SWIG_GUARD(swig_mutex_own);
-        swig_owner[vptr] = new GCItem_Object(own);
+        owner[vptr] = new GCItem_Object(own);
       }
     }
     
@@ -3407,26 +3136,14 @@ namespace Swig {
       int own = 0;
       if (vptr) {
         SWIG_GUARD(swig_mutex_own);
-        swig_ownership_map::iterator iter = swig_owner.find(vptr);
-        if (iter != swig_owner.end()) {
+        ownership_map::iterator iter = owner.find(vptr);
+        if (iter != owner.end()) {
           own = iter->second->get_own();
-          swig_owner.erase(iter);
+          owner.erase(iter);
         }
       }
       return own;
     }
-
-    template <typename Type>
-    static PyObject* swig_pyobj_disown(PyObject *pyobj, PyObject *SWIGUNUSEDPARM(args))
-    {
-      SwigPyObject *sobj = (SwigPyObject *)pyobj;
-      sobj->own = 0;
-      Director *d = SWIG_DIRECTOR_CAST(reinterpret_cast<Type *>(sobj->ptr));
-      if (d)
-        d->swig_disown();
-      return PyWeakref_NewProxy(pyobj, NULL);
-    }
-
   };
 
 #ifdef __THREAD__
@@ -3563,7 +3280,7 @@ static swig_module_info swig_module = {swig_types, 97, 0, 0, 0, 0};
 #endif
 #define SWIG_name    "_tinyWRAP"
 
-#define SWIGVERSION 0x020009 
+#define SWIGVERSION 0x010340 
 #define SWIG_VERSION SWIGVERSION
 
 
@@ -3743,7 +3460,7 @@ SWIG_FromCharPtrAndSize(const char* carray, size_t size)
     if (size > INT_MAX) {
       swig_type_info* pchar_descriptor = SWIG_pchar_descriptor();
       return pchar_descriptor ? 
-	SWIG_InternalNewPointerObj(const_cast< char * >(carray), pchar_descriptor, 0) : SWIG_Py_Void();
+	SWIG_NewPointerObj(const_cast< char * >(carray), pchar_descriptor, 0) : SWIG_Py_Void();
     } else {
 #if PY_VERSION_HEX >= 0x03000000
       return PyUnicode_FromStringAndSize(carray, static_cast< int >(size));
@@ -3909,17 +3626,19 @@ SWIG_AsVal_int (PyObject * obj, int *val)
 }
 
 
-SWIGINTERNINLINE PyObject*
-  SWIG_From_int  (int value)
-{
-  return PyInt_FromLong((long) value);
+  #define SWIG_From_long   PyInt_FromLong 
+
+
+SWIGINTERNINLINE PyObject *
+SWIG_From_int  (int value)
+{    
+  return SWIG_From_long  (value);
 }
 
 
 SWIGINTERN int
 SWIG_AsVal_unsigned_SS_long (PyObject *obj, unsigned long *val) 
 {
-#if PY_VERSION_HEX < 0x03000000
   if (PyInt_Check(obj)) {
     long v = PyInt_AsLong(obj);
     if (v >= 0) {
@@ -3928,9 +3647,7 @@ SWIG_AsVal_unsigned_SS_long (PyObject *obj, unsigned long *val)
     } else {
       return SWIG_OverflowError;
     }
-  } else
-#endif
-  if (PyLong_Check(obj)) {
+  } else if (PyLong_Check(obj)) {
     unsigned long v = PyLong_AsUnsignedLong(obj);
     if (!PyErr_Occurred()) {
       if (val) *val = v;
@@ -3986,10 +3703,18 @@ SWIGINTERNINLINE PyObject*
 }
 
 
-SWIGINTERNINLINE PyObject*
-  SWIG_From_unsigned_SS_int  (unsigned int value)
+SWIGINTERNINLINE PyObject* 
+SWIG_From_unsigned_SS_long  (unsigned long value)
 {
-  return PyInt_FromSize_t((size_t) value);
+  return (value > LONG_MAX) ?
+    PyLong_FromUnsignedLong(value) : PyInt_FromLong(static_cast< long >(value)); 
+}
+
+
+SWIGINTERNINLINE PyObject *
+SWIG_From_unsigned_SS_int  (unsigned int value)
+{    
+  return SWIG_From_unsigned_SS_long  (value);
 }
 
 
@@ -4063,14 +3788,11 @@ SWIG_AsVal_long_SS_long (PyObject *obj, long long *val)
 }
 
 
-  #define SWIG_From_long   PyLong_FromLong 
-
-
 SWIGINTERNINLINE PyObject* 
 SWIG_From_long_SS_long  (long long value)
 {
   return ((value < LONG_MIN) || (value > LONG_MAX)) ?
-    PyLong_FromLongLong(value) : PyLong_FromLong(static_cast< long >(value)); 
+    PyLong_FromLongLong(value) : PyInt_FromLong(static_cast< long >(value)); 
 }
 
 
@@ -4078,7 +3800,7 @@ SWIGINTERNINLINE PyObject*
 SWIG_From_unsigned_SS_long_SS_long  (unsigned long long value)
 {
   return (value > LONG_MAX) ?
-    PyLong_FromUnsignedLongLong(value) : PyLong_FromLong(static_cast< long >(value)); 
+    PyLong_FromUnsignedLongLong(value) : PyInt_FromLong(static_cast< long >(value)); 
 }
 
 
@@ -4135,14 +3857,6 @@ SWIG_AsVal_unsigned_SS_short (PyObject * obj, unsigned short *val)
 }
 
 
-SWIGINTERNINLINE PyObject* 
-SWIG_From_unsigned_SS_long  (unsigned long value)
-{
-  return (value > LONG_MAX) ?
-    PyLong_FromUnsignedLong(value) : PyLong_FromLong(static_cast< long >(value)); 
-}
-
-
 SWIGINTERNINLINE PyObject *
 SWIG_From_unsigned_SS_short  (unsigned short value)
 {    
@@ -4277,9 +3991,9 @@ int SwigDirector_DDebugCallback::OnDebugInfo(char const *message) {
 #else
   swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *)"OnDebugInfo", (char *)"(O)" ,(PyObject *)obj0);
 #endif
-  if (!result) {
+  if (result == NULL) {
     PyObject *error = PyErr_Occurred();
-    if (error) {
+    if (error != NULL) {
       Swig::DirectorMethodException::raise("Error detected when calling 'DDebugCallback.OnDebugInfo'");
     }
   }
@@ -4308,9 +4022,9 @@ int SwigDirector_DDebugCallback::OnDebugWarn(char const *message) {
 #else
   swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *)"OnDebugWarn", (char *)"(O)" ,(PyObject *)obj0);
 #endif
-  if (!result) {
+  if (result == NULL) {
     PyObject *error = PyErr_Occurred();
-    if (error) {
+    if (error != NULL) {
       Swig::DirectorMethodException::raise("Error detected when calling 'DDebugCallback.OnDebugWarn'");
     }
   }
@@ -4339,9 +4053,9 @@ int SwigDirector_DDebugCallback::OnDebugError(char const *message) {
 #else
   swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *)"OnDebugError", (char *)"(O)" ,(PyObject *)obj0);
 #endif
-  if (!result) {
+  if (result == NULL) {
     PyObject *error = PyErr_Occurred();
-    if (error) {
+    if (error != NULL) {
       Swig::DirectorMethodException::raise("Error detected when calling 'DDebugCallback.OnDebugError'");
     }
   }
@@ -4370,9 +4084,9 @@ int SwigDirector_DDebugCallback::OnDebugFatal(char const *message) {
 #else
   swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *)"OnDebugFatal", (char *)"(O)" ,(PyObject *)obj0);
 #endif
-  if (!result) {
+  if (result == NULL) {
     PyObject *error = PyErr_Occurred();
-    if (error) {
+    if (error != NULL) {
       Swig::DirectorMethodException::raise("Error detected when calling 'DDebugCallback.OnDebugFatal'");
     }
   }
@@ -4411,9 +4125,9 @@ int SwigDirector_T140Callback::ondata(T140CallbackData const *pData) {
 #else
   swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *)"ondata", (char *)"(O)" ,(PyObject *)obj0);
 #endif
-  if (!result) {
+  if (result == NULL) {
     PyObject *error = PyErr_Occurred();
-    if (error) {
+    if (error != NULL) {
       Swig::DirectorMethodException::raise("Error detected when calling 'T140Callback.ondata'");
     }
   }
@@ -4454,9 +4168,9 @@ int SwigDirector_ProxyPluginMgrCallback::OnPluginCreated(uint64_t id, enum twrap
 #else
   swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *)"OnPluginCreated", (char *)"(OO)" ,(PyObject *)obj0,(PyObject *)obj1);
 #endif
-  if (!result) {
+  if (result == NULL) {
     PyObject *error = PyErr_Occurred();
-    if (error) {
+    if (error != NULL) {
       Swig::DirectorMethodException::raise("Error detected when calling 'ProxyPluginMgrCallback.OnPluginCreated'");
     }
   }
@@ -4487,9 +4201,9 @@ int SwigDirector_ProxyPluginMgrCallback::OnPluginDestroyed(uint64_t id, enum twr
 #else
   swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *)"OnPluginDestroyed", (char *)"(OO)" ,(PyObject *)obj0,(PyObject *)obj1);
 #endif
-  if (!result) {
+  if (result == NULL) {
     PyObject *error = PyErr_Occurred();
-    if (error) {
+    if (error != NULL) {
       Swig::DirectorMethodException::raise("Error detected when calling 'ProxyPluginMgrCallback.OnPluginDestroyed'");
     }
   }
@@ -4532,9 +4246,9 @@ int SwigDirector_ProxyAudioConsumerCallback::prepare(int ptime, int rate, int ch
 #else
   swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *)"prepare", (char *)"(OOO)" ,(PyObject *)obj0,(PyObject *)obj1,(PyObject *)obj2);
 #endif
-  if (!result) {
+  if (result == NULL) {
     PyObject *error = PyErr_Occurred();
-    if (error) {
+    if (error != NULL) {
       Swig::DirectorMethodException::raise("Error detected when calling 'ProxyAudioConsumerCallback.prepare'");
     }
   }
@@ -4561,9 +4275,9 @@ int SwigDirector_ProxyAudioConsumerCallback::start() {
 #else
   swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *) "start", NULL);
 #endif
-  if (!result) {
+  if (result == NULL) {
     PyObject *error = PyErr_Occurred();
-    if (error) {
+    if (error != NULL) {
       Swig::DirectorMethodException::raise("Error detected when calling 'ProxyAudioConsumerCallback.start'");
     }
   }
@@ -4590,9 +4304,9 @@ int SwigDirector_ProxyAudioConsumerCallback::pause() {
 #else
   swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *) "pause", NULL);
 #endif
-  if (!result) {
+  if (result == NULL) {
     PyObject *error = PyErr_Occurred();
-    if (error) {
+    if (error != NULL) {
       Swig::DirectorMethodException::raise("Error detected when calling 'ProxyAudioConsumerCallback.pause'");
     }
   }
@@ -4619,9 +4333,9 @@ int SwigDirector_ProxyAudioConsumerCallback::stop() {
 #else
   swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *) "stop", NULL);
 #endif
-  if (!result) {
+  if (result == NULL) {
     PyObject *error = PyErr_Occurred();
-    if (error) {
+    if (error != NULL) {
       Swig::DirectorMethodException::raise("Error detected when calling 'ProxyAudioConsumerCallback.stop'");
     }
   }
@@ -4664,9 +4378,9 @@ int SwigDirector_ProxyVideoConsumerCallback::prepare(int nWidth, int nHeight, in
 #else
   swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *)"prepare", (char *)"(OOO)" ,(PyObject *)obj0,(PyObject *)obj1,(PyObject *)obj2);
 #endif
-  if (!result) {
+  if (result == NULL) {
     PyObject *error = PyErr_Occurred();
-    if (error) {
+    if (error != NULL) {
       Swig::DirectorMethodException::raise("Error detected when calling 'ProxyVideoConsumerCallback.prepare'");
     }
   }
@@ -4695,9 +4409,9 @@ int SwigDirector_ProxyVideoConsumerCallback::consume(ProxyVideoFrame const *fram
 #else
   swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *)"consume", (char *)"(O)" ,(PyObject *)obj0);
 #endif
-  if (!result) {
+  if (result == NULL) {
     PyObject *error = PyErr_Occurred();
-    if (error) {
+    if (error != NULL) {
       Swig::DirectorMethodException::raise("Error detected when calling 'ProxyVideoConsumerCallback.consume'");
     }
   }
@@ -4728,9 +4442,9 @@ int SwigDirector_ProxyVideoConsumerCallback::bufferCopied(unsigned int nCopiedSi
 #else
   swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *)"bufferCopied", (char *)"(OO)" ,(PyObject *)obj0,(PyObject *)obj1);
 #endif
-  if (!result) {
+  if (result == NULL) {
     PyObject *error = PyErr_Occurred();
-    if (error) {
+    if (error != NULL) {
       Swig::DirectorMethodException::raise("Error detected when calling 'ProxyVideoConsumerCallback.bufferCopied'");
     }
   }
@@ -4757,9 +4471,9 @@ int SwigDirector_ProxyVideoConsumerCallback::start() {
 #else
   swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *) "start", NULL);
 #endif
-  if (!result) {
+  if (result == NULL) {
     PyObject *error = PyErr_Occurred();
-    if (error) {
+    if (error != NULL) {
       Swig::DirectorMethodException::raise("Error detected when calling 'ProxyVideoConsumerCallback.start'");
     }
   }
@@ -4786,9 +4500,9 @@ int SwigDirector_ProxyVideoConsumerCallback::pause() {
 #else
   swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *) "pause", NULL);
 #endif
-  if (!result) {
+  if (result == NULL) {
     PyObject *error = PyErr_Occurred();
-    if (error) {
+    if (error != NULL) {
       Swig::DirectorMethodException::raise("Error detected when calling 'ProxyVideoConsumerCallback.pause'");
     }
   }
@@ -4815,9 +4529,9 @@ int SwigDirector_ProxyVideoConsumerCallback::stop() {
 #else
   swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *) "stop", NULL);
 #endif
-  if (!result) {
+  if (result == NULL) {
     PyObject *error = PyErr_Occurred();
-    if (error) {
+    if (error != NULL) {
       Swig::DirectorMethodException::raise("Error detected when calling 'ProxyVideoConsumerCallback.stop'");
     }
   }
@@ -4860,9 +4574,9 @@ int SwigDirector_ProxyAudioProducerCallback::prepare(int ptime, int rate, int ch
 #else
   swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *)"prepare", (char *)"(OOO)" ,(PyObject *)obj0,(PyObject *)obj1,(PyObject *)obj2);
 #endif
-  if (!result) {
+  if (result == NULL) {
     PyObject *error = PyErr_Occurred();
-    if (error) {
+    if (error != NULL) {
       Swig::DirectorMethodException::raise("Error detected when calling 'ProxyAudioProducerCallback.prepare'");
     }
   }
@@ -4889,9 +4603,9 @@ int SwigDirector_ProxyAudioProducerCallback::start() {
 #else
   swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *) "start", NULL);
 #endif
-  if (!result) {
+  if (result == NULL) {
     PyObject *error = PyErr_Occurred();
-    if (error) {
+    if (error != NULL) {
       Swig::DirectorMethodException::raise("Error detected when calling 'ProxyAudioProducerCallback.start'");
     }
   }
@@ -4918,9 +4632,9 @@ int SwigDirector_ProxyAudioProducerCallback::pause() {
 #else
   swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *) "pause", NULL);
 #endif
-  if (!result) {
+  if (result == NULL) {
     PyObject *error = PyErr_Occurred();
-    if (error) {
+    if (error != NULL) {
       Swig::DirectorMethodException::raise("Error detected when calling 'ProxyAudioProducerCallback.pause'");
     }
   }
@@ -4947,9 +4661,9 @@ int SwigDirector_ProxyAudioProducerCallback::stop() {
 #else
   swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *) "stop", NULL);
 #endif
-  if (!result) {
+  if (result == NULL) {
     PyObject *error = PyErr_Occurred();
-    if (error) {
+    if (error != NULL) {
       Swig::DirectorMethodException::raise("Error detected when calling 'ProxyAudioProducerCallback.stop'");
     }
   }
@@ -4976,9 +4690,9 @@ int SwigDirector_ProxyAudioProducerCallback::fillPushBuffer() {
 #else
   swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *) "fillPushBuffer", NULL);
 #endif
-  if (!result) {
+  if (result == NULL) {
     PyObject *error = PyErr_Occurred();
-    if (error) {
+    if (error != NULL) {
       Swig::DirectorMethodException::raise("Error detected when calling 'ProxyAudioProducerCallback.fillPushBuffer'");
     }
   }
@@ -5021,9 +4735,9 @@ int SwigDirector_ProxyVideoProducerCallback::prepare(int width, int height, int
 #else
   swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *)"prepare", (char *)"(OOO)" ,(PyObject *)obj0,(PyObject *)obj1,(PyObject *)obj2);
 #endif
-  if (!result) {
+  if (result == NULL) {
     PyObject *error = PyErr_Occurred();
-    if (error) {
+    if (error != NULL) {
       Swig::DirectorMethodException::raise("Error detected when calling 'ProxyVideoProducerCallback.prepare'");
     }
   }
@@ -5050,9 +4764,9 @@ int SwigDirector_ProxyVideoProducerCallback::start() {
 #else
   swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *) "start", NULL);
 #endif
-  if (!result) {
+  if (result == NULL) {
     PyObject *error = PyErr_Occurred();
-    if (error) {
+    if (error != NULL) {
       Swig::DirectorMethodException::raise("Error detected when calling 'ProxyVideoProducerCallback.start'");
     }
   }
@@ -5079,9 +4793,9 @@ int SwigDirector_ProxyVideoProducerCallback::pause() {
 #else
   swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *) "pause", NULL);
 #endif
-  if (!result) {
+  if (result == NULL) {
     PyObject *error = PyErr_Occurred();
-    if (error) {
+    if (error != NULL) {
       Swig::DirectorMethodException::raise("Error detected when calling 'ProxyVideoProducerCallback.pause'");
     }
   }
@@ -5108,9 +4822,9 @@ int SwigDirector_ProxyVideoProducerCallback::stop() {
 #else
   swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *) "stop", NULL);
 #endif
-  if (!result) {
+  if (result == NULL) {
     PyObject *error = PyErr_Occurred();
-    if (error) {
+    if (error != NULL) {
       Swig::DirectorMethodException::raise("Error detected when calling 'ProxyVideoProducerCallback.stop'");
     }
   }
@@ -5149,9 +4863,9 @@ int SwigDirector_SipCallback::OnDialogEvent(DialogEvent const *e) {
 #else
   swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *)"OnDialogEvent", (char *)"(O)" ,(PyObject *)obj0);
 #endif
-  if (!result) {
+  if (result == NULL) {
     PyObject *error = PyErr_Occurred();
-    if (error) {
+    if (error != NULL) {
       Swig::DirectorMethodException::raise("Error detected when calling 'SipCallback.OnDialogEvent'");
     }
   }
@@ -5180,9 +4894,9 @@ int SwigDirector_SipCallback::OnStackEvent(StackEvent const *e) {
 #else
   swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *)"OnStackEvent", (char *)"(O)" ,(PyObject *)obj0);
 #endif
-  if (!result) {
+  if (result == NULL) {
     PyObject *error = PyErr_Occurred();
-    if (error) {
+    if (error != NULL) {
       Swig::DirectorMethodException::raise("Error detected when calling 'SipCallback.OnStackEvent'");
     }
   }
@@ -5211,9 +4925,9 @@ int SwigDirector_SipCallback::OnInviteEvent(InviteEvent const *e) {
 #else
   swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *)"OnInviteEvent", (char *)"(O)" ,(PyObject *)obj0);
 #endif
-  if (!result) {
+  if (result == NULL) {
     PyObject *error = PyErr_Occurred();
-    if (error) {
+    if (error != NULL) {
       Swig::DirectorMethodException::raise("Error detected when calling 'SipCallback.OnInviteEvent'");
     }
   }
@@ -5242,9 +4956,9 @@ int SwigDirector_SipCallback::OnMessagingEvent(MessagingEvent const *e) {
 #else
   swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *)"OnMessagingEvent", (char *)"(O)" ,(PyObject *)obj0);
 #endif
-  if (!result) {
+  if (result == NULL) {
     PyObject *error = PyErr_Occurred();
-    if (error) {
+    if (error != NULL) {
       Swig::DirectorMethodException::raise("Error detected when calling 'SipCallback.OnMessagingEvent'");
     }
   }
@@ -5273,9 +4987,9 @@ int SwigDirector_SipCallback::OnInfoEvent(InfoEvent const *e) {
 #else
   swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *)"OnInfoEvent", (char *)"(O)" ,(PyObject *)obj0);
 #endif
-  if (!result) {
+  if (result == NULL) {
     PyObject *error = PyErr_Occurred();
-    if (error) {
+    if (error != NULL) {
       Swig::DirectorMethodException::raise("Error detected when calling 'SipCallback.OnInfoEvent'");
     }
   }
@@ -5304,9 +5018,9 @@ int SwigDirector_SipCallback::OnOptionsEvent(OptionsEvent const *e) {
 #else
   swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *)"OnOptionsEvent", (char *)"(O)" ,(PyObject *)obj0);
 #endif
-  if (!result) {
+  if (result == NULL) {
     PyObject *error = PyErr_Occurred();
-    if (error) {
+    if (error != NULL) {
       Swig::DirectorMethodException::raise("Error detected when calling 'SipCallback.OnOptionsEvent'");
     }
   }
@@ -5335,9 +5049,9 @@ int SwigDirector_SipCallback::OnPublicationEvent(PublicationEvent const *e) {
 #else
   swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *)"OnPublicationEvent", (char *)"(O)" ,(PyObject *)obj0);
 #endif
-  if (!result) {
+  if (result == NULL) {
     PyObject *error = PyErr_Occurred();
-    if (error) {
+    if (error != NULL) {
       Swig::DirectorMethodException::raise("Error detected when calling 'SipCallback.OnPublicationEvent'");
     }
   }
@@ -5366,9 +5080,9 @@ int SwigDirector_SipCallback::OnRegistrationEvent(RegistrationEvent const *e) {
 #else
   swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *)"OnRegistrationEvent", (char *)"(O)" ,(PyObject *)obj0);
 #endif
-  if (!result) {
+  if (result == NULL) {
     PyObject *error = PyErr_Occurred();
-    if (error) {
+    if (error != NULL) {
       Swig::DirectorMethodException::raise("Error detected when calling 'SipCallback.OnRegistrationEvent'");
     }
   }
@@ -5397,9 +5111,9 @@ int SwigDirector_SipCallback::OnSubscriptionEvent(SubscriptionEvent const *e) {
 #else
   swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *)"OnSubscriptionEvent", (char *)"(O)" ,(PyObject *)obj0);
 #endif
-  if (!result) {
+  if (result == NULL) {
     PyObject *error = PyErr_Occurred();
-    if (error) {
+    if (error != NULL) {
       Swig::DirectorMethodException::raise("Error detected when calling 'SipCallback.OnSubscriptionEvent'");
     }
   }
@@ -5438,9 +5152,9 @@ int SwigDirector_XcapCallback::onEvent(XcapEvent const *e) const {
 #else
   swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *)"onEvent", (char *)"(O)" ,(PyObject *)obj0);
 #endif
-  if (!result) {
+  if (result == NULL) {
     PyObject *error = PyErr_Occurred();
-    if (error) {
+    if (error != NULL) {
       Swig::DirectorMethodException::raise("Error detected when calling 'XcapCallback.onEvent'");
     }
   }
@@ -5479,9 +5193,9 @@ int SwigDirector_MsrpCallback::OnEvent(MsrpEvent const *e) {
 #else
   swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *)"OnEvent", (char *)"(O)" ,(PyObject *)obj0);
 #endif
-  if (!result) {
+  if (result == NULL) {
     PyObject *error = PyErr_Occurred();
-    if (error) {
+    if (error != NULL) {
       Swig::DirectorMethodException::raise("Error detected when calling 'MsrpCallback.OnEvent'");
     }
   }
@@ -5739,7 +5453,7 @@ SWIGINTERN PyObject *_wrap_disown_DDebugCallback(PyObject *SWIGUNUSEDPARM(self),
   }
   arg1 = reinterpret_cast< DDebugCallback * >(argp1);
   {
-    Swig::Director *director = SWIG_DIRECTOR_CAST(arg1);
+    Swig::Director *director = dynamic_cast<Swig::Director *>(arg1);
     if (director) director->swig_disown();
   }
   
@@ -8510,8 +8224,8 @@ SWIGINTERN PyObject *_wrap_MediaContent_parse(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? (int)PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 3) && (ii < argc); ii++) {
+  argc = (int)PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 2) {
@@ -8550,11 +8264,11 @@ SWIGINTERN PyObject *_wrap_MediaContent_parse(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'MediaContent_parse'.\n"
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'MediaContent_parse'.\n"
     "  Possible C/C++ prototypes are:\n"
-    "    MediaContent::parse(void const *,unsigned int,char const *)\n"
+    "    parse(void const *,unsigned int,char const *)\n"
     "    MediaContent::parse(void const *,unsigned int)\n");
-  return 0;
+  return NULL;
 }
 
 
@@ -8815,8 +8529,8 @@ SWIGINTERN PyObject *_wrap_new_SipUri(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? (int)PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
+  argc = (int)PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 1) {
@@ -8841,11 +8555,11 @@ SWIGINTERN PyObject *_wrap_new_SipUri(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'new_SipUri'.\n"
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_SipUri'.\n"
     "  Possible C/C++ prototypes are:\n"
-    "    SipUri::SipUri(char const *,char const *)\n"
-    "    SipUri::SipUri(char const *)\n");
-  return 0;
+    "    SipUri(char const *,char const *)\n"
+    "    SipUri(char const *)\n");
+  return NULL;
 }
 
 
@@ -8923,8 +8637,8 @@ SWIGINTERN PyObject *_wrap_SipUri_isValid(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? (int)PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 1) && (ii < argc); ii++) {
+  argc = (int)PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 1) {
@@ -8946,11 +8660,11 @@ SWIGINTERN PyObject *_wrap_SipUri_isValid(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'SipUri_isValid'.\n"
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'SipUri_isValid'.\n"
     "  Possible C/C++ prototypes are:\n"
-    "    SipUri::isValid(char const *)\n"
-    "    SipUri::isValid()\n");
-  return 0;
+    "    isValid(char const *)\n"
+    "    isValid(SipUri *)\n");
+  return NULL;
 }
 
 
@@ -9297,8 +9011,8 @@ SWIGINTERN PyObject *_wrap_SdpMessage_getSdpHeaderValue(PyObject *self, PyObject
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? (int)PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 4) && (ii < argc); ii++) {
+  argc = (int)PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 4); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 3) {
@@ -9347,11 +9061,11 @@ SWIGINTERN PyObject *_wrap_SdpMessage_getSdpHeaderValue(PyObject *self, PyObject
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'SdpMessage_getSdpHeaderValue'.\n"
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'SdpMessage_getSdpHeaderValue'.\n"
     "  Possible C/C++ prototypes are:\n"
-    "    SdpMessage::getSdpHeaderValue(char const *,char,unsigned int)\n"
-    "    SdpMessage::getSdpHeaderValue(char const *,char)\n");
-  return 0;
+    "    getSdpHeaderValue(SdpMessage *,char const *,char,unsigned int)\n"
+    "    getSdpHeaderValue(SdpMessage *,char const *,char)\n");
+  return NULL;
 }
 
 
@@ -9616,8 +9330,8 @@ SWIGINTERN PyObject *_wrap_SipMessage_getSipHeaderValue(PyObject *self, PyObject
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? (int)PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 3) && (ii < argc); ii++) {
+  argc = (int)PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 2) {
@@ -9654,11 +9368,11 @@ SWIGINTERN PyObject *_wrap_SipMessage_getSipHeaderValue(PyObject *self, PyObject
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'SipMessage_getSipHeaderValue'.\n"
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'SipMessage_getSipHeaderValue'.\n"
     "  Possible C/C++ prototypes are:\n"
-    "    SipMessage::getSipHeaderValue(char const *,unsigned int)\n"
-    "    SipMessage::getSipHeaderValue(char const *)\n");
-  return 0;
+    "    getSipHeaderValue(SipMessage *,char const *,unsigned int)\n"
+    "    getSipHeaderValue(SipMessage *,char const *)\n");
+  return NULL;
 }
 
 
@@ -9771,8 +9485,8 @@ SWIGINTERN PyObject *_wrap_SipMessage_getSipHeaderParamValue(PyObject *self, PyO
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? (int)PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 4) && (ii < argc); ii++) {
+  argc = (int)PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 4); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 3) {
@@ -9817,11 +9531,11 @@ SWIGINTERN PyObject *_wrap_SipMessage_getSipHeaderParamValue(PyObject *self, PyO
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'SipMessage_getSipHeaderParamValue'.\n"
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'SipMessage_getSipHeaderParamValue'.\n"
     "  Possible C/C++ prototypes are:\n"
-    "    SipMessage::getSipHeaderParamValue(char const *,char const *,unsigned int)\n"
-    "    SipMessage::getSipHeaderParamValue(char const *,char const *)\n");
-  return 0;
+    "    getSipHeaderParamValue(SipMessage *,char const *,char const *,unsigned int)\n"
+    "    getSipHeaderParamValue(SipMessage *,char const *,char const *)\n");
+  return NULL;
 }
 
 
@@ -10998,7 +10712,7 @@ SWIGINTERN PyObject *_wrap_disown_T140Callback(PyObject *SWIGUNUSEDPARM(self), P
   }
   arg1 = reinterpret_cast< T140Callback * >(argp1);
   {
-    Swig::Director *director = SWIG_DIRECTOR_CAST(arg1);
+    Swig::Director *director = dynamic_cast<Swig::Director *>(arg1);
     if (director) director->swig_disown();
   }
   
@@ -11247,8 +10961,8 @@ SWIGINTERN PyObject *_wrap_SipSession_addCaps(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? (int)PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 3) && (ii < argc); ii++) {
+  argc = (int)PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 2) {
@@ -11283,11 +10997,11 @@ SWIGINTERN PyObject *_wrap_SipSession_addCaps(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'SipSession_addCaps'.\n"
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'SipSession_addCaps'.\n"
     "  Possible C/C++ prototypes are:\n"
-    "    SipSession::addCaps(char const *,char const *)\n"
-    "    SipSession::addCaps(char const *)\n");
-  return 0;
+    "    addCaps(SipSession *,char const *,char const *)\n"
+    "    addCaps(SipSession *,char const *)\n");
+  return NULL;
 }
 
 
@@ -11427,8 +11141,8 @@ SWIGINTERN PyObject *_wrap_SipSession_setFromUri(PyObject *self, PyObject *args)
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? (int)PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
+  argc = (int)PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 2) {
@@ -11460,11 +11174,11 @@ SWIGINTERN PyObject *_wrap_SipSession_setFromUri(PyObject *self, PyObject *args)
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'SipSession_setFromUri'.\n"
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'SipSession_setFromUri'.\n"
     "  Possible C/C++ prototypes are:\n"
-    "    SipSession::setFromUri(char const *)\n"
-    "    SipSession::setFromUri(SipUri const *)\n");
-  return 0;
+    "    setFromUri(SipSession *,char const *)\n"
+    "    setFromUri(SipSession *,SipUri const *)\n");
+  return NULL;
 }
 
 
@@ -11539,8 +11253,8 @@ SWIGINTERN PyObject *_wrap_SipSession_setToUri(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? (int)PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
+  argc = (int)PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 2) {
@@ -11572,11 +11286,11 @@ SWIGINTERN PyObject *_wrap_SipSession_setToUri(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'SipSession_setToUri'.\n"
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'SipSession_setToUri'.\n"
     "  Possible C/C++ prototypes are:\n"
-    "    SipSession::setToUri(char const *)\n"
-    "    SipSession::setToUri(SipUri const *)\n");
-  return 0;
+    "    setToUri(SipSession *,char const *)\n"
+    "    setToUri(SipSession *,SipUri const *)\n");
+  return NULL;
 }
 
 
@@ -11798,8 +11512,8 @@ SWIGINTERN PyObject *_wrap_InviteSession_accept(PyObject *self, PyObject *args)
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? (int)PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
+  argc = (int)PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 1) {
@@ -11827,11 +11541,11 @@ SWIGINTERN PyObject *_wrap_InviteSession_accept(PyObject *self, PyObject *args)
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'InviteSession_accept'.\n"
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'InviteSession_accept'.\n"
     "  Possible C/C++ prototypes are:\n"
-    "    InviteSession::accept(ActionConfig *)\n"
-    "    InviteSession::accept()\n");
-  return 0;
+    "    accept(InviteSession *,ActionConfig *)\n"
+    "    accept(InviteSession *)\n");
+  return NULL;
 }
 
 
@@ -11894,8 +11608,8 @@ SWIGINTERN PyObject *_wrap_InviteSession_hangup(PyObject *self, PyObject *args)
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? (int)PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
+  argc = (int)PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 1) {
@@ -11923,11 +11637,11 @@ SWIGINTERN PyObject *_wrap_InviteSession_hangup(PyObject *self, PyObject *args)
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'InviteSession_hangup'.\n"
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'InviteSession_hangup'.\n"
     "  Possible C/C++ prototypes are:\n"
-    "    InviteSession::hangup(ActionConfig *)\n"
-    "    InviteSession::hangup()\n");
-  return 0;
+    "    hangup(InviteSession *,ActionConfig *)\n"
+    "    hangup(InviteSession *)\n");
+  return NULL;
 }
 
 
@@ -11990,8 +11704,8 @@ SWIGINTERN PyObject *_wrap_InviteSession_reject(PyObject *self, PyObject *args)
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? (int)PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
+  argc = (int)PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 1) {
@@ -12019,11 +11733,11 @@ SWIGINTERN PyObject *_wrap_InviteSession_reject(PyObject *self, PyObject *args)
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'InviteSession_reject'.\n"
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'InviteSession_reject'.\n"
     "  Possible C/C++ prototypes are:\n"
-    "    InviteSession::reject(ActionConfig *)\n"
-    "    InviteSession::reject()\n");
-  return 0;
+    "    reject(InviteSession *,ActionConfig *)\n"
+    "    reject(InviteSession *)\n");
+  return NULL;
 }
 
 
@@ -12118,8 +11832,8 @@ SWIGINTERN PyObject *_wrap_InviteSession_sendInfo(PyObject *self, PyObject *args
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? (int)PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 4) && (ii < argc); ii++) {
+  argc = (int)PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 4); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 3) {
@@ -12169,11 +11883,11 @@ SWIGINTERN PyObject *_wrap_InviteSession_sendInfo(PyObject *self, PyObject *args
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'InviteSession_sendInfo'.\n"
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'InviteSession_sendInfo'.\n"
     "  Possible C/C++ prototypes are:\n"
-    "    InviteSession::sendInfo(void const *,unsigned int,ActionConfig *)\n"
-    "    InviteSession::sendInfo(void const *,unsigned int)\n");
-  return 0;
+    "    sendInfo(InviteSession *,void const *,unsigned int,ActionConfig *)\n"
+    "    sendInfo(InviteSession *,void const *,unsigned int)\n");
+  return NULL;
 }
 
 
@@ -12403,8 +12117,8 @@ SWIGINTERN PyObject *_wrap_CallSession_callAudio(PyObject *self, PyObject *args)
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? (int)PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 3) && (ii < argc); ii++) {
+  argc = (int)PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 2) {
@@ -12473,13 +12187,13 @@ SWIGINTERN PyObject *_wrap_CallSession_callAudio(PyObject *self, PyObject *args)
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'CallSession_callAudio'.\n"
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CallSession_callAudio'.\n"
     "  Possible C/C++ prototypes are:\n"
-    "    CallSession::callAudio(char const *,ActionConfig *)\n"
-    "    CallSession::callAudio(char const *)\n"
-    "    CallSession::callAudio(SipUri const *,ActionConfig *)\n"
-    "    CallSession::callAudio(SipUri const *)\n");
-  return 0;
+    "    callAudio(CallSession *,char const *,ActionConfig *)\n"
+    "    callAudio(CallSession *,char const *)\n"
+    "    callAudio(CallSession *,SipUri const *,ActionConfig *)\n"
+    "    callAudio(CallSession *,SipUri const *)\n");
+  return NULL;
 }
 
 
@@ -12637,8 +12351,8 @@ SWIGINTERN PyObject *_wrap_CallSession_callAudioVideo(PyObject *self, PyObject *
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? (int)PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 3) && (ii < argc); ii++) {
+  argc = (int)PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 2) {
@@ -12707,13 +12421,13 @@ SWIGINTERN PyObject *_wrap_CallSession_callAudioVideo(PyObject *self, PyObject *
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'CallSession_callAudioVideo'.\n"
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CallSession_callAudioVideo'.\n"
     "  Possible C/C++ prototypes are:\n"
-    "    CallSession::callAudioVideo(char const *,ActionConfig *)\n"
-    "    CallSession::callAudioVideo(char const *)\n"
-    "    CallSession::callAudioVideo(SipUri const *,ActionConfig *)\n"
-    "    CallSession::callAudioVideo(SipUri const *)\n");
-  return 0;
+    "    callAudioVideo(CallSession *,char const *,ActionConfig *)\n"
+    "    callAudioVideo(CallSession *,char const *)\n"
+    "    callAudioVideo(CallSession *,SipUri const *,ActionConfig *)\n"
+    "    callAudioVideo(CallSession *,SipUri const *)\n");
+  return NULL;
 }
 
 
@@ -12871,8 +12585,8 @@ SWIGINTERN PyObject *_wrap_CallSession_callVideo(PyObject *self, PyObject *args)
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? (int)PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 3) && (ii < argc); ii++) {
+  argc = (int)PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 2) {
@@ -12941,13 +12655,13 @@ SWIGINTERN PyObject *_wrap_CallSession_callVideo(PyObject *self, PyObject *args)
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'CallSession_callVideo'.\n"
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CallSession_callVideo'.\n"
     "  Possible C/C++ prototypes are:\n"
-    "    CallSession::callVideo(char const *,ActionConfig *)\n"
-    "    CallSession::callVideo(char const *)\n"
-    "    CallSession::callVideo(SipUri const *,ActionConfig *)\n"
-    "    CallSession::callVideo(SipUri const *)\n");
-  return 0;
+    "    callVideo(CallSession *,char const *,ActionConfig *)\n"
+    "    callVideo(CallSession *,char const *)\n"
+    "    callVideo(CallSession *,SipUri const *,ActionConfig *)\n"
+    "    callVideo(CallSession *,SipUri const *)\n");
+  return NULL;
 }
 
 
@@ -13141,8 +12855,8 @@ SWIGINTERN PyObject *_wrap_CallSession_call(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? (int)PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 4) && (ii < argc); ii++) {
+  argc = (int)PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 4); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 3) {
@@ -13235,13 +12949,13 @@ SWIGINTERN PyObject *_wrap_CallSession_call(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'CallSession_call'.\n"
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CallSession_call'.\n"
     "  Possible C/C++ prototypes are:\n"
-    "    CallSession::call(char const *,twrap_media_type_t,ActionConfig *)\n"
-    "    CallSession::call(char const *,twrap_media_type_t)\n"
-    "    CallSession::call(SipUri const *,twrap_media_type_t,ActionConfig *)\n"
-    "    CallSession::call(SipUri const *,twrap_media_type_t)\n");
-  return 0;
+    "    call(CallSession *,char const *,twrap_media_type_t,ActionConfig *)\n"
+    "    call(CallSession *,char const *,twrap_media_type_t)\n"
+    "    call(CallSession *,SipUri const *,twrap_media_type_t,ActionConfig *)\n"
+    "    call(CallSession *,SipUri const *,twrap_media_type_t)\n");
+  return NULL;
 }
 
 
@@ -13724,8 +13438,8 @@ SWIGINTERN PyObject *_wrap_CallSession_hold(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? (int)PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
+  argc = (int)PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 1) {
@@ -13753,11 +13467,11 @@ SWIGINTERN PyObject *_wrap_CallSession_hold(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'CallSession_hold'.\n"
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CallSession_hold'.\n"
     "  Possible C/C++ prototypes are:\n"
-    "    CallSession::hold(ActionConfig *)\n"
-    "    CallSession::hold()\n");
-  return 0;
+    "    hold(CallSession *,ActionConfig *)\n"
+    "    hold(CallSession *)\n");
+  return NULL;
 }
 
 
@@ -13820,8 +13534,8 @@ SWIGINTERN PyObject *_wrap_CallSession_resume(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? (int)PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
+  argc = (int)PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 1) {
@@ -13849,11 +13563,11 @@ SWIGINTERN PyObject *_wrap_CallSession_resume(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'CallSession_resume'.\n"
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CallSession_resume'.\n"
     "  Possible C/C++ prototypes are:\n"
-    "    CallSession::resume(ActionConfig *)\n"
-    "    CallSession::resume()\n");
-  return 0;
+    "    resume(CallSession *,ActionConfig *)\n"
+    "    resume(CallSession *)\n");
+  return NULL;
 }
 
 
@@ -13940,8 +13654,8 @@ SWIGINTERN PyObject *_wrap_CallSession_transfer(PyObject *self, PyObject *args)
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? (int)PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 3) && (ii < argc); ii++) {
+  argc = (int)PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 2) {
@@ -13977,11 +13691,11 @@ SWIGINTERN PyObject *_wrap_CallSession_transfer(PyObject *self, PyObject *args)
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'CallSession_transfer'.\n"
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CallSession_transfer'.\n"
     "  Possible C/C++ prototypes are:\n"
-    "    CallSession::transfer(char const *,ActionConfig *)\n"
-    "    CallSession::transfer(char const *)\n");
-  return 0;
+    "    transfer(CallSession *,char const *,ActionConfig *)\n"
+    "    transfer(CallSession *,char const *)\n");
+  return NULL;
 }
 
 
@@ -14044,8 +13758,8 @@ SWIGINTERN PyObject *_wrap_CallSession_acceptTransfer(PyObject *self, PyObject *
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? (int)PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
+  argc = (int)PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 1) {
@@ -14073,11 +13787,11 @@ SWIGINTERN PyObject *_wrap_CallSession_acceptTransfer(PyObject *self, PyObject *
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'CallSession_acceptTransfer'.\n"
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CallSession_acceptTransfer'.\n"
     "  Possible C/C++ prototypes are:\n"
-    "    CallSession::acceptTransfer(ActionConfig *)\n"
-    "    CallSession::acceptTransfer()\n");
-  return 0;
+    "    acceptTransfer(CallSession *,ActionConfig *)\n"
+    "    acceptTransfer(CallSession *)\n");
+  return NULL;
 }
 
 
@@ -14140,8 +13854,8 @@ SWIGINTERN PyObject *_wrap_CallSession_rejectTransfer(PyObject *self, PyObject *
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? (int)PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
+  argc = (int)PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 1) {
@@ -14169,11 +13883,11 @@ SWIGINTERN PyObject *_wrap_CallSession_rejectTransfer(PyObject *self, PyObject *
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'CallSession_rejectTransfer'.\n"
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CallSession_rejectTransfer'.\n"
     "  Possible C/C++ prototypes are:\n"
-    "    CallSession::rejectTransfer(ActionConfig *)\n"
-    "    CallSession::rejectTransfer()\n");
-  return 0;
+    "    rejectTransfer(CallSession *,ActionConfig *)\n"
+    "    rejectTransfer(CallSession *)\n");
+  return NULL;
 }
 
 
@@ -14352,8 +14066,8 @@ SWIGINTERN PyObject *_wrap_CallSession_sendT140Data(PyObject *self, PyObject *ar
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? (int)PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 4) && (ii < argc); ii++) {
+  argc = (int)PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 4); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 2) {
@@ -14419,12 +14133,12 @@ SWIGINTERN PyObject *_wrap_CallSession_sendT140Data(PyObject *self, PyObject *ar
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'CallSession_sendT140Data'.\n"
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CallSession_sendT140Data'.\n"
     "  Possible C/C++ prototypes are:\n"
-    "    CallSession::sendT140Data(enum tmedia_t140_data_type_e,void const *,unsigned int)\n"
-    "    CallSession::sendT140Data(enum tmedia_t140_data_type_e,void const *)\n"
-    "    CallSession::sendT140Data(enum tmedia_t140_data_type_e)\n");
-  return 0;
+    "    sendT140Data(CallSession *,enum tmedia_t140_data_type_e,void const *,unsigned int)\n"
+    "    sendT140Data(CallSession *,enum tmedia_t140_data_type_e,void const *)\n"
+    "    sendT140Data(CallSession *,enum tmedia_t140_data_type_e)\n");
+  return NULL;
 }
 
 
@@ -14703,8 +14417,8 @@ SWIGINTERN PyObject *_wrap_MsrpSession_callMsrp(PyObject *self, PyObject *args)
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? (int)PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 3) && (ii < argc); ii++) {
+  argc = (int)PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 2) {
@@ -14773,13 +14487,13 @@ SWIGINTERN PyObject *_wrap_MsrpSession_callMsrp(PyObject *self, PyObject *args)
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'MsrpSession_callMsrp'.\n"
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'MsrpSession_callMsrp'.\n"
     "  Possible C/C++ prototypes are:\n"
-    "    MsrpSession::callMsrp(char const *,ActionConfig *)\n"
-    "    MsrpSession::callMsrp(char const *)\n"
-    "    MsrpSession::callMsrp(SipUri const *,ActionConfig *)\n"
-    "    MsrpSession::callMsrp(SipUri const *)\n");
-  return 0;
+    "    callMsrp(MsrpSession *,char const *,ActionConfig *)\n"
+    "    callMsrp(MsrpSession *,char const *)\n"
+    "    callMsrp(MsrpSession *,SipUri const *,ActionConfig *)\n"
+    "    callMsrp(MsrpSession *,SipUri const *)\n");
+  return NULL;
 }
 
 
@@ -14874,8 +14588,8 @@ SWIGINTERN PyObject *_wrap_MsrpSession_sendMessage(PyObject *self, PyObject *arg
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? (int)PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 4) && (ii < argc); ii++) {
+  argc = (int)PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 4); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 3) {
@@ -14925,11 +14639,11 @@ SWIGINTERN PyObject *_wrap_MsrpSession_sendMessage(PyObject *self, PyObject *arg
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'MsrpSession_sendMessage'.\n"
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'MsrpSession_sendMessage'.\n"
     "  Possible C/C++ prototypes are:\n"
-    "    MsrpSession::sendMessage(void const *,unsigned int,ActionConfig *)\n"
-    "    MsrpSession::sendMessage(void const *,unsigned int)\n");
-  return 0;
+    "    sendMessage(MsrpSession *,void const *,unsigned int,ActionConfig *)\n"
+    "    sendMessage(MsrpSession *,void const *,unsigned int)\n");
+  return NULL;
 }
 
 
@@ -14992,8 +14706,8 @@ SWIGINTERN PyObject *_wrap_MsrpSession_sendFile(PyObject *self, PyObject *args)
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? (int)PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
+  argc = (int)PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 1) {
@@ -15021,11 +14735,11 @@ SWIGINTERN PyObject *_wrap_MsrpSession_sendFile(PyObject *self, PyObject *args)
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'MsrpSession_sendFile'.\n"
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'MsrpSession_sendFile'.\n"
     "  Possible C/C++ prototypes are:\n"
-    "    MsrpSession::sendFile(ActionConfig *)\n"
-    "    MsrpSession::sendFile()\n");
-  return 0;
+    "    sendFile(MsrpSession *,ActionConfig *)\n"
+    "    sendFile(MsrpSession *)\n");
+  return NULL;
 }
 
 
@@ -15170,8 +14884,8 @@ SWIGINTERN PyObject *_wrap_MessagingSession_send(PyObject *self, PyObject *args)
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? (int)PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 4) && (ii < argc); ii++) {
+  argc = (int)PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 4); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 3) {
@@ -15221,11 +14935,11 @@ SWIGINTERN PyObject *_wrap_MessagingSession_send(PyObject *self, PyObject *args)
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'MessagingSession_send'.\n"
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'MessagingSession_send'.\n"
     "  Possible C/C++ prototypes are:\n"
-    "    MessagingSession::send(void const *,unsigned int,ActionConfig *)\n"
-    "    MessagingSession::send(void const *,unsigned int)\n");
-  return 0;
+    "    send(MessagingSession *,void const *,unsigned int,ActionConfig *)\n"
+    "    send(MessagingSession *,void const *,unsigned int)\n");
+  return NULL;
 }
 
 
@@ -15288,8 +15002,8 @@ SWIGINTERN PyObject *_wrap_MessagingSession_accept(PyObject *self, PyObject *arg
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? (int)PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
+  argc = (int)PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 1) {
@@ -15317,11 +15031,11 @@ SWIGINTERN PyObject *_wrap_MessagingSession_accept(PyObject *self, PyObject *arg
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'MessagingSession_accept'.\n"
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'MessagingSession_accept'.\n"
     "  Possible C/C++ prototypes are:\n"
-    "    MessagingSession::accept(ActionConfig *)\n"
-    "    MessagingSession::accept()\n");
-  return 0;
+    "    accept(MessagingSession *,ActionConfig *)\n"
+    "    accept(MessagingSession *)\n");
+  return NULL;
 }
 
 
@@ -15384,8 +15098,8 @@ SWIGINTERN PyObject *_wrap_MessagingSession_reject(PyObject *self, PyObject *arg
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? (int)PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
+  argc = (int)PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 1) {
@@ -15413,11 +15127,11 @@ SWIGINTERN PyObject *_wrap_MessagingSession_reject(PyObject *self, PyObject *arg
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'MessagingSession_reject'.\n"
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'MessagingSession_reject'.\n"
     "  Possible C/C++ prototypes are:\n"
-    "    MessagingSession::reject(ActionConfig *)\n"
-    "    MessagingSession::reject()\n");
-  return 0;
+    "    reject(MessagingSession *,ActionConfig *)\n"
+    "    reject(MessagingSession *)\n");
+  return NULL;
 }
 
 
@@ -15562,8 +15276,8 @@ SWIGINTERN PyObject *_wrap_InfoSession_send(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? (int)PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 4) && (ii < argc); ii++) {
+  argc = (int)PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 4); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 3) {
@@ -15613,11 +15327,11 @@ SWIGINTERN PyObject *_wrap_InfoSession_send(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'InfoSession_send'.\n"
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'InfoSession_send'.\n"
     "  Possible C/C++ prototypes are:\n"
-    "    InfoSession::send(void const *,unsigned int,ActionConfig *)\n"
-    "    InfoSession::send(void const *,unsigned int)\n");
-  return 0;
+    "    send(InfoSession *,void const *,unsigned int,ActionConfig *)\n"
+    "    send(InfoSession *,void const *,unsigned int)\n");
+  return NULL;
 }
 
 
@@ -15680,8 +15394,8 @@ SWIGINTERN PyObject *_wrap_InfoSession_accept(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? (int)PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
+  argc = (int)PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 1) {
@@ -15709,11 +15423,11 @@ SWIGINTERN PyObject *_wrap_InfoSession_accept(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'InfoSession_accept'.\n"
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'InfoSession_accept'.\n"
     "  Possible C/C++ prototypes are:\n"
-    "    InfoSession::accept(ActionConfig *)\n"
-    "    InfoSession::accept()\n");
-  return 0;
+    "    accept(InfoSession *,ActionConfig *)\n"
+    "    accept(InfoSession *)\n");
+  return NULL;
 }
 
 
@@ -15776,8 +15490,8 @@ SWIGINTERN PyObject *_wrap_InfoSession_reject(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? (int)PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
+  argc = (int)PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 1) {
@@ -15805,11 +15519,11 @@ SWIGINTERN PyObject *_wrap_InfoSession_reject(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'InfoSession_reject'.\n"
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'InfoSession_reject'.\n"
     "  Possible C/C++ prototypes are:\n"
-    "    InfoSession::reject(ActionConfig *)\n"
-    "    InfoSession::reject()\n");
-  return 0;
+    "    reject(InfoSession *,ActionConfig *)\n"
+    "    reject(InfoSession *)\n");
+  return NULL;
 }
 
 
@@ -15922,8 +15636,8 @@ SWIGINTERN PyObject *_wrap_OptionsSession_send(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? (int)PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
+  argc = (int)PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 1) {
@@ -15951,11 +15665,11 @@ SWIGINTERN PyObject *_wrap_OptionsSession_send(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'OptionsSession_send'.\n"
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'OptionsSession_send'.\n"
     "  Possible C/C++ prototypes are:\n"
-    "    OptionsSession::send(ActionConfig *)\n"
-    "    OptionsSession::send()\n");
-  return 0;
+    "    send(OptionsSession *,ActionConfig *)\n"
+    "    send(OptionsSession *)\n");
+  return NULL;
 }
 
 
@@ -16018,8 +15732,8 @@ SWIGINTERN PyObject *_wrap_OptionsSession_accept(PyObject *self, PyObject *args)
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? (int)PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
+  argc = (int)PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 1) {
@@ -16047,11 +15761,11 @@ SWIGINTERN PyObject *_wrap_OptionsSession_accept(PyObject *self, PyObject *args)
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'OptionsSession_accept'.\n"
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'OptionsSession_accept'.\n"
     "  Possible C/C++ prototypes are:\n"
-    "    OptionsSession::accept(ActionConfig *)\n"
-    "    OptionsSession::accept()\n");
-  return 0;
+    "    accept(OptionsSession *,ActionConfig *)\n"
+    "    accept(OptionsSession *)\n");
+  return NULL;
 }
 
 
@@ -16114,8 +15828,8 @@ SWIGINTERN PyObject *_wrap_OptionsSession_reject(PyObject *self, PyObject *args)
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? (int)PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
+  argc = (int)PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 1) {
@@ -16143,11 +15857,11 @@ SWIGINTERN PyObject *_wrap_OptionsSession_reject(PyObject *self, PyObject *args)
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'OptionsSession_reject'.\n"
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'OptionsSession_reject'.\n"
     "  Possible C/C++ prototypes are:\n"
-    "    OptionsSession::reject(ActionConfig *)\n"
-    "    OptionsSession::reject()\n");
-  return 0;
+    "    reject(OptionsSession *,ActionConfig *)\n"
+    "    reject(OptionsSession *)\n");
+  return NULL;
 }
 
 
@@ -16292,8 +16006,8 @@ SWIGINTERN PyObject *_wrap_PublicationSession_publish(PyObject *self, PyObject *
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? (int)PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 4) && (ii < argc); ii++) {
+  argc = (int)PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 4); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 3) {
@@ -16343,11 +16057,11 @@ SWIGINTERN PyObject *_wrap_PublicationSession_publish(PyObject *self, PyObject *
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'PublicationSession_publish'.\n"
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'PublicationSession_publish'.\n"
     "  Possible C/C++ prototypes are:\n"
-    "    PublicationSession::publish(void const *,unsigned int,ActionConfig *)\n"
-    "    PublicationSession::publish(void const *,unsigned int)\n");
-  return 0;
+    "    publish(PublicationSession *,void const *,unsigned int,ActionConfig *)\n"
+    "    publish(PublicationSession *,void const *,unsigned int)\n");
+  return NULL;
 }
 
 
@@ -16410,8 +16124,8 @@ SWIGINTERN PyObject *_wrap_PublicationSession_unPublish(PyObject *self, PyObject
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? (int)PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
+  argc = (int)PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 1) {
@@ -16439,11 +16153,11 @@ SWIGINTERN PyObject *_wrap_PublicationSession_unPublish(PyObject *self, PyObject
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'PublicationSession_unPublish'.\n"
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'PublicationSession_unPublish'.\n"
     "  Possible C/C++ prototypes are:\n"
-    "    PublicationSession::unPublish(ActionConfig *)\n"
-    "    PublicationSession::unPublish()\n");
-  return 0;
+    "    unPublish(PublicationSession *,ActionConfig *)\n"
+    "    unPublish(PublicationSession *)\n");
+  return NULL;
 }
 
 
@@ -16556,8 +16270,8 @@ SWIGINTERN PyObject *_wrap_RegistrationSession_register_(PyObject *self, PyObjec
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? (int)PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
+  argc = (int)PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 1) {
@@ -16585,11 +16299,11 @@ SWIGINTERN PyObject *_wrap_RegistrationSession_register_(PyObject *self, PyObjec
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'RegistrationSession_register_'.\n"
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'RegistrationSession_register_'.\n"
     "  Possible C/C++ prototypes are:\n"
-    "    RegistrationSession::register_(ActionConfig *)\n"
-    "    RegistrationSession::register_()\n");
-  return 0;
+    "    register_(RegistrationSession *,ActionConfig *)\n"
+    "    register_(RegistrationSession *)\n");
+  return NULL;
 }
 
 
@@ -16652,8 +16366,8 @@ SWIGINTERN PyObject *_wrap_RegistrationSession_unRegister(PyObject *self, PyObje
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? (int)PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
+  argc = (int)PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 1) {
@@ -16681,11 +16395,11 @@ SWIGINTERN PyObject *_wrap_RegistrationSession_unRegister(PyObject *self, PyObje
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'RegistrationSession_unRegister'.\n"
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'RegistrationSession_unRegister'.\n"
     "  Possible C/C++ prototypes are:\n"
-    "    RegistrationSession::unRegister(ActionConfig *)\n"
-    "    RegistrationSession::unRegister()\n");
-  return 0;
+    "    unRegister(RegistrationSession *,ActionConfig *)\n"
+    "    unRegister(RegistrationSession *)\n");
+  return NULL;
 }
 
 
@@ -16748,8 +16462,8 @@ SWIGINTERN PyObject *_wrap_RegistrationSession_accept(PyObject *self, PyObject *
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? (int)PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
+  argc = (int)PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 1) {
@@ -16777,11 +16491,11 @@ SWIGINTERN PyObject *_wrap_RegistrationSession_accept(PyObject *self, PyObject *
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'RegistrationSession_accept'.\n"
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'RegistrationSession_accept'.\n"
     "  Possible C/C++ prototypes are:\n"
-    "    RegistrationSession::accept(ActionConfig *)\n"
-    "    RegistrationSession::accept()\n");
-  return 0;
+    "    accept(RegistrationSession *,ActionConfig *)\n"
+    "    accept(RegistrationSession *)\n");
+  return NULL;
 }
 
 
@@ -16844,8 +16558,8 @@ SWIGINTERN PyObject *_wrap_RegistrationSession_reject(PyObject *self, PyObject *
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? (int)PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
+  argc = (int)PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 1) {
@@ -16873,11 +16587,11 @@ SWIGINTERN PyObject *_wrap_RegistrationSession_reject(PyObject *self, PyObject *
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'RegistrationSession_reject'.\n"
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'RegistrationSession_reject'.\n"
     "  Possible C/C++ prototypes are:\n"
-    "    RegistrationSession::reject(ActionConfig *)\n"
-    "    RegistrationSession::reject()\n");
-  return 0;
+    "    reject(RegistrationSession *,ActionConfig *)\n"
+    "    reject(RegistrationSession *)\n");
+  return NULL;
 }
 
 
@@ -17361,7 +17075,7 @@ SWIGINTERN PyObject *_wrap_disown_ProxyPluginMgrCallback(PyObject *SWIGUNUSEDPAR
   }
   arg1 = reinterpret_cast< ProxyPluginMgrCallback * >(argp1);
   {
-    Swig::Director *director = SWIG_DIRECTOR_CAST(arg1);
+    Swig::Director *director = dynamic_cast<Swig::Director *>(arg1);
     if (director) director->swig_disown();
   }
   
@@ -17671,7 +17385,7 @@ SWIGINTERN PyObject *_wrap_disown_ProxyAudioConsumerCallback(PyObject *SWIGUNUSE
   }
   arg1 = reinterpret_cast< ProxyAudioConsumerCallback * >(argp1);
   {
-    Swig::Director *director = SWIG_DIRECTOR_CAST(arg1);
+    Swig::Director *director = dynamic_cast<Swig::Director *>(arg1);
     if (director) director->swig_disown();
   }
   
@@ -17959,8 +17673,8 @@ SWIGINTERN PyObject *_wrap_ProxyAudioConsumer_pull(PyObject *self, PyObject *arg
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? (int)PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 3) && (ii < argc); ii++) {
+  argc = (int)PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 1) {
@@ -18008,12 +17722,12 @@ SWIGINTERN PyObject *_wrap_ProxyAudioConsumer_pull(PyObject *self, PyObject *arg
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'ProxyAudioConsumer_pull'.\n"
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ProxyAudioConsumer_pull'.\n"
     "  Possible C/C++ prototypes are:\n"
-    "    ProxyAudioConsumer::pull(void *,unsigned int)\n"
-    "    ProxyAudioConsumer::pull(void *)\n"
-    "    ProxyAudioConsumer::pull()\n");
-  return 0;
+    "    pull(ProxyAudioConsumer *,void *,unsigned int)\n"
+    "    pull(ProxyAudioConsumer *,void *)\n"
+    "    pull(ProxyAudioConsumer *)\n");
+  return NULL;
 }
 
 
@@ -18479,7 +18193,7 @@ SWIGINTERN PyObject *_wrap_disown_ProxyVideoConsumerCallback(PyObject *SWIGUNUSE
   }
   arg1 = reinterpret_cast< ProxyVideoConsumerCallback * >(argp1);
   {
-    Swig::Director *director = SWIG_DIRECTOR_CAST(arg1);
+    Swig::Director *director = dynamic_cast<Swig::Director *>(arg1);
     if (director) director->swig_disown();
   }
   
@@ -19297,7 +19011,7 @@ SWIGINTERN PyObject *_wrap_disown_ProxyAudioProducerCallback(PyObject *SWIGUNUSE
   }
   arg1 = reinterpret_cast< ProxyAudioProducerCallback * >(argp1);
   {
-    Swig::Director *director = SWIG_DIRECTOR_CAST(arg1);
+    Swig::Director *director = dynamic_cast<Swig::Director *>(arg1);
     if (director) director->swig_disown();
   }
   
@@ -19476,8 +19190,8 @@ SWIGINTERN PyObject *_wrap_ProxyAudioProducer_setPushBuffer(PyObject *self, PyOb
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? (int)PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 4) && (ii < argc); ii++) {
+  argc = (int)PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 4); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 3) {
@@ -19528,11 +19242,11 @@ SWIGINTERN PyObject *_wrap_ProxyAudioProducer_setPushBuffer(PyObject *self, PyOb
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'ProxyAudioProducer_setPushBuffer'.\n"
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ProxyAudioProducer_setPushBuffer'.\n"
     "  Possible C/C++ prototypes are:\n"
-    "    ProxyAudioProducer::setPushBuffer(void const *,unsigned int,bool)\n"
-    "    ProxyAudioProducer::setPushBuffer(void const *,unsigned int)\n");
-  return 0;
+    "    setPushBuffer(ProxyAudioProducer *,void const *,unsigned int,bool)\n"
+    "    setPushBuffer(ProxyAudioProducer *,void const *,unsigned int)\n");
+  return NULL;
 }
 
 
@@ -19631,8 +19345,8 @@ SWIGINTERN PyObject *_wrap_ProxyAudioProducer_push(PyObject *self, PyObject *arg
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? (int)PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 3) && (ii < argc); ii++) {
+  argc = (int)PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 1) {
@@ -19680,12 +19394,12 @@ SWIGINTERN PyObject *_wrap_ProxyAudioProducer_push(PyObject *self, PyObject *arg
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'ProxyAudioProducer_push'.\n"
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ProxyAudioProducer_push'.\n"
     "  Possible C/C++ prototypes are:\n"
-    "    ProxyAudioProducer::push(void const *,unsigned int)\n"
-    "    ProxyAudioProducer::push(void const *)\n"
-    "    ProxyAudioProducer::push()\n");
-  return 0;
+    "    push(ProxyAudioProducer *,void const *,unsigned int)\n"
+    "    push(ProxyAudioProducer *,void const *)\n"
+    "    push(ProxyAudioProducer *)\n");
+  return NULL;
 }
 
 
@@ -20034,7 +19748,7 @@ SWIGINTERN PyObject *_wrap_disown_ProxyVideoProducerCallback(PyObject *SWIGUNUSE
   }
   arg1 = reinterpret_cast< ProxyVideoProducerCallback * >(argp1);
   {
-    Swig::Director *director = SWIG_DIRECTOR_CAST(arg1);
+    Swig::Director *director = dynamic_cast<Swig::Director *>(arg1);
     if (director) director->swig_disown();
   }
   
@@ -20741,7 +20455,7 @@ SWIGINTERN PyObject *_wrap_disown_SipCallback(PyObject *SWIGUNUSEDPARM(self), Py
   }
   arg1 = reinterpret_cast< SipCallback * >(argp1);
   {
-    Swig::Director *director = SWIG_DIRECTOR_CAST(arg1);
+    Swig::Director *director = dynamic_cast<Swig::Director *>(arg1);
     if (director) director->swig_disown();
   }
   
@@ -21367,8 +21081,8 @@ SWIGINTERN PyObject *_wrap_SipStack_setLocalIP(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? (int)PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 3) && (ii < argc); ii++) {
+  argc = (int)PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 2) {
@@ -21403,11 +21117,11 @@ SWIGINTERN PyObject *_wrap_SipStack_setLocalIP(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'SipStack_setLocalIP'.\n"
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'SipStack_setLocalIP'.\n"
     "  Possible C/C++ prototypes are:\n"
-    "    SipStack::setLocalIP(char const *,char const *)\n"
-    "    SipStack::setLocalIP(char const *)\n");
-  return 0;
+    "    setLocalIP(SipStack *,char const *,char const *)\n"
+    "    setLocalIP(SipStack *,char const *)\n");
+  return NULL;
 }
 
 
@@ -21491,8 +21205,8 @@ SWIGINTERN PyObject *_wrap_SipStack_setLocalPort(PyObject *self, PyObject *args)
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? (int)PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 3) && (ii < argc); ii++) {
+  argc = (int)PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 2) {
@@ -21531,11 +21245,11 @@ SWIGINTERN PyObject *_wrap_SipStack_setLocalPort(PyObject *self, PyObject *args)
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'SipStack_setLocalPort'.\n"
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'SipStack_setLocalPort'.\n"
     "  Possible C/C++ prototypes are:\n"
-    "    SipStack::setLocalPort(unsigned short,char const *)\n"
-    "    SipStack::setLocalPort(unsigned short)\n");
-  return 0;
+    "    setLocalPort(SipStack *,unsigned short,char const *)\n"
+    "    setLocalPort(SipStack *,unsigned short)\n");
+  return NULL;
 }
 
 
@@ -22197,8 +21911,8 @@ SWIGINTERN PyObject *_wrap_SipStack_setSSLCertificates(PyObject *self, PyObject
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? (int)PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 5) && (ii < argc); ii++) {
+  argc = (int)PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 5); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 4) {
@@ -22251,11 +21965,11 @@ SWIGINTERN PyObject *_wrap_SipStack_setSSLCertificates(PyObject *self, PyObject
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'SipStack_setSSLCertificates'.\n"
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'SipStack_setSSLCertificates'.\n"
     "  Possible C/C++ prototypes are:\n"
-    "    SipStack::setSSLCertificates(char const *,char const *,char const *,bool)\n"
-    "    SipStack::setSSLCertificates(char const *,char const *,char const *)\n");
-  return 0;
+    "    setSSLCertificates(SipStack *,char const *,char const *,char const *,bool)\n"
+    "    setSSLCertificates(SipStack *,char const *,char const *,char const *)\n");
+  return NULL;
 }
 
 
@@ -22390,8 +22104,8 @@ SWIGINTERN PyObject *_wrap_SipStack_setSSLCretificates(PyObject *self, PyObject
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? (int)PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 5) && (ii < argc); ii++) {
+  argc = (int)PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 5); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 4) {
@@ -22444,11 +22158,11 @@ SWIGINTERN PyObject *_wrap_SipStack_setSSLCretificates(PyObject *self, PyObject
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'SipStack_setSSLCretificates'.\n"
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'SipStack_setSSLCretificates'.\n"
     "  Possible C/C++ prototypes are:\n"
-    "    SipStack::setSSLCretificates(char const *,char const *,char const *,bool)\n"
-    "    SipStack::setSSLCretificates(char const *,char const *,char const *)\n");
-  return 0;
+    "    setSSLCretificates(SipStack *,char const *,char const *,char const *,bool)\n"
+    "    setSSLCretificates(SipStack *,char const *,char const *,char const *)\n");
+  return NULL;
 }
 
 
@@ -23568,8 +23282,8 @@ SWIGINTERN PyObject *_wrap_XcapMessage_getXcapHeaderValue(PyObject *self, PyObje
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? (int)PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 3) && (ii < argc); ii++) {
+  argc = (int)PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 2) {
@@ -23606,11 +23320,11 @@ SWIGINTERN PyObject *_wrap_XcapMessage_getXcapHeaderValue(PyObject *self, PyObje
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'XcapMessage_getXcapHeaderValue'.\n"
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'XcapMessage_getXcapHeaderValue'.\n"
     "  Possible C/C++ prototypes are:\n"
-    "    XcapMessage::getXcapHeaderValue(char const *,unsigned int)\n"
-    "    XcapMessage::getXcapHeaderValue(char const *)\n");
-  return 0;
+    "    getXcapHeaderValue(XcapMessage *,char const *,unsigned int)\n"
+    "    getXcapHeaderValue(XcapMessage *,char const *)\n");
+  return NULL;
 }
 
 
@@ -23723,8 +23437,8 @@ SWIGINTERN PyObject *_wrap_XcapMessage_getXcapHeaderParamValue(PyObject *self, P
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? (int)PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 4) && (ii < argc); ii++) {
+  argc = (int)PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 4); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 3) {
@@ -23769,11 +23483,11 @@ SWIGINTERN PyObject *_wrap_XcapMessage_getXcapHeaderParamValue(PyObject *self, P
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'XcapMessage_getXcapHeaderParamValue'.\n"
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'XcapMessage_getXcapHeaderParamValue'.\n"
     "  Possible C/C++ prototypes are:\n"
-    "    XcapMessage::getXcapHeaderParamValue(char const *,char const *,unsigned int)\n"
-    "    XcapMessage::getXcapHeaderParamValue(char const *,char const *)\n");
-  return 0;
+    "    getXcapHeaderParamValue(XcapMessage *,char const *,char const *,unsigned int)\n"
+    "    getXcapHeaderParamValue(XcapMessage *,char const *,char const *)\n");
+  return NULL;
 }
 
 
@@ -24016,7 +23730,7 @@ SWIGINTERN PyObject *_wrap_disown_XcapCallback(PyObject *SWIGUNUSEDPARM(self), P
   }
   arg1 = reinterpret_cast< XcapCallback * >(argp1);
   {
-    Swig::Director *director = SWIG_DIRECTOR_CAST(arg1);
+    Swig::Director *director = dynamic_cast<Swig::Director *>(arg1);
     if (director) director->swig_disown();
   }
   
@@ -26051,7 +25765,7 @@ SWIGINTERN PyObject *_wrap_disown_MsrpCallback(PyObject *SWIGUNUSEDPARM(self), P
   }
   arg1 = reinterpret_cast< MsrpCallback * >(argp1);
   {
-    Swig::Director *director = SWIG_DIRECTOR_CAST(arg1);
+    Swig::Director *director = dynamic_cast<Swig::Director *>(arg1);
     if (director) director->swig_disown();
   }
   
@@ -27199,6 +26913,8 @@ SWIG_InitializeModule(void *clientdata) {
   swig_module_info *module_head, *iter;
   int found, init;
   
+  clientdata = clientdata;
+  
   /* check to see if the circular list has been setup, if not, set it up */
   if (swig_module.next==0) {
     /* Initialize the swig_module */
@@ -27509,23 +27225,24 @@ extern "C" {
   swig_varlink_type(void) {
     static char varlink__doc__[] = "Swig var link object";
     static PyTypeObject varlink_type;
-    static int type_init = 0;
+    static int type_init = 0;  
     if (!type_init) {
-      const PyTypeObject tmp = {
+      const PyTypeObject tmp
+      = {
         /* PyObject header changed in Python 3 */
 #if PY_VERSION_HEX >= 0x03000000
-        PyVarObject_HEAD_INIT(NULL, 0)
+        PyVarObject_HEAD_INIT(&PyType_Type, 0)
 #else
         PyObject_HEAD_INIT(NULL)
-        0,                                  /* ob_size */
+        0,                                  /* Number of items in variable part (ob_size) */
 #endif
-        (char *)"swigvarlink",              /* tp_name */
-        sizeof(swig_varlinkobject),         /* tp_basicsize */
-        0,                                  /* tp_itemsize */
-        (destructor) swig_varlink_dealloc,  /* tp_dealloc */
-        (printfunc) swig_varlink_print,     /* tp_print */
-        (getattrfunc) swig_varlink_getattr, /* tp_getattr */
-        (setattrfunc) swig_varlink_setattr, /* tp_setattr */
+        (char *)"swigvarlink",              /* Type name (tp_name) */
+        sizeof(swig_varlinkobject),         /* Basic size (tp_basicsize) */
+        0,                                  /* Itemsize (tp_itemsize) */
+        (destructor) swig_varlink_dealloc,  /* Deallocator (tp_dealloc) */ 
+        (printfunc) swig_varlink_print,     /* Print (tp_print) */
+        (getattrfunc) swig_varlink_getattr, /* get attr (tp_getattr) */
+        (setattrfunc) swig_varlink_setattr, /* Set attr (tp_setattr) */
         0,                                  /* tp_compare */
         (reprfunc) swig_varlink_repr,       /* tp_repr */
         0,                                  /* tp_as_number */
@@ -27549,21 +27266,16 @@ extern "C" {
 #if PY_VERSION_HEX >= 0x02030000
         0,                                  /* tp_del */
 #endif
-#if PY_VERSION_HEX >= 0x02060000
-        0,                                  /* tp_version */
-#endif
 #ifdef COUNT_ALLOCS
         0,0,0,0                             /* tp_alloc -> tp_next */
 #endif
       };
       varlink_type = tmp;
-      type_init = 1;
-#if PY_VERSION_HEX < 0x02020000
+      /* for Python 3 we already assigned ob_type in PyVarObject_HEAD_INIT() */
+#if PY_VERSION_HEX < 0x03000000
       varlink_type.ob_type = &PyType_Type;
-#else
-      if (PyType_Ready(&varlink_type) < 0)
-      return NULL;
 #endif
+      type_init = 1;
     }
     return &varlink_type;
   }
@@ -27614,7 +27326,7 @@ extern "C" {
     for (i = 0; constants[i].type; ++i) {
       switch(constants[i].type) {
       case SWIG_PY_POINTER:
-        obj = SWIG_InternalNewPointerObj(constants[i].pvalue, *(constants[i]).ptype,0);
+        obj = SWIG_NewPointerObj(constants[i].pvalue, *(constants[i]).ptype,0);
         break;
       case SWIG_PY_BINARY:
         obj = SWIG_NewPackedObj(constants[i].pvalue, constants[i].lvalue, *(constants[i].ptype));
@@ -27654,15 +27366,15 @@ extern "C" {
           }
         }
         if (ci) {
-          void *ptr = (ci->type == SWIG_PY_POINTER) ? ci->pvalue : 0;
-          if (ptr) {
-            size_t shift = (ci->ptype) - types;
-            swig_type_info *ty = types_initial[shift];
-            size_t ldoc = (c - methods[i].ml_doc);
-            size_t lptr = strlen(ty->name)+2*sizeof(void*)+2;
-            char *ndoc = (char*)malloc(ldoc + lptr + 10);
-            if (ndoc) {
-              char *buff = ndoc;
+          size_t shift = (ci->ptype) - types;
+          swig_type_info *ty = types_initial[shift];
+          size_t ldoc = (c - methods[i].ml_doc);
+          size_t lptr = strlen(ty->name)+2*sizeof(void*)+2;
+          char *ndoc = (char*)malloc(ldoc + lptr + 10);
+          if (ndoc) {
+            char *buff = ndoc;
+            void *ptr = (ci->type == SWIG_PY_POINTER) ? ci->pvalue : 0;
+            if (ptr) {
               strncpy(buff, methods[i].ml_doc, ldoc);
               buff += ldoc;
               strncpy(buff, "swig_ptr: ", 10);
@@ -27695,19 +27407,10 @@ PyObject*
 void
 #endif
 SWIG_init(void) {
-  PyObject *m, *d, *md;
+  PyObject *m, *d;  
 #if PY_VERSION_HEX >= 0x03000000
   static struct PyModuleDef SWIG_module = {
-# if PY_VERSION_HEX >= 0x03020000
     PyModuleDef_HEAD_INIT,
-# else
-    {
-      PyObject_HEAD_INIT(NULL)
-      NULL, /* m_init */
-      0,    /* m_index */
-      NULL, /* m_copy */
-    },
-# endif
     (char *) SWIG_name,
     NULL,
     -1,
@@ -27719,49 +27422,6 @@ SWIG_init(void) {
   };
 #endif
   
-#if defined(SWIGPYTHON_BUILTIN)
-  static SwigPyClientData SwigPyObject_clientdata = {
-    0, 0, 0, 0, 0, 0, 0
-  };
-  static PyGetSetDef this_getset_def = {
-    (char *)"this", &SwigPyBuiltin_ThisClosure, NULL, NULL, NULL
-  };
-  static SwigPyGetSet thisown_getset_closure = {
-    (PyCFunction) SwigPyObject_own,
-    (PyCFunction) SwigPyObject_own
-  };
-  static PyGetSetDef thisown_getset_def = {
-    (char *)"thisown", SwigPyBuiltin_GetterClosure, SwigPyBuiltin_SetterClosure, NULL, &thisown_getset_closure
-  };
-  PyObject *metatype_args;
-  PyTypeObject *builtin_pytype;
-  int builtin_base_count;
-  swig_type_info *builtin_basetype;
-  PyObject *tuple;
-  PyGetSetDescrObject *static_getset;
-  PyTypeObject *metatype;
-  SwigPyClientData *cd;
-  PyObject *public_interface, *public_symbol;
-  PyObject *this_descr;
-  PyObject *thisown_descr;
-  int i;
-  
-  (void)builtin_pytype;
-  (void)builtin_base_count;
-  (void)builtin_basetype;
-  (void)tuple;
-  (void)static_getset;
-  
-  /* metatype is used to implement static member variables. */
-  metatype_args = Py_BuildValue("(s(O){})", "SwigPyObjectType", &PyType_Type);
-  assert(metatype_args);
-  metatype = (PyTypeObject *) PyType_Type.tp_call((PyObject *) &PyType_Type, metatype_args, NULL);
-  assert(metatype);
-  Py_DECREF(metatype_args);
-  metatype->tp_setattro = (setattrofunc) &SwigPyObjectType_setattro;
-  assert(PyType_Ready(metatype) >= 0);
-#endif
-  
   /* Fix SwigMethods to carry the callback ptrs when needed */
   SWIG_Python_FixMethods(SwigMethods, swig_const_table, swig_types, swig_type_initial);
   
@@ -27770,49 +27430,12 @@ SWIG_init(void) {
 #else
   m = Py_InitModule((char *) SWIG_name, SwigMethods);
 #endif
-  md = d = PyModule_GetDict(m);
-  (void)md;
+  d = PyModule_GetDict(m);
   
   SWIG_InitializeModule(0);
-  
-#ifdef SWIGPYTHON_BUILTIN
-  SwigPyObject_stype = SWIG_MangledTypeQuery("_p_SwigPyObject");
-  assert(SwigPyObject_stype);
-  cd = (SwigPyClientData*) SwigPyObject_stype->clientdata;
-  if (!cd) {
-    SwigPyObject_stype->clientdata = &SwigPyObject_clientdata;
-    SwigPyObject_clientdata.pytype = SwigPyObject_TypeOnce();
-  } else if (SwigPyObject_TypeOnce()->tp_basicsize != cd->pytype->tp_basicsize) {
-    PyErr_SetString(PyExc_RuntimeError, "Import error: attempted to load two incompatible swig-generated modules.");
-# if PY_VERSION_HEX >= 0x03000000
-    return NULL;
-# else
-    return;
-# endif
-  }
-  
-  /* All objects have a 'this' attribute */
-  this_descr = PyDescr_NewGetSet(SwigPyObject_type(), &this_getset_def);
-  (void)this_descr;
-  
-  /* All objects have a 'thisown' attribute */
-  thisown_descr = PyDescr_NewGetSet(SwigPyObject_type(), &thisown_getset_def);
-  (void)thisown_descr;
-  
-  public_interface = PyList_New(0);
-  public_symbol = 0;
-  (void)public_symbol;
-  
-  PyDict_SetItemString(md, "__all__", public_interface);
-  Py_DECREF(public_interface);
-  for (i = 0; SwigMethods[i].ml_name != NULL; ++i)
-  SwigPyBuiltin_AddPublicSymbol(public_interface, SwigMethods[i].ml_name);
-  for (i = 0; swig_const_table[i].name != 0; ++i)
-  SwigPyBuiltin_AddPublicSymbol(public_interface, swig_const_table[i].name);
-#endif
-  
   SWIG_InstallConstants(d,swig_const_table);
   
+  
   SWIG_Python_SetConstant(d, "twrap_media_none",SWIG_From_int(static_cast< int >(twrap_media_none)));
   SWIG_Python_SetConstant(d, "twrap_media_audio",SWIG_From_int(static_cast< int >(twrap_media_audio)));
   SWIG_Python_SetConstant(d, "twrap_media_video",SWIG_From_int(static_cast< int >(twrap_media_video)));
@@ -27934,6 +27557,8 @@ SWIG_init(void) {
   SWIG_Python_SetConstant(d, "tmedia_chroma_yuv422p",SWIG_From_int(static_cast< int >(tmedia_chroma_yuv422p)));
   SWIG_Python_SetConstant(d, "tmedia_chroma_uyvy422",SWIG_From_int(static_cast< int >(tmedia_chroma_uyvy422)));
   SWIG_Python_SetConstant(d, "tmedia_chroma_yuv420p",SWIG_From_int(static_cast< int >(tmedia_chroma_yuv420p)));
+  SWIG_Python_SetConstant(d, "tmedia_chroma_mjpeg",SWIG_From_int(static_cast< int >(tmedia_chroma_mjpeg)));
+  SWIG_Python_SetConstant(d, "tmedia_chroma_yuyv422",SWIG_From_int(static_cast< int >(tmedia_chroma_yuyv422)));
   SWIG_Python_SetConstant(d, "tmedia_mode_none",SWIG_From_int(static_cast< int >(tmedia_mode_none)));
   SWIG_Python_SetConstant(d, "tmedia_mode_optional",SWIG_From_int(static_cast< int >(tmedia_mode_optional)));
   SWIG_Python_SetConstant(d, "tmedia_mode_mandatory",SWIG_From_int(static_cast< int >(tmedia_mode_mandatory)));
@@ -27972,6 +27597,7 @@ SWIG_init(void) {
   SWIG_Python_SetConstant(d, "tmedia_pref_video_size_hvga",SWIG_From_int(static_cast< int >(tmedia_pref_video_size_hvga)));
   SWIG_Python_SetConstant(d, "tmedia_pref_video_size_vga",SWIG_From_int(static_cast< int >(tmedia_pref_video_size_vga)));
   SWIG_Python_SetConstant(d, "tmedia_pref_video_size_4cif",SWIG_From_int(static_cast< int >(tmedia_pref_video_size_4cif)));
+  SWIG_Python_SetConstant(d, "tmedia_pref_video_size_wvga",SWIG_From_int(static_cast< int >(tmedia_pref_video_size_wvga)));
   SWIG_Python_SetConstant(d, "tmedia_pref_video_size_svga",SWIG_From_int(static_cast< int >(tmedia_pref_video_size_svga)));
   SWIG_Python_SetConstant(d, "tmedia_pref_video_size_480p",SWIG_From_int(static_cast< int >(tmedia_pref_video_size_480p)));
   SWIG_Python_SetConstant(d, "tmedia_pref_video_size_720p",SWIG_From_int(static_cast< int >(tmedia_pref_video_size_720p)));
diff --git a/branches/2.0/doubango/bindings/python/tinyWRAP_wrap.h b/branches/2.0/doubango/bindings/python/tinyWRAP_wrap.h
index 4a768eb3..a0648f88 100644
--- a/branches/2.0/doubango/bindings/python/tinyWRAP_wrap.h
+++ b/branches/2.0/doubango/bindings/python/tinyWRAP_wrap.h
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 1.3.40
  * 
  * 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
@@ -28,16 +28,16 @@ public:
 
 /* Internal Director utilities */
 public:
-    bool swig_get_inner(const char* swig_protected_method_name) const {
-      std::map<std::string, bool>::const_iterator iv = swig_inner.find(swig_protected_method_name);
-      return (iv != swig_inner.end() ? iv->second : false);
+    bool swig_get_inner(const char* name) const {
+      std::map<std::string, bool>::const_iterator iv = inner.find(name);
+      return (iv != inner.end() ? iv->second : false);
     }
 
-    void swig_set_inner(const char* swig_protected_method_name, bool val) const
-    { swig_inner[swig_protected_method_name] = val;}
+    void swig_set_inner(const char* name, bool val) const
+    { inner[name] = val;}
 
 private:
-    mutable std::map<std::string, bool> swig_inner;
+    mutable std::map<std::string, bool> inner;
 
 
 #if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
@@ -47,13 +47,13 @@ private:
       if (!method) {
         swig::SwigVar_PyObject name = SWIG_Python_str_FromChar(method_name);
         method = PyObject_GetAttr(swig_get_self(), name);
-        if (!method) {
+        if (method == NULL) {
           std::string msg = "Method in class DDebugCallback doesn't exist, undefined ";
           msg += method_name;
           Swig::DirectorMethodException::raise(msg.c_str());
         }
         vtable[method_index] = method;
-      }
+      };
       return method;
     }
 private:
@@ -73,16 +73,16 @@ public:
 
 /* Internal Director utilities */
 public:
-    bool swig_get_inner(const char* swig_protected_method_name) const {
-      std::map<std::string, bool>::const_iterator iv = swig_inner.find(swig_protected_method_name);
-      return (iv != swig_inner.end() ? iv->second : false);
+    bool swig_get_inner(const char* name) const {
+      std::map<std::string, bool>::const_iterator iv = inner.find(name);
+      return (iv != inner.end() ? iv->second : false);
     }
 
-    void swig_set_inner(const char* swig_protected_method_name, bool val) const
-    { swig_inner[swig_protected_method_name] = val;}
+    void swig_set_inner(const char* name, bool val) const
+    { inner[name] = val;}
 
 private:
-    mutable std::map<std::string, bool> swig_inner;
+    mutable std::map<std::string, bool> inner;
 
 
 #if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
@@ -92,13 +92,13 @@ private:
       if (!method) {
         swig::SwigVar_PyObject name = SWIG_Python_str_FromChar(method_name);
         method = PyObject_GetAttr(swig_get_self(), name);
-        if (!method) {
+        if (method == NULL) {
           std::string msg = "Method in class T140Callback doesn't exist, undefined ";
           msg += method_name;
           Swig::DirectorMethodException::raise(msg.c_str());
         }
         vtable[method_index] = method;
-      }
+      };
       return method;
     }
 private:
@@ -119,16 +119,16 @@ public:
 
 /* Internal Director utilities */
 public:
-    bool swig_get_inner(const char* swig_protected_method_name) const {
-      std::map<std::string, bool>::const_iterator iv = swig_inner.find(swig_protected_method_name);
-      return (iv != swig_inner.end() ? iv->second : false);
+    bool swig_get_inner(const char* name) const {
+      std::map<std::string, bool>::const_iterator iv = inner.find(name);
+      return (iv != inner.end() ? iv->second : false);
     }
 
-    void swig_set_inner(const char* swig_protected_method_name, bool val) const
-    { swig_inner[swig_protected_method_name] = val;}
+    void swig_set_inner(const char* name, bool val) const
+    { inner[name] = val;}
 
 private:
-    mutable std::map<std::string, bool> swig_inner;
+    mutable std::map<std::string, bool> inner;
 
 
 #if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
@@ -138,13 +138,13 @@ private:
       if (!method) {
         swig::SwigVar_PyObject name = SWIG_Python_str_FromChar(method_name);
         method = PyObject_GetAttr(swig_get_self(), name);
-        if (!method) {
+        if (method == NULL) {
           std::string msg = "Method in class ProxyPluginMgrCallback doesn't exist, undefined ";
           msg += method_name;
           Swig::DirectorMethodException::raise(msg.c_str());
         }
         vtable[method_index] = method;
-      }
+      };
       return method;
     }
 private:
@@ -167,16 +167,16 @@ public:
 
 /* Internal Director utilities */
 public:
-    bool swig_get_inner(const char* swig_protected_method_name) const {
-      std::map<std::string, bool>::const_iterator iv = swig_inner.find(swig_protected_method_name);
-      return (iv != swig_inner.end() ? iv->second : false);
+    bool swig_get_inner(const char* name) const {
+      std::map<std::string, bool>::const_iterator iv = inner.find(name);
+      return (iv != inner.end() ? iv->second : false);
     }
 
-    void swig_set_inner(const char* swig_protected_method_name, bool val) const
-    { swig_inner[swig_protected_method_name] = val;}
+    void swig_set_inner(const char* name, bool val) const
+    { inner[name] = val;}
 
 private:
-    mutable std::map<std::string, bool> swig_inner;
+    mutable std::map<std::string, bool> inner;
 
 
 #if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
@@ -186,13 +186,13 @@ private:
       if (!method) {
         swig::SwigVar_PyObject name = SWIG_Python_str_FromChar(method_name);
         method = PyObject_GetAttr(swig_get_self(), name);
-        if (!method) {
+        if (method == NULL) {
           std::string msg = "Method in class ProxyAudioConsumerCallback doesn't exist, undefined ";
           msg += method_name;
           Swig::DirectorMethodException::raise(msg.c_str());
         }
         vtable[method_index] = method;
-      }
+      };
       return method;
     }
 private:
@@ -217,16 +217,16 @@ public:
 
 /* Internal Director utilities */
 public:
-    bool swig_get_inner(const char* swig_protected_method_name) const {
-      std::map<std::string, bool>::const_iterator iv = swig_inner.find(swig_protected_method_name);
-      return (iv != swig_inner.end() ? iv->second : false);
+    bool swig_get_inner(const char* name) const {
+      std::map<std::string, bool>::const_iterator iv = inner.find(name);
+      return (iv != inner.end() ? iv->second : false);
     }
 
-    void swig_set_inner(const char* swig_protected_method_name, bool val) const
-    { swig_inner[swig_protected_method_name] = val;}
+    void swig_set_inner(const char* name, bool val) const
+    { inner[name] = val;}
 
 private:
-    mutable std::map<std::string, bool> swig_inner;
+    mutable std::map<std::string, bool> inner;
 
 
 #if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
@@ -236,13 +236,13 @@ private:
       if (!method) {
         swig::SwigVar_PyObject name = SWIG_Python_str_FromChar(method_name);
         method = PyObject_GetAttr(swig_get_self(), name);
-        if (!method) {
+        if (method == NULL) {
           std::string msg = "Method in class ProxyVideoConsumerCallback doesn't exist, undefined ";
           msg += method_name;
           Swig::DirectorMethodException::raise(msg.c_str());
         }
         vtable[method_index] = method;
-      }
+      };
       return method;
     }
 private:
@@ -266,16 +266,16 @@ public:
 
 /* Internal Director utilities */
 public:
-    bool swig_get_inner(const char* swig_protected_method_name) const {
-      std::map<std::string, bool>::const_iterator iv = swig_inner.find(swig_protected_method_name);
-      return (iv != swig_inner.end() ? iv->second : false);
+    bool swig_get_inner(const char* name) const {
+      std::map<std::string, bool>::const_iterator iv = inner.find(name);
+      return (iv != inner.end() ? iv->second : false);
     }
 
-    void swig_set_inner(const char* swig_protected_method_name, bool val) const
-    { swig_inner[swig_protected_method_name] = val;}
+    void swig_set_inner(const char* name, bool val) const
+    { inner[name] = val;}
 
 private:
-    mutable std::map<std::string, bool> swig_inner;
+    mutable std::map<std::string, bool> inner;
 
 
 #if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
@@ -285,13 +285,13 @@ private:
       if (!method) {
         swig::SwigVar_PyObject name = SWIG_Python_str_FromChar(method_name);
         method = PyObject_GetAttr(swig_get_self(), name);
-        if (!method) {
+        if (method == NULL) {
           std::string msg = "Method in class ProxyAudioProducerCallback doesn't exist, undefined ";
           msg += method_name;
           Swig::DirectorMethodException::raise(msg.c_str());
         }
         vtable[method_index] = method;
-      }
+      };
       return method;
     }
 private:
@@ -314,16 +314,16 @@ public:
 
 /* Internal Director utilities */
 public:
-    bool swig_get_inner(const char* swig_protected_method_name) const {
-      std::map<std::string, bool>::const_iterator iv = swig_inner.find(swig_protected_method_name);
-      return (iv != swig_inner.end() ? iv->second : false);
+    bool swig_get_inner(const char* name) const {
+      std::map<std::string, bool>::const_iterator iv = inner.find(name);
+      return (iv != inner.end() ? iv->second : false);
     }
 
-    void swig_set_inner(const char* swig_protected_method_name, bool val) const
-    { swig_inner[swig_protected_method_name] = val;}
+    void swig_set_inner(const char* name, bool val) const
+    { inner[name] = val;}
 
 private:
-    mutable std::map<std::string, bool> swig_inner;
+    mutable std::map<std::string, bool> inner;
 
 
 #if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
@@ -333,13 +333,13 @@ private:
       if (!method) {
         swig::SwigVar_PyObject name = SWIG_Python_str_FromChar(method_name);
         method = PyObject_GetAttr(swig_get_self(), name);
-        if (!method) {
+        if (method == NULL) {
           std::string msg = "Method in class ProxyVideoProducerCallback doesn't exist, undefined ";
           msg += method_name;
           Swig::DirectorMethodException::raise(msg.c_str());
         }
         vtable[method_index] = method;
-      }
+      };
       return method;
     }
 private:
@@ -367,16 +367,16 @@ public:
 
 /* Internal Director utilities */
 public:
-    bool swig_get_inner(const char* swig_protected_method_name) const {
-      std::map<std::string, bool>::const_iterator iv = swig_inner.find(swig_protected_method_name);
-      return (iv != swig_inner.end() ? iv->second : false);
+    bool swig_get_inner(const char* name) const {
+      std::map<std::string, bool>::const_iterator iv = inner.find(name);
+      return (iv != inner.end() ? iv->second : false);
     }
 
-    void swig_set_inner(const char* swig_protected_method_name, bool val) const
-    { swig_inner[swig_protected_method_name] = val;}
+    void swig_set_inner(const char* name, bool val) const
+    { inner[name] = val;}
 
 private:
-    mutable std::map<std::string, bool> swig_inner;
+    mutable std::map<std::string, bool> inner;
 
 
 #if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
@@ -386,13 +386,13 @@ private:
       if (!method) {
         swig::SwigVar_PyObject name = SWIG_Python_str_FromChar(method_name);
         method = PyObject_GetAttr(swig_get_self(), name);
-        if (!method) {
+        if (method == NULL) {
           std::string msg = "Method in class SipCallback doesn't exist, undefined ";
           msg += method_name;
           Swig::DirectorMethodException::raise(msg.c_str());
         }
         vtable[method_index] = method;
-      }
+      };
       return method;
     }
 private:
@@ -412,16 +412,16 @@ public:
 
 /* Internal Director utilities */
 public:
-    bool swig_get_inner(const char* swig_protected_method_name) const {
-      std::map<std::string, bool>::const_iterator iv = swig_inner.find(swig_protected_method_name);
-      return (iv != swig_inner.end() ? iv->second : false);
+    bool swig_get_inner(const char* name) const {
+      std::map<std::string, bool>::const_iterator iv = inner.find(name);
+      return (iv != inner.end() ? iv->second : false);
     }
 
-    void swig_set_inner(const char* swig_protected_method_name, bool val) const
-    { swig_inner[swig_protected_method_name] = val;}
+    void swig_set_inner(const char* name, bool val) const
+    { inner[name] = val;}
 
 private:
-    mutable std::map<std::string, bool> swig_inner;
+    mutable std::map<std::string, bool> inner;
 
 
 #if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
@@ -431,13 +431,13 @@ private:
       if (!method) {
         swig::SwigVar_PyObject name = SWIG_Python_str_FromChar(method_name);
         method = PyObject_GetAttr(swig_get_self(), name);
-        if (!method) {
+        if (method == NULL) {
           std::string msg = "Method in class XcapCallback doesn't exist, undefined ";
           msg += method_name;
           Swig::DirectorMethodException::raise(msg.c_str());
         }
         vtable[method_index] = method;
-      }
+      };
       return method;
     }
 private:
@@ -457,16 +457,16 @@ public:
 
 /* Internal Director utilities */
 public:
-    bool swig_get_inner(const char* swig_protected_method_name) const {
-      std::map<std::string, bool>::const_iterator iv = swig_inner.find(swig_protected_method_name);
-      return (iv != swig_inner.end() ? iv->second : false);
+    bool swig_get_inner(const char* name) const {
+      std::map<std::string, bool>::const_iterator iv = inner.find(name);
+      return (iv != inner.end() ? iv->second : false);
     }
 
-    void swig_set_inner(const char* swig_protected_method_name, bool val) const
-    { swig_inner[swig_protected_method_name] = val;}
+    void swig_set_inner(const char* name, bool val) const
+    { inner[name] = val;}
 
 private:
-    mutable std::map<std::string, bool> swig_inner;
+    mutable std::map<std::string, bool> inner;
 
 
 #if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
@@ -476,13 +476,13 @@ private:
       if (!method) {
         swig::SwigVar_PyObject name = SWIG_Python_str_FromChar(method_name);
         method = PyObject_GetAttr(swig_get_self(), name);
-        if (!method) {
+        if (method == NULL) {
           std::string msg = "Method in class MsrpCallback doesn't exist, undefined ";
           msg += method_name;
           Swig::DirectorMethodException::raise(msg.c_str());
         }
         vtable[method_index] = method;
-      }
+      };
       return method;
     }
 private: