- Add audio proxy consumer/producer for android phones

- Add Microsoft DirectSound Producer

trunk/android-projects/buildAll.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 # Build tinyDEMO for Google Android Systems
 
-for project in tinySAK tinyNET tinyIPSec tinySMS tinyHTTP tinySDP tinyMEDIA tinySIP tinyDAV tinyDEMO
+for project in tinySAK tinyNET tinyIPSec tinySMS tinySIGCOMP tinyHTTP tinySDP tinyRTP tinyMEDIA tinySIP tinyDAV tinyDEMO
 do
 	echo -e building "$project....\n"
 	make PROJECT=$project clean

trunk/bindings/_common/ProxyConsumer.cxx

@@ -0,0 +1,229 @@
+/*
+* Copyright (C) 2009 Mamadou Diop.
+*
+* Contact: Mamadou Diop <diopmamadou(at)doubango.org>
+*	
+* This file is part of Open Source Doubango Framework.
+*
+* DOUBANGO is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*	
+* DOUBANGO is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*	
+* You should have received a copy of the GNU General Public License
+* along with DOUBANGO.
+*
+*/
+
+/**@file ProxyConsumer.c
+ * @brief Audio/Video proxy consumers.
+ *
+ * @author Mamadou Diop <diopmamadou(at)doubango.org>
+ *
+ * @date Created: Sat Nov 8 16:54:58 2009 mdiop
+ */
+#include "ProxyConsumer.h"
+
+#include "tsk_memory.h"
+#include "tsk_debug.h"
+
+#include "tinydav/audio/tdav_consumer_audio.h"
+
+typedef struct twrap_consumer_proxy_audio_s
+{
+	TDAV_DECLARE_CONSUMER_AUDIO;
+
+	tsk_bool_t started;
+}
+twrap_consumer_proxy_audio_t;
+
+
+
+/* ============ Media Consumer Interface ================= */
+int twrap_consumer_proxy_audio_prepare(tmedia_consumer_t* self, const tmedia_codec_t* codec)
+{
+	if(ProxyAudioConsumer::instance && codec){
+		ProxyAudioConsumer::instance->takeConsumer((twrap_consumer_proxy_audio_t*)self);
+		ProxyAudioConsumer::instance->prepare(20, codec->plugin->rate, codec->plugin->audio.channels);
+	}
+	return 0;
+}
+
+int twrap_consumer_proxy_audio_start(tmedia_consumer_t* self)
+{
+	twrap_consumer_proxy_audio_t* consumer = (twrap_consumer_proxy_audio_t*)self;
+
+	if(ProxyAudioConsumer::instance){
+		ProxyAudioConsumer::instance->start();
+	}
+
+	consumer->started = tsk_true;
+
+	return 0;
+}
+
+int twrap_consumer_proxy_audio_consume(tmedia_consumer_t* self, void** buffer, tsk_size_t size, const tsk_object_t* proto_hdr)
+{
+	twrap_consumer_proxy_audio_t* consumer = (twrap_consumer_proxy_audio_t*)self;
+
+	if(!consumer || !buffer || !*buffer || !size){
+		TSK_DEBUG_ERROR("Invalid parameter");
+		return -1;
+	}
+	
+	if(ProxyAudioConsumer::instance){
+		return tdav_consumer_audio_put(TDAV_CONSUMER_AUDIO(consumer), buffer, proto_hdr);
+	}
+	else{
+		return 0;
+	}
+}
+
+int twrap_consumer_proxy_audio_pause(tmedia_consumer_t* self)
+{
+	if(ProxyAudioConsumer::instance){
+		ProxyAudioConsumer::instance->pause();
+	}
+
+	return 0;
+}
+
+int twrap_consumer_proxy_audio_stop(tmedia_consumer_t* self)
+{
+	twrap_consumer_proxy_audio_t* consumer = (twrap_consumer_proxy_audio_t*)self;
+
+	if(ProxyAudioConsumer::instance){
+		ProxyAudioConsumer::instance->stop();
+		ProxyAudioConsumer::instance->releaseConsumer((twrap_consumer_proxy_audio_t*)self);
+	}
+
+	consumer->started = tsk_false;
+
+	return 0;
+}
+
+
+//
+//	Audio consumer object definition
+//
+/* constructor */
+static tsk_object_t* twrap_consumer_proxy_audio_ctor(tsk_object_t * self, va_list * app)
+{
+	twrap_consumer_proxy_audio_t *consumer = (twrap_consumer_proxy_audio_t *)self;
+	if(consumer){
+		/* init base */
+		tdav_consumer_audio_init(TDAV_CONSUMER_AUDIO(consumer));
+		/* init self */
+
+		/* do not call takeConsumer() */
+	}
+	return self;
+}
+/* destructor */
+static tsk_object_t* twrap_consumer_proxy_audio_dtor(tsk_object_t * self)
+{ 
+	twrap_consumer_proxy_audio_t *consumer = (twrap_consumer_proxy_audio_t *)self;
+	if(consumer){
+
+		/* stop */
+		if(consumer->started){
+			twrap_consumer_proxy_audio_stop(TMEDIA_CONSUMER(consumer));
+		}
+
+		/* deinit base */
+		tdav_consumer_audio_deinit(TDAV_CONSUMER_AUDIO(consumer));
+		/* deinit self */
+
+		/* do not call releaseConsumer() */
+	}
+
+	return self;
+}
+/* object definition */
+static const tsk_object_def_t twrap_consumer_proxy_audio_def_s = 
+{
+	sizeof(twrap_consumer_proxy_audio_t),
+	twrap_consumer_proxy_audio_ctor, 
+	twrap_consumer_proxy_audio_dtor,
+	tdav_consumer_audio_cmp, 
+};
+/* plugin definition*/
+static const tmedia_consumer_plugin_def_t twrap_consumer_proxy_audio_plugin_def_s = 
+{
+	&twrap_consumer_proxy_audio_def_s,
+	
+	tmedia_audio,
+	"Audio Proxy Consumer",
+	
+	twrap_consumer_proxy_audio_prepare,
+	twrap_consumer_proxy_audio_start,
+	twrap_consumer_proxy_audio_consume,
+	twrap_consumer_proxy_audio_pause,
+	twrap_consumer_proxy_audio_stop
+};
+//extern "C" {
+TINYWRAP_GEXTERN const tmedia_consumer_plugin_def_t *twrap_consumer_proxy_audio_plugin_def_t = &twrap_consumer_proxy_audio_plugin_def_s;
+//}
+
+
+ProxyAudioConsumer* ProxyAudioConsumer::instance = tsk_null;
+
+ProxyAudioConsumer::ProxyAudioConsumer()
+:consumer(tsk_null)
+{
+}
+
+ProxyAudioConsumer::~ProxyAudioConsumer()
+{
+	this->releaseConsumer(this->consumer);
+
+	if(ProxyAudioConsumer::instance == this){
+		ProxyAudioConsumer::instance = tsk_null;
+	}
+}
+
+void ProxyAudioConsumer::setActivate()
+{
+	ProxyAudioConsumer::instance = this;
+}
+
+unsigned ProxyAudioConsumer::pull(void* output, unsigned size)
+{
+	if(this->consumer){
+		void* data;
+		if((data = tdav_consumer_audio_get(TDAV_CONSUMER_AUDIO(this->consumer)))){
+			memcpy(output, data, size);
+			TSK_FREE(data);
+			return size;
+		}
+	}
+	return 0;
+}
+
+void ProxyAudioConsumer::takeConsumer(twrap_consumer_proxy_audio_t* _consumer)
+{
+	if(!this->consumer){
+		this->consumer = (twrap_consumer_proxy_audio_t*)tsk_object_ref(_consumer);
+	}
+}
+
+void ProxyAudioConsumer::releaseConsumer(twrap_consumer_proxy_audio_t* _consumer)
+{
+	TSK_OBJECT_SAFE_FREE(this->consumer);
+}
+
+bool ProxyAudioConsumer::registerPlugin()
+{
+	/* HACK: Unregister all other audio plugins */
+	tmedia_consumer_plugin_unregister_by_type(tmedia_audio);
+	/* Register our proxy plugin */
+	return (tmedia_consumer_plugin_register(twrap_consumer_proxy_audio_plugin_def_t) == 0);
+}
+
+
+

trunk/bindings/_common/ProxyConsumer.h

@@ -0,0 +1,66 @@
+/*
+* Copyright (C) 2009 Mamadou Diop.
+*
+* Contact: Mamadou Diop <diopmamadou(at)doubango.org>
+*	
+* This file is part of Open Source Doubango Framework.
+*
+* DOUBANGO is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*	
+* DOUBANGO is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*	
+* You should have received a copy of the GNU General Public License
+* along with DOUBANGO.
+*
+*/
+
+/**@file ProxyConsumer.h
+ * @brief Audio/Video proxy consumers.
+ *
+ * @author Mamadou Diop <diopmamadou(at)doubango.org>
+ *
+ * @date Created: Sat Nov 8 16:54:58 2009 mdiop
+ */
+#ifndef TINYWRAP_CONSUMER_PROXY_H
+#define TINYWRAP_CONSUMER_PROXY_H
+
+#include "tinyWRAP_config.h"
+
+class ProxyAudioConsumer
+{
+public:
+	ProxyAudioConsumer();
+	virtual ~ProxyAudioConsumer();
+
+	/* Callback functions */
+	virtual int prepare(int ptime, int rate, int channels) { return 0; }
+	virtual int start() { return 0; }
+	virtual int pause() { return 0; }
+	virtual int stop() { return 0; }
+
+	void setActivate();
+	unsigned pull(void* output, unsigned size);
+
+public:
+	static bool registerPlugin();
+
+#if !defined(SWIG)
+	void takeConsumer(struct twrap_consumer_proxy_audio_s*);
+	void releaseConsumer(struct twrap_consumer_proxy_audio_s*);
+	static ProxyAudioConsumer* instance;
+#endif
+
+private:
+	struct twrap_consumer_proxy_audio_s* consumer;
+};
+
+
+
+
+#endif /* TINYWRAP_CONSUMER_PROXY_H */

trunk/bindings/_common/ProxyProducer.cxx

@@ -0,0 +1,206 @@
+/*
+* Copyright (C) 2009 Mamadou Diop.
+*
+* Contact: Mamadou Diop <diopmamadou(at)doubango.org>
+*	
+* This file is part of Open Source Doubango Framework.
+*
+* DOUBANGO is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*	
+* DOUBANGO is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*	
+* You should have received a copy of the GNU General Public License
+* along with DOUBANGO.
+*
+*/
+
+/**@file ProxyProducer.c
+ * @brief Audio/Video proxy producers.
+ *
+ * @author Mamadou Diop <diopmamadou(at)doubango.org>
+ *
+ * @date Created: Sat Nov 8 16:54:58 2009 mdiop
+ */
+#include "ProxyProducer.h"
+
+#include "tsk_memory.h"
+#include "tsk_debug.h"
+
+#include "tinydav/audio/tdav_producer_audio.h"
+
+typedef struct twrap_producer_proxy_audio_s
+{
+	TDAV_DECLARE_PRODUCER_AUDIO;
+
+	tsk_bool_t started;
+}
+twrap_producer_proxy_audio_t;
+
+
+
+/* ============ Media Producer Interface ================= */
+int twrap_producer_proxy_audio_prepare(tmedia_producer_t* self, const tmedia_codec_t* codec)
+{
+	if(ProxyAudioProducer::instance && codec){
+		ProxyAudioProducer::instance->takeProducer((twrap_producer_proxy_audio_t*)self);
+		ProxyAudioProducer::instance->prepare(20, codec->plugin->rate, codec->plugin->audio.channels);
+	}
+	return 0;
+}
+
+int twrap_producer_proxy_audio_start(tmedia_producer_t* self)
+{
+	twrap_producer_proxy_audio_t* producer = (twrap_producer_proxy_audio_t*)self;
+
+	if(ProxyAudioProducer::instance){
+		ProxyAudioProducer::instance->start();
+	}
+
+	producer->started = tsk_true;
+
+	return 0;
+}
+
+int twrap_producer_proxy_audio_pause(tmedia_producer_t* self)
+{
+	if(ProxyAudioProducer::instance){
+		ProxyAudioProducer::instance->pause();
+	}
+
+	return 0;
+}
+
+int twrap_producer_proxy_audio_stop(tmedia_producer_t* self)
+{
+	twrap_producer_proxy_audio_t* producer = (twrap_producer_proxy_audio_t*)self;
+
+	if(ProxyAudioProducer::instance){
+		ProxyAudioProducer::instance->stop();
+		ProxyAudioProducer::instance->releaseProducer((twrap_producer_proxy_audio_t*)self);
+	}
+
+	producer->started = tsk_false;
+
+	return 0;
+}
+
+
+//
+//	Audio producer object definition
+//
+/* constructor */
+static tsk_object_t* twrap_producer_proxy_audio_ctor(tsk_object_t * self, va_list * app)
+{
+	twrap_producer_proxy_audio_t *producer = (twrap_producer_proxy_audio_t *)self;
+	if(producer){
+		/* init base */
+		tdav_producer_audio_init(TDAV_PRODUCER_AUDIO(producer));
+		/* init self */
+
+		/* do not call takeProducer() */
+	}
+	return self;
+}
+/* destructor */
+static tsk_object_t* twrap_producer_proxy_audio_dtor(tsk_object_t * self)
+{ 
+	twrap_producer_proxy_audio_t *producer = (twrap_producer_proxy_audio_t *)self;
+	if(producer){
+
+		/* stop */
+		if(producer->started){
+			twrap_producer_proxy_audio_stop(TMEDIA_PRODUCER(producer));
+		}
+
+		/* deinit base */
+		tdav_producer_audio_deinit(TDAV_PRODUCER_AUDIO(producer));
+		/* deinit self */
+
+		/* do not call releaseProducer() */
+	}
+
+	return self;
+}
+/* object definition */
+static const tsk_object_def_t twrap_producer_proxy_audio_def_s = 
+{
+	sizeof(twrap_producer_proxy_audio_t),
+	twrap_producer_proxy_audio_ctor, 
+	twrap_producer_proxy_audio_dtor,
+	tdav_producer_audio_cmp, 
+};
+/* plugin definition*/
+static const tmedia_producer_plugin_def_t twrap_producer_proxy_audio_plugin_def_s = 
+{
+	&twrap_producer_proxy_audio_def_s,
+	
+	tmedia_audio,
+	"Audio Proxy Producer",
+	
+	twrap_producer_proxy_audio_prepare,
+	twrap_producer_proxy_audio_start,
+	twrap_producer_proxy_audio_pause,
+	twrap_producer_proxy_audio_stop
+};
+//extern "C" {
+TINYWRAP_GEXTERN const tmedia_producer_plugin_def_t *twrap_producer_proxy_audio_plugin_def_t = &twrap_producer_proxy_audio_plugin_def_s;
+//}
+
+
+ProxyAudioProducer* ProxyAudioProducer::instance = tsk_null;
+
+ProxyAudioProducer::ProxyAudioProducer()
+:producer(tsk_null)
+{
+}
+
+ProxyAudioProducer::~ProxyAudioProducer()
+{
+	this->releaseProducer(this->producer);
+
+	if(ProxyAudioProducer::instance == this){
+		ProxyAudioProducer::instance = tsk_null;
+	}
+}
+
+void ProxyAudioProducer::setActivate()
+{
+	ProxyAudioProducer::instance = this;
+}
+
+int ProxyAudioProducer::push(const void* buffer, unsigned size)
+{
+	if(this->producer && TMEDIA_PRODUCER(this->producer)->callback){
+		return TMEDIA_PRODUCER(this->producer)->callback(TMEDIA_PRODUCER(this->producer)->callback_data, buffer, size);
+	}
+	return 0;
+}
+
+void ProxyAudioProducer::takeProducer(twrap_producer_proxy_audio_t* _producer)
+{
+	if(!this->producer){
+		this->producer = (twrap_producer_proxy_audio_t*)tsk_object_ref(_producer);
+	}
+}
+
+void ProxyAudioProducer::releaseProducer(twrap_producer_proxy_audio_t* _producer)
+{
+	TSK_OBJECT_SAFE_FREE(this->producer);
+}
+
+bool ProxyAudioProducer::registerPlugin()
+{
+	/* HACK: Unregister all other audio plugins */
+	tmedia_producer_plugin_unregister_by_type(tmedia_audio);
+	/* Register our proxy plugin */
+	return (tmedia_producer_plugin_register(twrap_producer_proxy_audio_plugin_def_t) == 0);
+}
+
+
+

trunk/bindings/_common/ProxyProducer.h

@@ -0,0 +1,63 @@
+/*
+* Copyright (C) 2009 Mamadou Diop.
+*
+* Contact: Mamadou Diop <diopmamadou(at)doubango.org>
+*	
+* This file is part of Open Source Doubango Framework.
+*
+* DOUBANGO is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*	
+* DOUBANGO is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*	
+* You should have received a copy of the GNU General Public License
+* along with DOUBANGO.
+*
+*/
+
+/**@file ProxyProducer.h
+ * @brief Audio/Video proxy consumers.
+ *
+ * @author Mamadou Diop <diopmamadou(at)doubango.org>
+ *
+ * @date Created: Sat Nov 8 16:54:58 2009 mdiop
+ */
+#ifndef TINYWRAP_PRODUCER_PROXY_H
+#define TINYWRAP_PRODUCER_PROXY_H
+
+#include "tinyWRAP_config.h"
+
+class ProxyAudioProducer
+{
+public:
+	ProxyAudioProducer();
+	virtual ~ProxyAudioProducer();
+
+	/* Callback functions */
+	virtual int prepare(int ptime, int rate, int channels) { return 0; }
+	virtual int start() { return 0; }
+	virtual int pause() { return 0; }
+	virtual int stop() { return 0; }
+
+	void setActivate();
+	int push(const void* buffer, unsigned size);
+
+public:
+	static bool registerPlugin();
+
+#if !defined(SWIG)
+	void takeProducer(struct twrap_producer_proxy_audio_s*);
+	void releaseProducer(struct twrap_producer_proxy_audio_s*);
+	static ProxyAudioProducer* instance;
+#endif
+
+private:
+	struct twrap_producer_proxy_audio_s* producer;
+};
+
+#endif /* TINYWRAP_PRODUCER_PROXY_H */

trunk/bindings/_common/SipSession.cxx

@@ -154,6 +154,44 @@ const SipStack* SipSession::getStack()const
 }
 
 
+
+/* ======================== CallSession ========================*/
+CallSession::CallSession(SipStack* Stack)
+: SipSession(Stack)
+{
+}
+
+CallSession::CallSession(SipStack* Stack, tsip_ssession_handle_t* handle)
+: SipSession(Stack, handle)
+{
+}
+
+CallSession::~CallSession()
+{
+}
+
+bool CallSession::Call(const char* remoteUri)
+{
+	tsip_ssession_set(this->handle,
+		TSIP_SSESSION_SET_TO(remoteUri),
+		TSIP_SSESSION_SET_NULL());
+
+	int ret = tsip_action_INVITE(this->handle,
+		TSIP_ACTION_SET_NULL());
+	return (ret == 0);
+}
+
+bool CallSession::Hangup()
+{
+	int ret = tsip_action_BYE(this->handle,
+		TSIP_ACTION_SET_NULL());
+	return (ret == 0);
+}
+
+
+
+
+
 /* ======================== MessagingSession ========================*/
 MessagingSession::MessagingSession(SipStack* Stack)
 : SipSession(Stack)
@@ -200,7 +238,7 @@ bool MessagingSession::Reject()
 }
 
 
-/* ======================== PublicationSession ========================*/
+/* ======================== OptionsSession ========================*/
 OptionsSession::OptionsSession(SipStack* Stack)
 : SipSession(Stack)
 {

trunk/bindings/_common/SipSession.h

@@ -63,6 +63,20 @@ protected:
 };
 
 
+/* ======================== CallSession ========================*/
+class CallSession : public SipSession
+{
+public: /* ctor() and dtor() */
+	CallSession(SipStack* Stack);
+#if !defined(SWIG)
+	CallSession(SipStack* Stack, tsip_ssession_handle_t* handle);
+#endif
+	virtual ~CallSession();
+
+public: /* Public functions */
+	bool Call(const char* remoteUri);
+	bool Hangup();
+};
 
 /* ======================== MessagingSession ========================*/
 class MessagingSession : public SipSession

trunk/bindings/_common/SipStack.cxx

@@ -21,6 +21,8 @@
 */
 #include "SipStack.h"
 
+#include "tinydav/tdav.h"
+
 #include "SipSession.h"
 #include "SipEvent.h"
 
@@ -52,6 +54,7 @@ SipStack::SipStack(SipCallback* callback_, const char* realm_uri, const char* im
 
 	/* Initialize network layer */
 	if(SipStack::count == 0){
+		tdav_init();
 		tnet_startup();
 	}
 
@@ -73,6 +76,7 @@ SipStack::~SipStack()
 
 	/* DeInitialize the network layer (only if last stack) */
 	if(--SipStack::count == 0){
+		tdav_deinit();
 		tnet_cleanup();
 	}
 }

trunk/bindings/_common/SipStack.i

@@ -5,13 +5,18 @@
 #include "SipEvent.h"
 #include "SipSession.h"
 
+#include "ProxyConsumer.h"
+#include "ProxyProducer.h"
+
 #include "SipCallback.h"
 #include "SafeObject.h"
 #include "SipStack.h"
 %}
 
-/* turn on director wrapping Callback */
+/* Callbacks */
 %feature("director") SipCallback;
+%feature("director") ProxyAudioConsumer;
+%feature("director") ProxyAudioProducer;
 
 
 %nodefaultctor;
@@ -20,6 +25,9 @@
 %include "SipEvent.h"
 %include "SipSession.h"
 
+%include "ProxyConsumer.h"
+%include "ProxyProducer.h"
+
 %include "SipCallback.h"
 %include "SafeObject.h"
 %include "SipStack.h"

trunk/bindings/_common/tinyWRAP_config.h

@@ -0,0 +1,68 @@
+/*
+* Copyright (C) 2009 Mamadou Diop.
+*
+* Contact: Mamadou Diop <diopmamadou(at)doubango.org>
+*	
+* This file is part of Open Source Doubango Framework.
+*
+* DOUBANGO is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*	
+* DOUBANGO is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*	
+* You should have received a copy of the GNU General Public License
+* along with DOUBANGO.
+*
+*/
+
+#ifndef TINYWRAP_CONFIG_H
+#define TINYWRAP_CONFIG_H
+
+#ifdef __SYMBIAN32__
+#undef _WIN32 /* Because of WINSCW */
+#endif
+
+/* Windows (XP/Vista/7/CE and Windows Mobile) macro definition.
+*/
+#if defined(WIN32)|| defined(_WIN32) || defined(_WIN32_WCE)
+#	define TWRAP_UNDER_WINDOWS	1
+#endif
+
+#if (TWRAP_UNDER_WINDOWS || defined(__SYMBIAN32__)) && defined(TINYWRAP_EXPORTS)
+# 	define TINYWRAP_API		__declspec(dllexport)
+# 	define TINYWRAP_GEXTERN __declspec(dllexport)
+#elif (TWRAP_UNDER_WINDOWS || defined(__SYMBIAN32__)) /*&& defined(TINYWRAP_IMPORTS)*/
+# 	define TINYWRAP_API __declspec(dllimport)
+# 	define TINYWRAP_GEXTERN __declspec(dllimport)
+#else
+#	define TINYWRAP_API
+#	define TINYWRAP_GEXTERN	extern
+#endif
+
+/* Guards against C++ name mangling 
+*/
+#ifdef __cplusplus
+#	define TWRAP_BEGIN_DECLS extern "C" {
+#	define TWRAP_END_DECLS }
+#else
+#	define TWRAP_BEGIN_DECLS 
+#	define TWRAP_END_DECLS
+#endif
+
+/* Disable some well-known warnings
+*/
+#ifdef _MSC_VER
+#	define _CRT_SECURE_NO_WARNINGS
+#endif
+
+
+#if HAVE_CONFIG_H
+	#include "../config.h"
+#endif
+
+#endif // TINYWRAP_CONFIG_H

trunk/bindings/autogen.sh

@@ -12,6 +12,8 @@ sed -i 's/dynamic_cast/static_cast/g' java/android/tinyWRAP_wrap.cxx
 sed -i 's/AttachCurrentThread((void \*\*)/AttachCurrentThread((JNIEnv \*\*)/g' java/android/tinyWRAP_wrap.cxx
 sed -i 's/_director_connect(this, swigCPtr, swigCMemOwn, true)/_director_connect(this, swigCPtr, swigCMemOwn, false)/g' java/android/SipCallback.java
 sed -i 's/_director_connect(this, swigCPtr, swigCMemOwn, true)/_director_connect(this, swigCPtr, swigCMemOwn, false)/g' java/android/DDebugCallback.java
+sed -i 's/_director_connect(this, swigCPtr, swigCMemOwn, true)/_director_connect(this, swigCPtr, swigCMemOwn, false)/g' java/android/ProxyAudioConsumer.java
+sed -i 's/_director_connect(this, swigCPtr, swigCMemOwn, true)/_director_connect(this, swigCPtr, swigCMemOwn, false)/g' java/android/ProxyAudioProducer.java
 
 
 ##### Python

trunk/bindings/csharp/CallSession.cs

@@ -0,0 +1,53 @@
+/* ----------------------------------------------------------------------------
+ * This file was automatically generated by SWIG (http://www.swig.org).
+ * Version 1.3.39
+ *
+ * Do not make changes to this file unless you know what you are doing--modify
+ * the SWIG interface file instead.
+ * ----------------------------------------------------------------------------- */
+
+
+using System;
+using System.Runtime.InteropServices;
+
+public class CallSession : SipSession {
+  private HandleRef swigCPtr;
+
+  internal CallSession(IntPtr cPtr, bool cMemoryOwn) : base(tinyWRAPPINVOKE.CallSessionUpcast(cPtr), cMemoryOwn) {
+    swigCPtr = new HandleRef(this, cPtr);
+  }
+
+  internal static HandleRef getCPtr(CallSession obj) {
+    return (obj == null) ? new HandleRef(null, IntPtr.Zero) : obj.swigCPtr;
+  }
+
+  ~CallSession() {
+    Dispose();
+  }
+
+  public override void Dispose() {
+    lock(this) {
+      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
+        swigCMemOwn = false;
+        tinyWRAPPINVOKE.delete_CallSession(swigCPtr);
+      }
+      swigCPtr = new HandleRef(null, IntPtr.Zero);
+      GC.SuppressFinalize(this);
+      base.Dispose();
+    }
+  }
+
+  public CallSession(SipStack Stack) : this(tinyWRAPPINVOKE.new_CallSession(SipStack.getCPtr(Stack)), true) {
+  }
+
+  public bool Call(string remoteUri) {
+    bool ret = tinyWRAPPINVOKE.CallSession_Call(swigCPtr, remoteUri);
+    return ret;
+  }
+
+  public bool Hangup() {
+    bool ret = tinyWRAPPINVOKE.CallSession_Hangup(swigCPtr);
+    return ret;
+  }
+
+}

trunk/bindings/csharp/DDebugCallback.cs

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 1.3.39
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -29,13 +29,11 @@ public class DDebugCallback : IDisposable {
 
   public virtual void Dispose() {
     lock(this) {
-      if (swigCPtr.Handle != IntPtr.Zero) {
-        if (swigCMemOwn) {
-          swigCMemOwn = false;
-          tinyWRAPPINVOKE.delete_DDebugCallback(swigCPtr);
-        }
-        swigCPtr = new HandleRef(null, IntPtr.Zero);
+      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
+        swigCMemOwn = false;
+        tinyWRAPPINVOKE.delete_DDebugCallback(swigCPtr);
       }
+      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
     }
   }

trunk/bindings/csharp/DialogEvent.cs

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 1.3.39
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -27,13 +27,11 @@ public class DialogEvent : SipEvent {
 
   public override void Dispose() {
     lock(this) {
-      if (swigCPtr.Handle != IntPtr.Zero) {
-        if (swigCMemOwn) {
-          swigCMemOwn = false;
-          tinyWRAPPINVOKE.delete_DialogEvent(swigCPtr);
-        }
-        swigCPtr = new HandleRef(null, IntPtr.Zero);
+      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
+        swigCMemOwn = false;
+        tinyWRAPPINVOKE.delete_DialogEvent(swigCPtr);
       }
+      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
       base.Dispose();
     }

trunk/bindings/csharp/MessagingEvent.cs

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 1.3.39
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -27,13 +27,11 @@ public class MessagingEvent : SipEvent {
 
   public override void Dispose() {
     lock(this) {
-      if (swigCPtr.Handle != IntPtr.Zero) {
-        if (swigCMemOwn) {
-          swigCMemOwn = false;
-          tinyWRAPPINVOKE.delete_MessagingEvent(swigCPtr);
-        }
-        swigCPtr = new HandleRef(null, IntPtr.Zero);
+      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
+        swigCMemOwn = false;
+        tinyWRAPPINVOKE.delete_MessagingEvent(swigCPtr);
       }
+      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
       base.Dispose();
     }

trunk/bindings/csharp/MessagingSession.cs

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 1.3.39
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -27,13 +27,11 @@ public class MessagingSession : SipSession {
 
   public override void Dispose() {
     lock(this) {
-      if (swigCPtr.Handle != IntPtr.Zero) {
-        if (swigCMemOwn) {
-          swigCMemOwn = false;
-          tinyWRAPPINVOKE.delete_MessagingSession(swigCPtr);
-        }
-        swigCPtr = new HandleRef(null, IntPtr.Zero);
+      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
+        swigCMemOwn = false;
+        tinyWRAPPINVOKE.delete_MessagingSession(swigCPtr);
       }
+      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
       base.Dispose();
     }

trunk/bindings/csharp/OptionsEvent.cs

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 1.3.39
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -27,13 +27,11 @@ public class OptionsEvent : SipEvent {
 
   public override void Dispose() {
     lock(this) {
-      if (swigCPtr.Handle != IntPtr.Zero) {
-        if (swigCMemOwn) {
-          swigCMemOwn = false;
-          tinyWRAPPINVOKE.delete_OptionsEvent(swigCPtr);
-        }
-        swigCPtr = new HandleRef(null, IntPtr.Zero);
+      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
+        swigCMemOwn = false;
+        tinyWRAPPINVOKE.delete_OptionsEvent(swigCPtr);
       }
+      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
       base.Dispose();
     }

trunk/bindings/csharp/OptionsSession.cs

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 1.3.39
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -27,13 +27,11 @@ public class OptionsSession : SipSession {
 
   public override void Dispose() {
     lock(this) {
-      if (swigCPtr.Handle != IntPtr.Zero) {
-        if (swigCMemOwn) {
-          swigCMemOwn = false;
-          tinyWRAPPINVOKE.delete_OptionsSession(swigCPtr);
-        }
-        swigCPtr = new HandleRef(null, IntPtr.Zero);
+      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
+        swigCMemOwn = false;
+        tinyWRAPPINVOKE.delete_OptionsSession(swigCPtr);
       }
+      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
       base.Dispose();
     }

trunk/bindings/csharp/ProxyAudioConsumer.cs

@@ -0,0 +1,127 @@
+/* ----------------------------------------------------------------------------
+ * This file was automatically generated by SWIG (http://www.swig.org).
+ * Version 1.3.39
+ *
+ * Do not make changes to this file unless you know what you are doing--modify
+ * the SWIG interface file instead.
+ * ----------------------------------------------------------------------------- */
+
+
+using System;
+using System.Runtime.InteropServices;
+
+public class ProxyAudioConsumer : IDisposable {
+  private HandleRef swigCPtr;
+  protected bool swigCMemOwn;
+
+  internal ProxyAudioConsumer(IntPtr cPtr, bool cMemoryOwn) {
+    swigCMemOwn = cMemoryOwn;
+    swigCPtr = new HandleRef(this, cPtr);
+  }
+
+  internal static HandleRef getCPtr(ProxyAudioConsumer obj) {
+    return (obj == null) ? new HandleRef(null, IntPtr.Zero) : obj.swigCPtr;
+  }
+
+  ~ProxyAudioConsumer() {
+    Dispose();
+  }
+
+  public virtual void Dispose() {
+    lock(this) {
+      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
+        swigCMemOwn = false;
+        tinyWRAPPINVOKE.delete_ProxyAudioConsumer(swigCPtr);
+      }
+      swigCPtr = new HandleRef(null, IntPtr.Zero);
+      GC.SuppressFinalize(this);
+    }
+  }
+
+  public ProxyAudioConsumer() : this(tinyWRAPPINVOKE.new_ProxyAudioConsumer(), true) {
+    SwigDirectorConnect();
+  }
+
+  public virtual int prepare(int ptime, int rate, int channels) {
+    int ret = ((this.GetType() == typeof(ProxyAudioConsumer)) ? tinyWRAPPINVOKE.ProxyAudioConsumer_prepare(swigCPtr, ptime, rate, channels) : tinyWRAPPINVOKE.ProxyAudioConsumer_prepareSwigExplicitProxyAudioConsumer(swigCPtr, ptime, rate, channels));
+    return ret;
+  }
+
+  public virtual int start() {
+    int ret = ((this.GetType() == typeof(ProxyAudioConsumer)) ? tinyWRAPPINVOKE.ProxyAudioConsumer_start(swigCPtr) : tinyWRAPPINVOKE.ProxyAudioConsumer_startSwigExplicitProxyAudioConsumer(swigCPtr));
+    return ret;
+  }
+
+  public virtual int pause() {
+    int ret = ((this.GetType() == typeof(ProxyAudioConsumer)) ? tinyWRAPPINVOKE.ProxyAudioConsumer_pause(swigCPtr) : tinyWRAPPINVOKE.ProxyAudioConsumer_pauseSwigExplicitProxyAudioConsumer(swigCPtr));
+    return ret;
+  }
+
+  public virtual int stop() {
+    int ret = ((this.GetType() == typeof(ProxyAudioConsumer)) ? tinyWRAPPINVOKE.ProxyAudioConsumer_stop(swigCPtr) : tinyWRAPPINVOKE.ProxyAudioConsumer_stopSwigExplicitProxyAudioConsumer(swigCPtr));
+    return ret;
+  }
+
+  public void setActivate() {
+    tinyWRAPPINVOKE.ProxyAudioConsumer_setActivate(swigCPtr);
+  }
+
+  public uint pull(byte[] output, uint size) {
+    uint ret = tinyWRAPPINVOKE.ProxyAudioConsumer_pull(swigCPtr, output, size);
+    return ret;
+  }
+
+  public static bool registerPlugin() {
+    bool ret = tinyWRAPPINVOKE.ProxyAudioConsumer_registerPlugin();
+    return ret;
+  }
+
+  private void SwigDirectorConnect() {
+    if (SwigDerivedClassHasMethod("prepare", swigMethodTypes0))
+      swigDelegate0 = new SwigDelegateProxyAudioConsumer_0(SwigDirectorprepare);
+    if (SwigDerivedClassHasMethod("start", swigMethodTypes1))
+      swigDelegate1 = new SwigDelegateProxyAudioConsumer_1(SwigDirectorstart);
+    if (SwigDerivedClassHasMethod("pause", swigMethodTypes2))
+      swigDelegate2 = new SwigDelegateProxyAudioConsumer_2(SwigDirectorpause);
+    if (SwigDerivedClassHasMethod("stop", swigMethodTypes3))
+      swigDelegate3 = new SwigDelegateProxyAudioConsumer_3(SwigDirectorstop);
+    tinyWRAPPINVOKE.ProxyAudioConsumer_director_connect(swigCPtr, swigDelegate0, swigDelegate1, swigDelegate2, swigDelegate3);
+  }
+
+  private bool SwigDerivedClassHasMethod(string methodName, Type[] methodTypes) {
+    System.Reflection.MethodInfo methodInfo = this.GetType().GetMethod(methodName, System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance, null, methodTypes, null);
+    bool hasDerivedMethod = methodInfo.DeclaringType.IsSubclassOf(typeof(ProxyAudioConsumer));
+    return hasDerivedMethod;
+  }
+
+  private int SwigDirectorprepare(int ptime, int rate, int channels) {
+    return prepare(ptime, rate, channels);
+  }
+
+  private int SwigDirectorstart() {
+    return start();
+  }
+
+  private int SwigDirectorpause() {
+    return pause();
+  }
+
+  private int SwigDirectorstop() {
+    return stop();
+  }
+
+  public delegate int SwigDelegateProxyAudioConsumer_0(int ptime, int rate, int channels);
+  public delegate int SwigDelegateProxyAudioConsumer_1();
+  public delegate int SwigDelegateProxyAudioConsumer_2();
+  public delegate int SwigDelegateProxyAudioConsumer_3();
+
+  private SwigDelegateProxyAudioConsumer_0 swigDelegate0;
+  private SwigDelegateProxyAudioConsumer_1 swigDelegate1;
+  private SwigDelegateProxyAudioConsumer_2 swigDelegate2;
+  private SwigDelegateProxyAudioConsumer_3 swigDelegate3;
+
+  private static Type[] swigMethodTypes0 = new Type[] { typeof(int), typeof(int), typeof(int) };
+  private static Type[] swigMethodTypes1 = new Type[] {  };
+  private static Type[] swigMethodTypes2 = new Type[] {  };
+  private static Type[] swigMethodTypes3 = new Type[] {  };
+}

trunk/bindings/csharp/ProxyAudioProducer.cs

@@ -0,0 +1,127 @@
+/* ----------------------------------------------------------------------------
+ * This file was automatically generated by SWIG (http://www.swig.org).
+ * Version 1.3.39
+ *
+ * Do not make changes to this file unless you know what you are doing--modify
+ * the SWIG interface file instead.
+ * ----------------------------------------------------------------------------- */
+
+
+using System;
+using System.Runtime.InteropServices;
+
+public class ProxyAudioProducer : IDisposable {
+  private HandleRef swigCPtr;
+  protected bool swigCMemOwn;
+
+  internal ProxyAudioProducer(IntPtr cPtr, bool cMemoryOwn) {
+    swigCMemOwn = cMemoryOwn;
+    swigCPtr = new HandleRef(this, cPtr);
+  }
+
+  internal static HandleRef getCPtr(ProxyAudioProducer obj) {
+    return (obj == null) ? new HandleRef(null, IntPtr.Zero) : obj.swigCPtr;
+  }
+
+  ~ProxyAudioProducer() {
+    Dispose();
+  }
+
+  public virtual void Dispose() {
+    lock(this) {
+      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
+        swigCMemOwn = false;
+        tinyWRAPPINVOKE.delete_ProxyAudioProducer(swigCPtr);
+      }
+      swigCPtr = new HandleRef(null, IntPtr.Zero);
+      GC.SuppressFinalize(this);
+    }
+  }
+
+  public ProxyAudioProducer() : this(tinyWRAPPINVOKE.new_ProxyAudioProducer(), true) {
+    SwigDirectorConnect();
+  }
+
+  public virtual int prepare(int ptime, int rate, int channels) {
+    int ret = ((this.GetType() == typeof(ProxyAudioProducer)) ? tinyWRAPPINVOKE.ProxyAudioProducer_prepare(swigCPtr, ptime, rate, channels) : tinyWRAPPINVOKE.ProxyAudioProducer_prepareSwigExplicitProxyAudioProducer(swigCPtr, ptime, rate, channels));
+    return ret;
+  }
+
+  public virtual int start() {
+    int ret = ((this.GetType() == typeof(ProxyAudioProducer)) ? tinyWRAPPINVOKE.ProxyAudioProducer_start(swigCPtr) : tinyWRAPPINVOKE.ProxyAudioProducer_startSwigExplicitProxyAudioProducer(swigCPtr));
+    return ret;
+  }
+
+  public virtual int pause() {
+    int ret = ((this.GetType() == typeof(ProxyAudioProducer)) ? tinyWRAPPINVOKE.ProxyAudioProducer_pause(swigCPtr) : tinyWRAPPINVOKE.ProxyAudioProducer_pauseSwigExplicitProxyAudioProducer(swigCPtr));
+    return ret;
+  }
+
+  public virtual int stop() {
+    int ret = ((this.GetType() == typeof(ProxyAudioProducer)) ? tinyWRAPPINVOKE.ProxyAudioProducer_stop(swigCPtr) : tinyWRAPPINVOKE.ProxyAudioProducer_stopSwigExplicitProxyAudioProducer(swigCPtr));
+    return ret;
+  }
+
+  public void setActivate() {
+    tinyWRAPPINVOKE.ProxyAudioProducer_setActivate(swigCPtr);
+  }
+
+  public int push(byte[] buffer, uint size) {
+    int ret = tinyWRAPPINVOKE.ProxyAudioProducer_push(swigCPtr, buffer, size);
+    return ret;
+  }
+
+  public static bool registerPlugin() {
+    bool ret = tinyWRAPPINVOKE.ProxyAudioProducer_registerPlugin();
+    return ret;
+  }
+
+  private void SwigDirectorConnect() {
+    if (SwigDerivedClassHasMethod("prepare", swigMethodTypes0))
+      swigDelegate0 = new SwigDelegateProxyAudioProducer_0(SwigDirectorprepare);
+    if (SwigDerivedClassHasMethod("start", swigMethodTypes1))
+      swigDelegate1 = new SwigDelegateProxyAudioProducer_1(SwigDirectorstart);
+    if (SwigDerivedClassHasMethod("pause", swigMethodTypes2))
+      swigDelegate2 = new SwigDelegateProxyAudioProducer_2(SwigDirectorpause);
+    if (SwigDerivedClassHasMethod("stop", swigMethodTypes3))
+      swigDelegate3 = new SwigDelegateProxyAudioProducer_3(SwigDirectorstop);
+    tinyWRAPPINVOKE.ProxyAudioProducer_director_connect(swigCPtr, swigDelegate0, swigDelegate1, swigDelegate2, swigDelegate3);
+  }
+
+  private bool SwigDerivedClassHasMethod(string methodName, Type[] methodTypes) {
+    System.Reflection.MethodInfo methodInfo = this.GetType().GetMethod(methodName, System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance, null, methodTypes, null);
+    bool hasDerivedMethod = methodInfo.DeclaringType.IsSubclassOf(typeof(ProxyAudioProducer));
+    return hasDerivedMethod;
+  }
+
+  private int SwigDirectorprepare(int ptime, int rate, int channels) {
+    return prepare(ptime, rate, channels);
+  }
+
+  private int SwigDirectorstart() {
+    return start();
+  }
+
+  private int SwigDirectorpause() {
+    return pause();
+  }
+
+  private int SwigDirectorstop() {
+    return stop();
+  }
+
+  public delegate int SwigDelegateProxyAudioProducer_0(int ptime, int rate, int channels);
+  public delegate int SwigDelegateProxyAudioProducer_1();
+  public delegate int SwigDelegateProxyAudioProducer_2();
+  public delegate int SwigDelegateProxyAudioProducer_3();
+
+  private SwigDelegateProxyAudioProducer_0 swigDelegate0;
+  private SwigDelegateProxyAudioProducer_1 swigDelegate1;
+  private SwigDelegateProxyAudioProducer_2 swigDelegate2;
+  private SwigDelegateProxyAudioProducer_3 swigDelegate3;
+
+  private static Type[] swigMethodTypes0 = new Type[] { typeof(int), typeof(int), typeof(int) };
+  private static Type[] swigMethodTypes1 = new Type[] {  };
+  private static Type[] swigMethodTypes2 = new Type[] {  };
+  private static Type[] swigMethodTypes3 = new Type[] {  };
+}

trunk/bindings/csharp/PublicationEvent.cs

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 1.3.39
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -27,13 +27,11 @@ public class PublicationEvent : SipEvent {
 
   public override void Dispose() {
     lock(this) {
-      if (swigCPtr.Handle != IntPtr.Zero) {
-        if (swigCMemOwn) {
-          swigCMemOwn = false;
-          tinyWRAPPINVOKE.delete_PublicationEvent(swigCPtr);
-        }
-        swigCPtr = new HandleRef(null, IntPtr.Zero);
+      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
+        swigCMemOwn = false;
+        tinyWRAPPINVOKE.delete_PublicationEvent(swigCPtr);
       }
+      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
       base.Dispose();
     }

trunk/bindings/csharp/PublicationSession.cs

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 1.3.39
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -27,13 +27,11 @@ public class PublicationSession : SipSession {
 
   public override void Dispose() {
     lock(this) {
-      if (swigCPtr.Handle != IntPtr.Zero) {
-        if (swigCMemOwn) {
-          swigCMemOwn = false;
-          tinyWRAPPINVOKE.delete_PublicationSession(swigCPtr);
-        }
-        swigCPtr = new HandleRef(null, IntPtr.Zero);
+      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
+        swigCMemOwn = false;
+        tinyWRAPPINVOKE.delete_PublicationSession(swigCPtr);
       }
+      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
       base.Dispose();
     }

trunk/bindings/csharp/RegistrationEvent.cs

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 1.3.39
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -27,13 +27,11 @@ public class RegistrationEvent : SipEvent {
 
   public override void Dispose() {
     lock(this) {
-      if (swigCPtr.Handle != IntPtr.Zero) {
-        if (swigCMemOwn) {
-          swigCMemOwn = false;
-          tinyWRAPPINVOKE.delete_RegistrationEvent(swigCPtr);
-        }
-        swigCPtr = new HandleRef(null, IntPtr.Zero);
+      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
+        swigCMemOwn = false;
+        tinyWRAPPINVOKE.delete_RegistrationEvent(swigCPtr);
       }
+      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
       base.Dispose();
     }

trunk/bindings/csharp/RegistrationSession.cs

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 1.3.39
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -27,13 +27,11 @@ public class RegistrationSession : SipSession {
 
   public override void Dispose() {
     lock(this) {
-      if (swigCPtr.Handle != IntPtr.Zero) {
-        if (swigCMemOwn) {
-          swigCMemOwn = false;
-          tinyWRAPPINVOKE.delete_RegistrationSession(swigCPtr);
-        }
-        swigCPtr = new HandleRef(null, IntPtr.Zero);
+      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
+        swigCMemOwn = false;
+        tinyWRAPPINVOKE.delete_RegistrationSession(swigCPtr);
       }
+      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
       base.Dispose();
     }

trunk/bindings/csharp/SafeObject.cs

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 1.3.39
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -29,13 +29,11 @@ public class SafeObject : IDisposable {
 
   public virtual void Dispose() {
     lock(this) {
-      if (swigCPtr.Handle != IntPtr.Zero) {
-        if (swigCMemOwn) {
-          swigCMemOwn = false;
-          tinyWRAPPINVOKE.delete_SafeObject(swigCPtr);
-        }
-        swigCPtr = new HandleRef(null, IntPtr.Zero);
+      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
+        swigCMemOwn = false;
+        tinyWRAPPINVOKE.delete_SafeObject(swigCPtr);
       }
+      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
     }
   }

trunk/bindings/csharp/SipCallback.cs

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 1.3.39
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -29,13 +29,11 @@ public class SipCallback : IDisposable {
 
   public virtual void Dispose() {
     lock(this) {
-      if (swigCPtr.Handle != IntPtr.Zero) {
-        if (swigCMemOwn) {
-          swigCMemOwn = false;
-          tinyWRAPPINVOKE.delete_SipCallback(swigCPtr);
-        }
-        swigCPtr = new HandleRef(null, IntPtr.Zero);
+      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
+        swigCMemOwn = false;
+        tinyWRAPPINVOKE.delete_SipCallback(swigCPtr);
       }
+      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
     }
   }

trunk/bindings/csharp/SipEvent.cs

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 1.3.39
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -29,13 +29,11 @@ public class SipEvent : IDisposable {
 
   public virtual void Dispose() {
     lock(this) {
-      if (swigCPtr.Handle != IntPtr.Zero) {
-        if (swigCMemOwn) {
-          swigCMemOwn = false;
-          tinyWRAPPINVOKE.delete_SipEvent(swigCPtr);
-        }
-        swigCPtr = new HandleRef(null, IntPtr.Zero);
+      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
+        swigCMemOwn = false;
+        tinyWRAPPINVOKE.delete_SipEvent(swigCPtr);
       }
+      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
     }
   }

trunk/bindings/csharp/SipMessage.cs

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 1.3.39
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -29,13 +29,11 @@ public class SipMessage : IDisposable {
 
   public virtual void Dispose() {
     lock(this) {
-      if (swigCPtr.Handle != IntPtr.Zero) {
-        if (swigCMemOwn) {
-          swigCMemOwn = false;
-          tinyWRAPPINVOKE.delete_SipMessage(swigCPtr);
-        }
-        swigCPtr = new HandleRef(null, IntPtr.Zero);
+      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
+        swigCMemOwn = false;
+        tinyWRAPPINVOKE.delete_SipMessage(swigCPtr);
       }
+      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
     }
   }

trunk/bindings/csharp/SipSession.cs

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 1.3.39
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -29,13 +29,11 @@ public class SipSession : IDisposable {
 
   public virtual void Dispose() {
     lock(this) {
-      if (swigCPtr.Handle != IntPtr.Zero) {
-        if (swigCMemOwn) {
-          swigCMemOwn = false;
-          tinyWRAPPINVOKE.delete_SipSession(swigCPtr);
-        }
-        swigCPtr = new HandleRef(null, IntPtr.Zero);
+      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
+        swigCMemOwn = false;
+        tinyWRAPPINVOKE.delete_SipSession(swigCPtr);
       }
+      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
     }
   }

trunk/bindings/csharp/SipStack.cs

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 1.3.39
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -27,13 +27,11 @@ public class SipStack : SafeObject {
 
   public override void Dispose() {
     lock(this) {
-      if (swigCPtr.Handle != IntPtr.Zero) {
-        if (swigCMemOwn) {
-          swigCMemOwn = false;
-          tinyWRAPPINVOKE.delete_SipStack(swigCPtr);
-        }
-        swigCPtr = new HandleRef(null, IntPtr.Zero);
+      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
+        swigCMemOwn = false;
+        tinyWRAPPINVOKE.delete_SipStack(swigCPtr);
       }
+      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
       base.Dispose();
     }

trunk/bindings/csharp/SipUri.cs

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 1.3.39
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -29,13 +29,11 @@ public class SipUri : IDisposable {
 
   public virtual void Dispose() {
     lock(this) {
-      if (swigCPtr.Handle != IntPtr.Zero) {
-        if (swigCMemOwn) {
-          swigCMemOwn = false;
-          tinyWRAPPINVOKE.delete_SipUri(swigCPtr);
-        }
-        swigCPtr = new HandleRef(null, IntPtr.Zero);
+      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
+        swigCMemOwn = false;
+        tinyWRAPPINVOKE.delete_SipUri(swigCPtr);
       }
+      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
     }
   }

trunk/bindings/csharp/StackEvent.cs

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 1.3.39
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -27,13 +27,11 @@ public class StackEvent : SipEvent {
 
   public override void Dispose() {
     lock(this) {
-      if (swigCPtr.Handle != IntPtr.Zero) {
-        if (swigCMemOwn) {
-          swigCMemOwn = false;
-          tinyWRAPPINVOKE.delete_StackEvent(swigCPtr);
-        }
-        swigCPtr = new HandleRef(null, IntPtr.Zero);
+      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
+        swigCMemOwn = false;
+        tinyWRAPPINVOKE.delete_StackEvent(swigCPtr);
       }
+      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
       base.Dispose();
     }

trunk/bindings/csharp/SubscriptionEvent.cs

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 1.3.39
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -27,13 +27,11 @@ public class SubscriptionEvent : SipEvent {
 
   public override void Dispose() {
     lock(this) {
-      if (swigCPtr.Handle != IntPtr.Zero) {
-        if (swigCMemOwn) {
-          swigCMemOwn = false;
-          tinyWRAPPINVOKE.delete_SubscriptionEvent(swigCPtr);
-        }
-        swigCPtr = new HandleRef(null, IntPtr.Zero);
+      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
+        swigCMemOwn = false;
+        tinyWRAPPINVOKE.delete_SubscriptionEvent(swigCPtr);
       }
+      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
       base.Dispose();
     }

trunk/bindings/csharp/SubscriptionSession.cs

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 1.3.39
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -27,13 +27,11 @@ public class SubscriptionSession : SipSession {
 
   public override void Dispose() {
     lock(this) {
-      if (swigCPtr.Handle != IntPtr.Zero) {
-        if (swigCMemOwn) {
-          swigCMemOwn = false;
-          tinyWRAPPINVOKE.delete_SubscriptionSession(swigCPtr);
-        }
-        swigCPtr = new HandleRef(null, IntPtr.Zero);
+      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
+        swigCMemOwn = false;
+        tinyWRAPPINVOKE.delete_SubscriptionSession(swigCPtr);
       }
+      swigCPtr = new HandleRef(null, IntPtr.Zero);
       GC.SuppressFinalize(this);
       base.Dispose();
     }

trunk/bindings/csharp/test/Program.cs

@@ -33,6 +33,14 @@ namespace test
             sipCallback = new MySipCallback();
             //sipDebugCallback = new MySipDebugCallback();
 
+            /* Create Audio consumer */
+            audioConsumer = new MyProxyAudioConsumer();
+            audioConsumer.setActivate();
+
+            /* Create Audio producer */
+            audioProducer = new MyProxyAudioProducer();
+            audioProducer.setActivate();
+
             /* Create and configure the IMS/LTE stack */
             sipStack = new SipStack(sipCallback, String.Format("sip:{0}", REALM), String.Format("{0}@{1}", USER, REALM), String.Format("sip:{0}@{1}", USER, REALM));
             sipStack.setDebugCallback(sipDebugCallback);
@@ -40,7 +48,11 @@ namespace test
             sipStack.addHeader("Privacy", "header; id");
             sipStack.addHeader("P-Access-Network-Info", "ADSL;utran-cell-id-3gpp=00000000");
             sipStack.addHeader("User-Agent", "IM-client/OMA1.0 doubango/v1.0.0");
-            
+
+            /* Do it after stack creation */
+            ProxyAudioConsumer.registerPlugin();
+            ProxyAudioProducer.registerPlugin();
+
             /* Sets Proxy-CSCF */
             success = sipStack.setProxyCSCF(PROXY_CSCF_IP, PROXY_CSCF_PORT, "tcp", "ipv4");
             /* Starts the stack */
@@ -49,7 +61,7 @@ namespace test
             /* Set Password */
             //stack.setPassword(PASSWORD);
 
-            sipStack.setAoR("127.0.0.1", 1234);
+            //sipStack.setAoR("127.0.0.1", 1234);
 
             /* Send REGISTER */
             regSession = new RegistrationSession(sipStack);
@@ -59,45 +71,75 @@ namespace test
             regSession.setExpires(35);
             regSession.Register();
 
-            //Thread.Sleep(2000);
+            Console.ReadLine();
 
-            /* Send SUBSCRIBE(reg) */
-            subSession = new SubscriptionSession(sipStack);
-            subSession.addHeader("Event", "reg");
-            subSession.addHeader("Accept", "application/reginfo+xml");
-            subSession.addHeader("Allow-Events", "refer, presence, presence.winfo, xcap-diff, conference");
-            subSession.setExpires(35);
-            //subSession.Subscribe();
+            callSession = new CallSession(sipStack);
+            callSession.Call(String.Format("sip:bob@{0}", REALM));
 
-            /* Send MESSAGE */
-            MessagingSession msg = new MessagingSession(sipStack);
-            byte [] content = Encoding.ASCII.GetBytes("Hello World");
-            msg.setToUri(String.Format("sip:{0}@{1}", "alice", REALM));
-            msg.addHeader("NS", "imdn <urn:ietf:params:imdn>");
-            msg.addHeader("imdn.Message-ID", "34jk324j");
-            msg.addHeader("DateTime", "2006-04-04T12:16:49-05:00");
-            msg.addHeader("imdn.Disposition-Notification", "positive-delivery, negative-delivery");
-            msg.addHeader("Content-Type", "text/plain");
-            //msg.Send(content, (uint)content.Length);
+            tcb = new TimerCallback(OnTimer);
+            timer = new Timer(tcb, new AutoResetEvent(false), 0, 20);
 
-            /* Send OPTIONS */
-            OptionsSession opt = new OptionsSession(sipStack);
-            opt.setToUri(String.Format("sip:{0}@{1}", "hacking_the_aor", REALM));
-            opt.Send();
+            Console.ReadLine();
 
-            Console.Read();
+            callSession.Hangup();
+
+
+            ////Thread.Sleep(2000);
+
+            ///* Send SUBSCRIBE(reg) */
+            //subSession = new SubscriptionSession(sipStack);
+            //subSession.addHeader("Event", "reg");
+            //subSession.addHeader("Accept", "application/reginfo+xml");
+            //subSession.addHeader("Allow-Events", "refer, presence, presence.winfo, xcap-diff, conference");
+            //subSession.setExpires(35);
+            ////subSession.Subscribe();
+
+            ///* Send MESSAGE */
+            //MessagingSession msg = new MessagingSession(sipStack);
+            //byte [] content = Encoding.ASCII.GetBytes("Hello World");
+            //msg.setToUri(String.Format("sip:{0}@{1}", "alice", REALM));
+            //msg.addHeader("NS", "imdn <urn:ietf:params:imdn>");
+            //msg.addHeader("imdn.Message-ID", "34jk324j");
+            //msg.addHeader("DateTime", "2006-04-04T12:16:49-05:00");
+            //msg.addHeader("imdn.Disposition-Notification", "positive-delivery, negative-delivery");
+            //msg.addHeader("Content-Type", "text/plain");
+            ////msg.Send(content, (uint)content.Length);
+
+            ///* Send OPTIONS */
+            //OptionsSession opt = new OptionsSession(sipStack);
+            //opt.setToUri(String.Format("sip:{0}@{1}", "hacking_the_aor", REALM));
+            //opt.Send();
+
+            Console.ReadLine();
 
             sipStack.stop();
         }
 
+
+        public static void OnTimer(Object stateInfo)
+        {
+            byte[] bytes = new byte[320];
+            uint ret = audioConsumer.pull(bytes, (uint)bytes.Length);
+            //Console.WriteLine("pull="+ret);
+
+            int ret2 = audioProducer.push(bytes, (uint)bytes.Length);
+            //Console.WriteLine("push=" + ret);
+        }
+
+        static Timer timer;
+        static TimerCallback tcb;
+        static CallSession callSession;
         static RegistrationSession regSession;
         static SubscriptionSession subSession;
         static MySipCallback sipCallback;
         static SipStack sipStack;
         static MySipDebugCallback sipDebugCallback;
+        static MyProxyAudioConsumer audioConsumer;
+        static MyProxyAudioProducer audioProducer;
     }
 
-    public class MySipDebugCallback : SipDebugCallback
+
+    public class MySipDebugCallback : DDebugCallback
     {
         public override int OnDebugInfo(string message)
         {
@@ -124,6 +166,52 @@ namespace test
         }
     }
 
+    public class MyProxyAudioConsumer : ProxyAudioConsumer
+    {
+        public override int prepare(int ptime, int rate, int channels)
+        {
+            return base.prepare(ptime, rate, channels);
+        }
+
+        public override int start()
+        {
+            return base.start();
+        }
+
+        public override int pause()
+        {
+            return base.pause();
+        }
+
+        public override int stop()
+        {
+            return base.stop();
+        }
+    }
+
+    public class MyProxyAudioProducer : ProxyAudioProducer
+    {
+        public override int prepare(int ptime, int rate, int channels)
+        {
+            return base.prepare(ptime, rate, channels);
+        }
+
+        public override int start()
+        {
+            return base.start();
+        }
+
+        public override int pause()
+        {
+            return base.pause();
+        }
+
+        public override int stop()
+        {
+            return base.stop();
+        }
+    }
+
     public class MySipCallback : SipCallback
     {
         public MySipCallback()
@@ -171,6 +259,7 @@ namespace test
             return 0;
         }
 
+
         public override int OnOptionsEvent(OptionsEvent e)
         {
             short code = e.getCode();

trunk/bindings/csharp/test/test.csproj

@@ -45,6 +45,12 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="..\CallSession.cs">
+      <Link>CallSession.cs</Link>
+    </Compile>
+    <Compile Include="..\DDebugCallback.cs">
+      <Link>DDebugCallback.cs</Link>
+    </Compile>
     <Compile Include="..\DialogEvent.cs">
       <Link>DialogEvent.cs</Link>
     </Compile>
@@ -60,6 +66,12 @@
     <Compile Include="..\OptionsSession.cs">
       <Link>OptionsSession.cs</Link>
     </Compile>
+    <Compile Include="..\ProxyAudioConsumer.cs">
+      <Link>ProxyAudioConsumer.cs</Link>
+    </Compile>
+    <Compile Include="..\ProxyAudioProducer.cs">
+      <Link>ProxyAudioProducer.cs</Link>
+    </Compile>
     <Compile Include="..\PublicationEvent.cs">
       <Link>PublicationEvent.cs</Link>
     </Compile>
@@ -78,9 +90,6 @@
     <Compile Include="..\SipCallback.cs">
       <Link>SipCallback.cs</Link>
     </Compile>
-    <Compile Include="..\SipDebugCallback.cs">
-      <Link>SipDebugCallback.cs</Link>
-    </Compile>
     <Compile Include="..\SipEvent.cs">
       <Link>SipEvent.cs</Link>
     </Compile>
@@ -93,6 +102,9 @@
     <Compile Include="..\SipStack.cs">
       <Link>SipStack.cs</Link>
     </Compile>
+    <Compile Include="..\StackEvent.cs">
+      <Link>StackEvent.cs</Link>
+    </Compile>
     <Compile Include="..\SubscriptionEvent.cs">
       <Link>SubscriptionEvent.cs</Link>
     </Compile>

trunk/bindings/csharp/tinyWRAP.cs

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

trunk/bindings/csharp/tinyWRAP.sln

@@ -19,6 +19,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tinyIPSec", "..\..\tinyIPSe
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tinySAK", "..\..\tinySAK\tinySAK.vcproj", "{6BC9B796-10C6-4CF7-A6E4-E2DACCDA84DA}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tinySIGCOMP", "..\..\tinySIGCOMP\tinySIGCOMP.vcproj", "{76261DC8-25B3-43F4-9FB5-112C4AC0880E}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tinyDAV", "..\..\tinyDAV\tinyDAV.vcproj", "{8E2F0B2E-2596-4010-BF4A-2F688975B5C1}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tinyRTP", "..\..\tinyRTP\tinyRTP.vcproj", "{99B7D02F-8C70-4B45-AF3C-92313C3CEE15}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -303,6 +309,90 @@ Global
 		{6BC9B796-10C6-4CF7-A6E4-E2DACCDA84DA}.Static_Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Static_Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
 		{6BC9B796-10C6-4CF7-A6E4-E2DACCDA84DA}.Static_Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Build.0 = Static_Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
 		{6BC9B796-10C6-4CF7-A6E4-E2DACCDA84DA}.Static_Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Deploy.0 = Static_Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{76261DC8-25B3-43F4-9FB5-112C4AC0880E}.Debug|Any CPU.ActiveCfg = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{76261DC8-25B3-43F4-9FB5-112C4AC0880E}.Debug|Mixed Platforms.ActiveCfg = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{76261DC8-25B3-43F4-9FB5-112C4AC0880E}.Debug|Mixed Platforms.Build.0 = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{76261DC8-25B3-43F4-9FB5-112C4AC0880E}.Debug|Mixed Platforms.Deploy.0 = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{76261DC8-25B3-43F4-9FB5-112C4AC0880E}.Debug|Win32.ActiveCfg = Debug|Win32
+		{76261DC8-25B3-43F4-9FB5-112C4AC0880E}.Debug|Win32.Build.0 = Debug|Win32
+		{76261DC8-25B3-43F4-9FB5-112C4AC0880E}.Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{76261DC8-25B3-43F4-9FB5-112C4AC0880E}.Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Build.0 = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{76261DC8-25B3-43F4-9FB5-112C4AC0880E}.Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Deploy.0 = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{76261DC8-25B3-43F4-9FB5-112C4AC0880E}.Release|Any CPU.ActiveCfg = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{76261DC8-25B3-43F4-9FB5-112C4AC0880E}.Release|Mixed Platforms.ActiveCfg = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{76261DC8-25B3-43F4-9FB5-112C4AC0880E}.Release|Mixed Platforms.Build.0 = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{76261DC8-25B3-43F4-9FB5-112C4AC0880E}.Release|Mixed Platforms.Deploy.0 = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{76261DC8-25B3-43F4-9FB5-112C4AC0880E}.Release|Win32.ActiveCfg = Release|Win32
+		{76261DC8-25B3-43F4-9FB5-112C4AC0880E}.Release|Win32.Build.0 = Release|Win32
+		{76261DC8-25B3-43F4-9FB5-112C4AC0880E}.Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{76261DC8-25B3-43F4-9FB5-112C4AC0880E}.Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Build.0 = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{76261DC8-25B3-43F4-9FB5-112C4AC0880E}.Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Deploy.0 = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{76261DC8-25B3-43F4-9FB5-112C4AC0880E}.Static_Debug|Any CPU.ActiveCfg = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{76261DC8-25B3-43F4-9FB5-112C4AC0880E}.Static_Debug|Mixed Platforms.ActiveCfg = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{76261DC8-25B3-43F4-9FB5-112C4AC0880E}.Static_Debug|Mixed Platforms.Build.0 = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{76261DC8-25B3-43F4-9FB5-112C4AC0880E}.Static_Debug|Mixed Platforms.Deploy.0 = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{76261DC8-25B3-43F4-9FB5-112C4AC0880E}.Static_Debug|Win32.ActiveCfg = Debug|Win32
+		{76261DC8-25B3-43F4-9FB5-112C4AC0880E}.Static_Debug|Win32.Build.0 = Debug|Win32
+		{76261DC8-25B3-43F4-9FB5-112C4AC0880E}.Static_Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{76261DC8-25B3-43F4-9FB5-112C4AC0880E}.Static_Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Build.0 = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{76261DC8-25B3-43F4-9FB5-112C4AC0880E}.Static_Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Deploy.0 = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{76261DC8-25B3-43F4-9FB5-112C4AC0880E}.Static_Release|Any CPU.ActiveCfg = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{76261DC8-25B3-43F4-9FB5-112C4AC0880E}.Static_Release|Mixed Platforms.ActiveCfg = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{76261DC8-25B3-43F4-9FB5-112C4AC0880E}.Static_Release|Mixed Platforms.Build.0 = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{76261DC8-25B3-43F4-9FB5-112C4AC0880E}.Static_Release|Mixed Platforms.Deploy.0 = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{76261DC8-25B3-43F4-9FB5-112C4AC0880E}.Static_Release|Win32.ActiveCfg = Release|Win32
+		{76261DC8-25B3-43F4-9FB5-112C4AC0880E}.Static_Release|Win32.Build.0 = Release|Win32
+		{76261DC8-25B3-43F4-9FB5-112C4AC0880E}.Static_Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{76261DC8-25B3-43F4-9FB5-112C4AC0880E}.Static_Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Build.0 = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{76261DC8-25B3-43F4-9FB5-112C4AC0880E}.Static_Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Deploy.0 = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{8E2F0B2E-2596-4010-BF4A-2F688975B5C1}.Debug|Any CPU.ActiveCfg = Debug|Win32
+		{8E2F0B2E-2596-4010-BF4A-2F688975B5C1}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{8E2F0B2E-2596-4010-BF4A-2F688975B5C1}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{8E2F0B2E-2596-4010-BF4A-2F688975B5C1}.Debug|Win32.ActiveCfg = Debug|Win32
+		{8E2F0B2E-2596-4010-BF4A-2F688975B5C1}.Debug|Win32.Build.0 = Debug|Win32
+		{8E2F0B2E-2596-4010-BF4A-2F688975B5C1}.Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Debug|Win32
+		{8E2F0B2E-2596-4010-BF4A-2F688975B5C1}.Release|Any CPU.ActiveCfg = Release|Win32
+		{8E2F0B2E-2596-4010-BF4A-2F688975B5C1}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{8E2F0B2E-2596-4010-BF4A-2F688975B5C1}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{8E2F0B2E-2596-4010-BF4A-2F688975B5C1}.Release|Win32.ActiveCfg = Release|Win32
+		{8E2F0B2E-2596-4010-BF4A-2F688975B5C1}.Release|Win32.Build.0 = Release|Win32
+		{8E2F0B2E-2596-4010-BF4A-2F688975B5C1}.Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release|Win32
+		{8E2F0B2E-2596-4010-BF4A-2F688975B5C1}.Static_Debug|Any CPU.ActiveCfg = Debug|Win32
+		{8E2F0B2E-2596-4010-BF4A-2F688975B5C1}.Static_Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{8E2F0B2E-2596-4010-BF4A-2F688975B5C1}.Static_Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{8E2F0B2E-2596-4010-BF4A-2F688975B5C1}.Static_Debug|Win32.ActiveCfg = Debug|Win32
+		{8E2F0B2E-2596-4010-BF4A-2F688975B5C1}.Static_Debug|Win32.Build.0 = Debug|Win32
+		{8E2F0B2E-2596-4010-BF4A-2F688975B5C1}.Static_Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Debug|Win32
+		{8E2F0B2E-2596-4010-BF4A-2F688975B5C1}.Static_Release|Any CPU.ActiveCfg = Release|Win32
+		{8E2F0B2E-2596-4010-BF4A-2F688975B5C1}.Static_Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{8E2F0B2E-2596-4010-BF4A-2F688975B5C1}.Static_Release|Mixed Platforms.Build.0 = Release|Win32
+		{8E2F0B2E-2596-4010-BF4A-2F688975B5C1}.Static_Release|Win32.ActiveCfg = Release|Win32
+		{8E2F0B2E-2596-4010-BF4A-2F688975B5C1}.Static_Release|Win32.Build.0 = Release|Win32
+		{8E2F0B2E-2596-4010-BF4A-2F688975B5C1}.Static_Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release|Win32
+		{99B7D02F-8C70-4B45-AF3C-92313C3CEE15}.Debug|Any CPU.ActiveCfg = Debug|Win32
+		{99B7D02F-8C70-4B45-AF3C-92313C3CEE15}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{99B7D02F-8C70-4B45-AF3C-92313C3CEE15}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{99B7D02F-8C70-4B45-AF3C-92313C3CEE15}.Debug|Win32.ActiveCfg = Debug|Win32
+		{99B7D02F-8C70-4B45-AF3C-92313C3CEE15}.Debug|Win32.Build.0 = Debug|Win32
+		{99B7D02F-8C70-4B45-AF3C-92313C3CEE15}.Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Debug|Win32
+		{99B7D02F-8C70-4B45-AF3C-92313C3CEE15}.Release|Any CPU.ActiveCfg = Release|Win32
+		{99B7D02F-8C70-4B45-AF3C-92313C3CEE15}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{99B7D02F-8C70-4B45-AF3C-92313C3CEE15}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{99B7D02F-8C70-4B45-AF3C-92313C3CEE15}.Release|Win32.ActiveCfg = Release|Win32
+		{99B7D02F-8C70-4B45-AF3C-92313C3CEE15}.Release|Win32.Build.0 = Release|Win32
+		{99B7D02F-8C70-4B45-AF3C-92313C3CEE15}.Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release|Win32
+		{99B7D02F-8C70-4B45-AF3C-92313C3CEE15}.Static_Debug|Any CPU.ActiveCfg = Debug|Win32
+		{99B7D02F-8C70-4B45-AF3C-92313C3CEE15}.Static_Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{99B7D02F-8C70-4B45-AF3C-92313C3CEE15}.Static_Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{99B7D02F-8C70-4B45-AF3C-92313C3CEE15}.Static_Debug|Win32.ActiveCfg = Debug|Win32
+		{99B7D02F-8C70-4B45-AF3C-92313C3CEE15}.Static_Debug|Win32.Build.0 = Debug|Win32
+		{99B7D02F-8C70-4B45-AF3C-92313C3CEE15}.Static_Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Debug|Win32
+		{99B7D02F-8C70-4B45-AF3C-92313C3CEE15}.Static_Release|Any CPU.ActiveCfg = Release|Win32
+		{99B7D02F-8C70-4B45-AF3C-92313C3CEE15}.Static_Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{99B7D02F-8C70-4B45-AF3C-92313C3CEE15}.Static_Release|Mixed Platforms.Build.0 = Release|Win32
+		{99B7D02F-8C70-4B45-AF3C-92313C3CEE15}.Static_Release|Win32.ActiveCfg = Release|Win32
+		{99B7D02F-8C70-4B45-AF3C-92313C3CEE15}.Static_Release|Win32.Build.0 = Release|Win32
+		{99B7D02F-8C70-4B45-AF3C-92313C3CEE15}.Static_Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

trunk/bindings/csharp/tinyWRAP.vcproj

@@ -41,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\_common;..\.;..\..\thirdparties\win32\include;..\..\tinySAK\src;..\..\tinyNET\src;..\..\tinyHTTP\include;..\..\tinySIP\include"
+				AdditionalIncludeDirectories="..\_common;..\.;..\..\thirdparties\win32\include;..\..\tinySAK\src;..\..\tinyNET\src;..\..\tinyHTTP\include;..\..\tinySIP\include;..\..\tinyDAV\include;..\..\tinySDP\include;..\..\tinyMEDIA\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;TINYWRAP_EXPORTS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -62,7 +62,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="$(OutDir)\tinySAK.lib $(OutDir)\tinySIP.lib $(OutDir)\tinyNET.lib"
+				AdditionalDependencies="$(OutDir)\tinySAK.lib $(OutDir)\tinySIP.lib $(OutDir)\tinyNET.lib $(OutDir)\tinyDAV.lib $(OutDir)\tinyMEDIA.lib"
 				LinkIncremental="2"
 				GenerateDebugInformation="true"
 				SubSystem="2"
@@ -173,6 +173,18 @@
 			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
+			<File
+				RelativePath="..\_common\DDebug.cxx"
+				>
+			</File>
+			<File
+				RelativePath="..\_common\ProxyConsumer.cxx"
+				>
+			</File>
+			<File
+				RelativePath="..\_common\ProxyProducer.cxx"
+				>
+			</File>
 			<File
 				RelativePath="..\_common\SafeObject.cxx"
 				>
@@ -181,10 +193,6 @@
 				RelativePath="..\_common\SipCallback.cxx"
 				>
 			</File>
-			<File
-				RelativePath="..\_common\SipDebug.cxx"
-				>
-			</File>
 			<File
 				RelativePath="..\_common\SipEvent.cxx"
 				>
@@ -223,6 +231,18 @@
 				RelativePath="..\_common\Common.h"
 				>
 			</File>
+			<File
+				RelativePath="..\_common\DDebug.h"
+				>
+			</File>
+			<File
+				RelativePath="..\_common\ProxyConsumer.h"
+				>
+			</File>
+			<File
+				RelativePath="..\_common\ProxyProducer.h"
+				>
+			</File>
 			<File
 				RelativePath="..\_common\SafeObject.h"
 				>
@@ -231,10 +251,6 @@
 				RelativePath="..\_common\SipCallback.h"
 				>
 			</File>
-			<File
-				RelativePath="..\_common\SipDebug.h"
-				>
-			</File>
 			<File
 				RelativePath="..\_common\SipEvent.h"
 				>
@@ -255,6 +271,10 @@
 				RelativePath="..\_common\SipUri.h"
 				>
 			</File>
+			<File
+				RelativePath="..\_common\tinyWRAP_config.h"
+				>
+			</File>
 			<File
 				RelativePath=".\tinyWRAP_wrap.h"
 				>

trunk/bindings/csharp/tinyWRAPPINVOKE.cs

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 1.3.39
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -346,6 +346,18 @@ class tinyWRAPPINVOKE {
   [DllImport("tinyWRAP", EntryPoint="CSharp_SipSession_getId")]
   public static extern uint SipSession_getId(HandleRef jarg1);
 
+  [DllImport("tinyWRAP", EntryPoint="CSharp_new_CallSession")]
+  public static extern IntPtr new_CallSession(HandleRef jarg1);
+
+  [DllImport("tinyWRAP", EntryPoint="CSharp_delete_CallSession")]
+  public static extern void delete_CallSession(HandleRef jarg1);
+
+  [DllImport("tinyWRAP", EntryPoint="CSharp_CallSession_Call")]
+  public static extern bool CallSession_Call(HandleRef jarg1, string jarg2);
+
+  [DllImport("tinyWRAP", EntryPoint="CSharp_CallSession_Hangup")]
+  public static extern bool CallSession_Hangup(HandleRef jarg1);
+
   [DllImport("tinyWRAP", EntryPoint="CSharp_new_MessagingSession")]
   public static extern IntPtr new_MessagingSession(HandleRef jarg1);
 
@@ -406,6 +418,90 @@ class tinyWRAPPINVOKE {
   [DllImport("tinyWRAP", EntryPoint="CSharp_SubscriptionSession_UnSubscribe")]
   public static extern bool SubscriptionSession_UnSubscribe(HandleRef jarg1);
 
+  [DllImport("tinyWRAP", EntryPoint="CSharp_new_ProxyAudioConsumer")]
+  public static extern IntPtr new_ProxyAudioConsumer();
+
+  [DllImport("tinyWRAP", EntryPoint="CSharp_delete_ProxyAudioConsumer")]
+  public static extern void delete_ProxyAudioConsumer(HandleRef jarg1);
+
+  [DllImport("tinyWRAP", EntryPoint="CSharp_ProxyAudioConsumer_prepare")]
+  public static extern int ProxyAudioConsumer_prepare(HandleRef jarg1, int jarg2, int jarg3, int jarg4);
+
+  [DllImport("tinyWRAP", EntryPoint="CSharp_ProxyAudioConsumer_prepareSwigExplicitProxyAudioConsumer")]
+  public static extern int ProxyAudioConsumer_prepareSwigExplicitProxyAudioConsumer(HandleRef jarg1, int jarg2, int jarg3, int jarg4);
+
+  [DllImport("tinyWRAP", EntryPoint="CSharp_ProxyAudioConsumer_start")]
+  public static extern int ProxyAudioConsumer_start(HandleRef jarg1);
+
+  [DllImport("tinyWRAP", EntryPoint="CSharp_ProxyAudioConsumer_startSwigExplicitProxyAudioConsumer")]
+  public static extern int ProxyAudioConsumer_startSwigExplicitProxyAudioConsumer(HandleRef jarg1);
+
+  [DllImport("tinyWRAP", EntryPoint="CSharp_ProxyAudioConsumer_pause")]
+  public static extern int ProxyAudioConsumer_pause(HandleRef jarg1);
+
+  [DllImport("tinyWRAP", EntryPoint="CSharp_ProxyAudioConsumer_pauseSwigExplicitProxyAudioConsumer")]
+  public static extern int ProxyAudioConsumer_pauseSwigExplicitProxyAudioConsumer(HandleRef jarg1);
+
+  [DllImport("tinyWRAP", EntryPoint="CSharp_ProxyAudioConsumer_stop")]
+  public static extern int ProxyAudioConsumer_stop(HandleRef jarg1);
+
+  [DllImport("tinyWRAP", EntryPoint="CSharp_ProxyAudioConsumer_stopSwigExplicitProxyAudioConsumer")]
+  public static extern int ProxyAudioConsumer_stopSwigExplicitProxyAudioConsumer(HandleRef jarg1);
+
+  [DllImport("tinyWRAP", EntryPoint="CSharp_ProxyAudioConsumer_setActivate")]
+  public static extern void ProxyAudioConsumer_setActivate(HandleRef jarg1);
+
+  [DllImport("tinyWRAP", EntryPoint="CSharp_ProxyAudioConsumer_pull")]
+  public static extern uint ProxyAudioConsumer_pull(HandleRef jarg1, byte[] jarg2, uint jarg3);
+
+  [DllImport("tinyWRAP", EntryPoint="CSharp_ProxyAudioConsumer_registerPlugin")]
+  public static extern bool ProxyAudioConsumer_registerPlugin();
+
+  [DllImport("tinyWRAP", EntryPoint="CSharp_ProxyAudioConsumer_director_connect")]
+  public static extern void ProxyAudioConsumer_director_connect(HandleRef jarg1, ProxyAudioConsumer.SwigDelegateProxyAudioConsumer_0 delegate0, ProxyAudioConsumer.SwigDelegateProxyAudioConsumer_1 delegate1, ProxyAudioConsumer.SwigDelegateProxyAudioConsumer_2 delegate2, ProxyAudioConsumer.SwigDelegateProxyAudioConsumer_3 delegate3);
+
+  [DllImport("tinyWRAP", EntryPoint="CSharp_new_ProxyAudioProducer")]
+  public static extern IntPtr new_ProxyAudioProducer();
+
+  [DllImport("tinyWRAP", EntryPoint="CSharp_delete_ProxyAudioProducer")]
+  public static extern void delete_ProxyAudioProducer(HandleRef jarg1);
+
+  [DllImport("tinyWRAP", EntryPoint="CSharp_ProxyAudioProducer_prepare")]
+  public static extern int ProxyAudioProducer_prepare(HandleRef jarg1, int jarg2, int jarg3, int jarg4);
+
+  [DllImport("tinyWRAP", EntryPoint="CSharp_ProxyAudioProducer_prepareSwigExplicitProxyAudioProducer")]
+  public static extern int ProxyAudioProducer_prepareSwigExplicitProxyAudioProducer(HandleRef jarg1, int jarg2, int jarg3, int jarg4);
+
+  [DllImport("tinyWRAP", EntryPoint="CSharp_ProxyAudioProducer_start")]
+  public static extern int ProxyAudioProducer_start(HandleRef jarg1);
+
+  [DllImport("tinyWRAP", EntryPoint="CSharp_ProxyAudioProducer_startSwigExplicitProxyAudioProducer")]
+  public static extern int ProxyAudioProducer_startSwigExplicitProxyAudioProducer(HandleRef jarg1);
+
+  [DllImport("tinyWRAP", EntryPoint="CSharp_ProxyAudioProducer_pause")]
+  public static extern int ProxyAudioProducer_pause(HandleRef jarg1);
+
+  [DllImport("tinyWRAP", EntryPoint="CSharp_ProxyAudioProducer_pauseSwigExplicitProxyAudioProducer")]
+  public static extern int ProxyAudioProducer_pauseSwigExplicitProxyAudioProducer(HandleRef jarg1);
+
+  [DllImport("tinyWRAP", EntryPoint="CSharp_ProxyAudioProducer_stop")]
+  public static extern int ProxyAudioProducer_stop(HandleRef jarg1);
+
+  [DllImport("tinyWRAP", EntryPoint="CSharp_ProxyAudioProducer_stopSwigExplicitProxyAudioProducer")]
+  public static extern int ProxyAudioProducer_stopSwigExplicitProxyAudioProducer(HandleRef jarg1);
+
+  [DllImport("tinyWRAP", EntryPoint="CSharp_ProxyAudioProducer_setActivate")]
+  public static extern void ProxyAudioProducer_setActivate(HandleRef jarg1);
+
+  [DllImport("tinyWRAP", EntryPoint="CSharp_ProxyAudioProducer_push")]
+  public static extern int ProxyAudioProducer_push(HandleRef jarg1, byte[] jarg2, uint jarg3);
+
+  [DllImport("tinyWRAP", EntryPoint="CSharp_ProxyAudioProducer_registerPlugin")]
+  public static extern bool ProxyAudioProducer_registerPlugin();
+
+  [DllImport("tinyWRAP", EntryPoint="CSharp_ProxyAudioProducer_director_connect")]
+  public static extern void ProxyAudioProducer_director_connect(HandleRef jarg1, ProxyAudioProducer.SwigDelegateProxyAudioProducer_0 delegate0, ProxyAudioProducer.SwigDelegateProxyAudioProducer_1 delegate1, ProxyAudioProducer.SwigDelegateProxyAudioProducer_2 delegate2, ProxyAudioProducer.SwigDelegateProxyAudioProducer_3 delegate3);
+
   [DllImport("tinyWRAP", EntryPoint="CSharp_new_SipCallback")]
   public static extern IntPtr new_SipCallback();
 
@@ -586,6 +682,9 @@ class tinyWRAPPINVOKE {
   [DllImport("tinyWRAP", EntryPoint="CSharp_SubscriptionEventUpcast")]
   public static extern IntPtr SubscriptionEventUpcast(IntPtr objectRef);
 
+  [DllImport("tinyWRAP", EntryPoint="CSharp_CallSessionUpcast")]
+  public static extern IntPtr CallSessionUpcast(IntPtr objectRef);
+
   [DllImport("tinyWRAP", EntryPoint="CSharp_MessagingSessionUpcast")]
   public static extern IntPtr MessagingSessionUpcast(IntPtr objectRef);
 

trunk/bindings/csharp/tinyWRAP_wrap.cxx

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 1.3.39
  * 
  * 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
@@ -35,114 +35,114 @@ template <typename T> T SwigValueInit() {
 }
 #endif
 
-/* -----------------------------------------------------------------------------
- *  This section contains generic SWIG labels for method/variable
- *  declarations/attributes, and other compiler dependent labels.
- * ----------------------------------------------------------------------------- */
-
-/* template workaround for compilers that cannot correctly implement the C++ standard */
-#ifndef SWIGTEMPLATEDISAMBIGUATOR
-# if defined(__SUNPRO_CC) && (__SUNPRO_CC <= 0x560)
-#  define SWIGTEMPLATEDISAMBIGUATOR template
-# elif defined(__HP_aCC)
-/* Needed even with `aCC -AA' when `aCC -V' reports HP ANSI C++ B3910B A.03.55 */
-/* If we find a maximum version that requires this, the test would be __HP_aCC <= 35500 for A.03.55 */
-#  define SWIGTEMPLATEDISAMBIGUATOR template
-# else
-#  define SWIGTEMPLATEDISAMBIGUATOR
-# endif
-#endif
-
-/* inline attribute */
-#ifndef SWIGINLINE
-# if defined(__cplusplus) || (defined(__GNUC__) && !defined(__STRICT_ANSI__))
-#   define SWIGINLINE inline
-# else
-#   define SWIGINLINE
-# endif
-#endif
-
-/* attribute recognised by some compilers to avoid 'unused' warnings */
-#ifndef SWIGUNUSED
-# if defined(__GNUC__)
-#   if !(defined(__cplusplus)) || (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4))
-#     define SWIGUNUSED __attribute__ ((__unused__)) 
-#   else
-#     define SWIGUNUSED
-#   endif
-# elif defined(__ICC)
-#   define SWIGUNUSED __attribute__ ((__unused__)) 
-# else
-#   define SWIGUNUSED 
-# endif
-#endif
-
-#ifndef SWIG_MSC_UNSUPPRESS_4505
-# if defined(_MSC_VER)
-#   pragma warning(disable : 4505) /* unreferenced local function has been removed */
-# endif 
-#endif
-
-#ifndef SWIGUNUSEDPARM
-# ifdef __cplusplus
-#   define SWIGUNUSEDPARM(p)
-# else
-#   define SWIGUNUSEDPARM(p) p SWIGUNUSED 
-# endif
-#endif
-
-/* internal SWIG method */
-#ifndef SWIGINTERN
-# define SWIGINTERN static SWIGUNUSED
-#endif
-
-/* internal inline SWIG method */
-#ifndef SWIGINTERNINLINE
-# define SWIGINTERNINLINE SWIGINTERN SWIGINLINE
-#endif
-
-/* exporting methods */
-#if (__GNUC__ >= 4) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)
-#  ifndef GCC_HASCLASSVISIBILITY
-#    define GCC_HASCLASSVISIBILITY
-#  endif
-#endif
-
-#ifndef SWIGEXPORT
-# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)
-#   if defined(STATIC_LINKED)
-#     define SWIGEXPORT
-#   else
-#     define SWIGEXPORT __declspec(dllexport)
-#   endif
-# else
-#   if defined(__GNUC__) && defined(GCC_HASCLASSVISIBILITY)
-#     define SWIGEXPORT __attribute__ ((visibility("default")))
-#   else
-#     define SWIGEXPORT
-#   endif
-# endif
-#endif
-
-/* calling conventions for Windows */
-#ifndef SWIGSTDCALL
-# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)
-#   define SWIGSTDCALL __stdcall
-# else
-#   define SWIGSTDCALL
-# endif 
-#endif
-
-/* Deal with Microsoft's attempt at deprecating C standard runtime functions */
-#if !defined(SWIG_NO_CRT_SECURE_NO_DEPRECATE) && defined(_MSC_VER) && !defined(_CRT_SECURE_NO_DEPRECATE)
-# define _CRT_SECURE_NO_DEPRECATE
-#endif
-
-/* Deal with Microsoft's attempt at deprecating methods in the standard C++ library */
-#if !defined(SWIG_NO_SCL_SECURE_NO_DEPRECATE) && defined(_MSC_VER) && !defined(_SCL_SECURE_NO_DEPRECATE)
-# define _SCL_SECURE_NO_DEPRECATE
-#endif
-
+/* -----------------------------------------------------------------------------
+ *  This section contains generic SWIG labels for method/variable
+ *  declarations/attributes, and other compiler dependent labels.
+ * ----------------------------------------------------------------------------- */
+
+/* template workaround for compilers that cannot correctly implement the C++ standard */
+#ifndef SWIGTEMPLATEDISAMBIGUATOR
+# if defined(__SUNPRO_CC) && (__SUNPRO_CC <= 0x560)
+#  define SWIGTEMPLATEDISAMBIGUATOR template
+# elif defined(__HP_aCC)
+/* Needed even with `aCC -AA' when `aCC -V' reports HP ANSI C++ B3910B A.03.55 */
+/* If we find a maximum version that requires this, the test would be __HP_aCC <= 35500 for A.03.55 */
+#  define SWIGTEMPLATEDISAMBIGUATOR template
+# else
+#  define SWIGTEMPLATEDISAMBIGUATOR
+# endif
+#endif
+
+/* inline attribute */
+#ifndef SWIGINLINE
+# if defined(__cplusplus) || (defined(__GNUC__) && !defined(__STRICT_ANSI__))
+#   define SWIGINLINE inline
+# else
+#   define SWIGINLINE
+# endif
+#endif
+
+/* attribute recognised by some compilers to avoid 'unused' warnings */
+#ifndef SWIGUNUSED
+# if defined(__GNUC__)
+#   if !(defined(__cplusplus)) || (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4))
+#     define SWIGUNUSED __attribute__ ((__unused__)) 
+#   else
+#     define SWIGUNUSED
+#   endif
+# elif defined(__ICC)
+#   define SWIGUNUSED __attribute__ ((__unused__)) 
+# else
+#   define SWIGUNUSED 
+# endif
+#endif
+
+#ifndef SWIG_MSC_UNSUPPRESS_4505
+# if defined(_MSC_VER)
+#   pragma warning(disable : 4505) /* unreferenced local function has been removed */
+# endif 
+#endif
+
+#ifndef SWIGUNUSEDPARM
+# ifdef __cplusplus
+#   define SWIGUNUSEDPARM(p)
+# else
+#   define SWIGUNUSEDPARM(p) p SWIGUNUSED 
+# endif
+#endif
+
+/* internal SWIG method */
+#ifndef SWIGINTERN
+# define SWIGINTERN static SWIGUNUSED
+#endif
+
+/* internal inline SWIG method */
+#ifndef SWIGINTERNINLINE
+# define SWIGINTERNINLINE SWIGINTERN SWIGINLINE
+#endif
+
+/* exporting methods */
+#if (__GNUC__ >= 4) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)
+#  ifndef GCC_HASCLASSVISIBILITY
+#    define GCC_HASCLASSVISIBILITY
+#  endif
+#endif
+
+#ifndef SWIGEXPORT
+# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)
+#   if defined(STATIC_LINKED)
+#     define SWIGEXPORT
+#   else
+#     define SWIGEXPORT __declspec(dllexport)
+#   endif
+# else
+#   if defined(__GNUC__) && defined(GCC_HASCLASSVISIBILITY)
+#     define SWIGEXPORT __attribute__ ((visibility("default")))
+#   else
+#     define SWIGEXPORT
+#   endif
+# endif
+#endif
+
+/* calling conventions for Windows */
+#ifndef SWIGSTDCALL
+# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)
+#   define SWIGSTDCALL __stdcall
+# else
+#   define SWIGSTDCALL
+# endif 
+#endif
+
+/* Deal with Microsoft's attempt at deprecating C standard runtime functions */
+#if !defined(SWIG_NO_CRT_SECURE_NO_DEPRECATE) && defined(_MSC_VER) && !defined(_CRT_SECURE_NO_DEPRECATE)
+# define _CRT_SECURE_NO_DEPRECATE
+#endif
+
+/* Deal with Microsoft's attempt at deprecating methods in the standard C++ library */
+#if !defined(SWIG_NO_SCL_SECURE_NO_DEPRECATE) && defined(_MSC_VER) && !defined(_SCL_SECURE_NO_DEPRECATE)
+# define _SCL_SECURE_NO_DEPRECATE
+#endif
+
 
 
 #include <stdlib.h>
@@ -202,7 +202,7 @@ static SWIG_CSharpException_t SWIG_csharp_exceptions[] = {
 static SWIG_CSharpExceptionArgument_t SWIG_csharp_exceptions_argument[] = {
   { SWIG_CSharpArgumentException, NULL },
   { SWIG_CSharpArgumentNullException, NULL },
-  { SWIG_CSharpArgumentOutOfRangeException, NULL }
+  { SWIG_CSharpArgumentOutOfRangeException, NULL },
 };
 
 static void SWIGUNUSED SWIG_CSharpSetPendingException(SWIG_CSharpExceptionCodes code, const char *msg) {
@@ -280,56 +280,56 @@ 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 
- * methods can be called from C++.
- * ----------------------------------------------------------------------------- */
-
-#ifdef __cplusplus
-
-#if defined(DEBUG_DIRECTOR_OWNED)
-#include <iostream>
-#endif
-#include <string>
-
-namespace Swig {
-  /* Director base class - not currently used in C# directors */
-  class Director {
-  };
-
-  /* Base class for director exceptions */
-  class DirectorException {
-  protected:
-    std::string swig_msg;
-
-  public:
-    DirectorException(const char* msg) : swig_msg(msg) {
-    }
-    DirectorException(const std::string &msg) : swig_msg(msg) {
-    }
-    const std::string& what() const {
-      return swig_msg;
-    }
-    virtual ~DirectorException() {
-    }
-  };
-
-  /* Pure virtual method exception */
-  class DirectorPureVirtualException : public Swig::DirectorException {
-  public:
-    DirectorPureVirtualException(const char* msg) : DirectorException(std::string("Attempt to invoke pure virtual method ") + msg) {
-    }
-  };
-}
-
-#endif /* __cplusplus */
-
-
+/* -----------------------------------------------------------------------------
+ * 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 
+ * methods can be called from C++.
+ * ----------------------------------------------------------------------------- */
+
+#ifdef __cplusplus
+
+#if defined(DEBUG_DIRECTOR_OWNED)
+#include <iostream>
+#endif
+#include <string>
+
+namespace Swig {
+  /* Director base class - not currently used in C# directors */
+  class Director {
+  };
+
+  /* Base class for director exceptions */
+  class DirectorException {
+  protected:
+    std::string swig_msg;
+
+  public:
+    DirectorException(const char* msg) : swig_msg(msg) {
+    }
+    DirectorException(const std::string &msg) : swig_msg(msg) {
+    }
+    const std::string& what() const {
+      return swig_msg;
+    }
+    virtual ~DirectorException() {
+    }
+  };
+
+  /* Pure virtual method exception */
+  class DirectorPureVirtualException : public Swig::DirectorException {
+  public:
+    DirectorPureVirtualException(const char* msg) : DirectorException(std::string("Attempt to invoke pure virtual method ") + msg) {
+    }
+  };
+}
+
+#endif /* __cplusplus */
+
+
 
 #include "DDebug.h"
 
@@ -339,6 +339,9 @@ namespace Swig {
 #include "SipEvent.h"
 #include "SipSession.h"
 
+#include "ProxyConsumer.h"
+#include "ProxyProducer.h"
+
 #include "SipCallback.h"
 #include "SafeObject.h"
 #include "SipStack.h"
@@ -351,6 +354,168 @@ namespace Swig {
 
 #include "tinyWRAP_wrap.h"
 
+SwigDirector_ProxyAudioConsumer::SwigDirector_ProxyAudioConsumer() : ProxyAudioConsumer(), Swig::Director() {
+  swig_init_callbacks();
+}
+
+SwigDirector_ProxyAudioConsumer::~SwigDirector_ProxyAudioConsumer() {
+  
+}
+
+
+int SwigDirector_ProxyAudioConsumer::prepare(int ptime, int rate, int channels) {
+  int c_result = SwigValueInit< int >() ;
+  int jresult = 0 ;
+  int jptime  ;
+  int jrate  ;
+  int jchannels  ;
+  
+  if (!swig_callbackprepare) {
+    return ProxyAudioConsumer::prepare(ptime,rate,channels);
+  } else {
+    jptime = ptime;
+    jrate = rate;
+    jchannels = channels;
+    jresult = (int) swig_callbackprepare(jptime, jrate, jchannels);
+    c_result = (int)jresult; 
+  }
+  return c_result;
+}
+
+int SwigDirector_ProxyAudioConsumer::start() {
+  int c_result = SwigValueInit< int >() ;
+  int jresult = 0 ;
+  
+  if (!swig_callbackstart) {
+    return ProxyAudioConsumer::start();
+  } else {
+    jresult = (int) swig_callbackstart();
+    c_result = (int)jresult; 
+  }
+  return c_result;
+}
+
+int SwigDirector_ProxyAudioConsumer::pause() {
+  int c_result = SwigValueInit< int >() ;
+  int jresult = 0 ;
+  
+  if (!swig_callbackpause) {
+    return ProxyAudioConsumer::pause();
+  } else {
+    jresult = (int) swig_callbackpause();
+    c_result = (int)jresult; 
+  }
+  return c_result;
+}
+
+int SwigDirector_ProxyAudioConsumer::stop() {
+  int c_result = SwigValueInit< int >() ;
+  int jresult = 0 ;
+  
+  if (!swig_callbackstop) {
+    return ProxyAudioConsumer::stop();
+  } else {
+    jresult = (int) swig_callbackstop();
+    c_result = (int)jresult; 
+  }
+  return c_result;
+}
+
+void SwigDirector_ProxyAudioConsumer::swig_connect_director(SWIG_Callback0_t callbackprepare, SWIG_Callback1_t callbackstart, SWIG_Callback2_t callbackpause, SWIG_Callback3_t callbackstop) {
+  swig_callbackprepare = callbackprepare;
+  swig_callbackstart = callbackstart;
+  swig_callbackpause = callbackpause;
+  swig_callbackstop = callbackstop;
+}
+
+void SwigDirector_ProxyAudioConsumer::swig_init_callbacks() {
+  swig_callbackprepare = 0;
+  swig_callbackstart = 0;
+  swig_callbackpause = 0;
+  swig_callbackstop = 0;
+}
+
+SwigDirector_ProxyAudioProducer::SwigDirector_ProxyAudioProducer() : ProxyAudioProducer(), Swig::Director() {
+  swig_init_callbacks();
+}
+
+SwigDirector_ProxyAudioProducer::~SwigDirector_ProxyAudioProducer() {
+  
+}
+
+
+int SwigDirector_ProxyAudioProducer::prepare(int ptime, int rate, int channels) {
+  int c_result = SwigValueInit< int >() ;
+  int jresult = 0 ;
+  int jptime  ;
+  int jrate  ;
+  int jchannels  ;
+  
+  if (!swig_callbackprepare) {
+    return ProxyAudioProducer::prepare(ptime,rate,channels);
+  } else {
+    jptime = ptime;
+    jrate = rate;
+    jchannels = channels;
+    jresult = (int) swig_callbackprepare(jptime, jrate, jchannels);
+    c_result = (int)jresult; 
+  }
+  return c_result;
+}
+
+int SwigDirector_ProxyAudioProducer::start() {
+  int c_result = SwigValueInit< int >() ;
+  int jresult = 0 ;
+  
+  if (!swig_callbackstart) {
+    return ProxyAudioProducer::start();
+  } else {
+    jresult = (int) swig_callbackstart();
+    c_result = (int)jresult; 
+  }
+  return c_result;
+}
+
+int SwigDirector_ProxyAudioProducer::pause() {
+  int c_result = SwigValueInit< int >() ;
+  int jresult = 0 ;
+  
+  if (!swig_callbackpause) {
+    return ProxyAudioProducer::pause();
+  } else {
+    jresult = (int) swig_callbackpause();
+    c_result = (int)jresult; 
+  }
+  return c_result;
+}
+
+int SwigDirector_ProxyAudioProducer::stop() {
+  int c_result = SwigValueInit< int >() ;
+  int jresult = 0 ;
+  
+  if (!swig_callbackstop) {
+    return ProxyAudioProducer::stop();
+  } else {
+    jresult = (int) swig_callbackstop();
+    c_result = (int)jresult; 
+  }
+  return c_result;
+}
+
+void SwigDirector_ProxyAudioProducer::swig_connect_director(SWIG_Callback0_t callbackprepare, SWIG_Callback1_t callbackstart, SWIG_Callback2_t callbackpause, SWIG_Callback3_t callbackstop) {
+  swig_callbackprepare = callbackprepare;
+  swig_callbackstart = callbackstart;
+  swig_callbackpause = callbackpause;
+  swig_callbackstop = callbackstop;
+}
+
+void SwigDirector_ProxyAudioProducer::swig_init_callbacks() {
+  swig_callbackprepare = 0;
+  swig_callbackstart = 0;
+  swig_callbackpause = 0;
+  swig_callbackstop = 0;
+}
+
 SwigDirector_SipCallback::SwigDirector_SipCallback() : SipCallback(), Swig::Director() {
   swig_init_callbacks();
 }
@@ -1140,6 +1305,52 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_SipSession_getId(void * jarg1) {
 }
 
 
+SWIGEXPORT void * SWIGSTDCALL CSharp_new_CallSession(void * jarg1) {
+  void * jresult ;
+  SipStack *arg1 = (SipStack *) 0 ;
+  CallSession *result = 0 ;
+  
+  arg1 = (SipStack *)jarg1; 
+  result = (CallSession *)new CallSession(arg1);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_delete_CallSession(void * jarg1) {
+  CallSession *arg1 = (CallSession *) 0 ;
+  
+  arg1 = (CallSession *)jarg1; 
+  delete arg1;
+}
+
+
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_CallSession_Call(void * jarg1, char * jarg2) {
+  unsigned int jresult ;
+  CallSession *arg1 = (CallSession *) 0 ;
+  char *arg2 = (char *) 0 ;
+  bool result;
+  
+  arg1 = (CallSession *)jarg1; 
+  arg2 = (char *)jarg2; 
+  result = (bool)(arg1)->Call((char const *)arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_CallSession_Hangup(void * jarg1) {
+  unsigned int jresult ;
+  CallSession *arg1 = (CallSession *) 0 ;
+  bool result;
+  
+  arg1 = (CallSession *)jarg1; 
+  result = (bool)(arg1)->Hangup();
+  jresult = result; 
+  return jresult;
+}
+
+
 SWIGEXPORT void * SWIGSTDCALL CSharp_new_MessagingSession(void * jarg1) {
   void * jresult ;
   SipStack *arg1 = (SipStack *) 0 ;
@@ -1368,6 +1579,344 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_SubscriptionSession_UnSubscribe(void
 }
 
 
+SWIGEXPORT void * SWIGSTDCALL CSharp_new_ProxyAudioConsumer() {
+  void * jresult ;
+  ProxyAudioConsumer *result = 0 ;
+  
+  result = (ProxyAudioConsumer *)new SwigDirector_ProxyAudioConsumer();
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_delete_ProxyAudioConsumer(void * jarg1) {
+  ProxyAudioConsumer *arg1 = (ProxyAudioConsumer *) 0 ;
+  
+  arg1 = (ProxyAudioConsumer *)jarg1; 
+  delete arg1;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_ProxyAudioConsumer_prepare(void * jarg1, int jarg2, int jarg3, int jarg4) {
+  int jresult ;
+  ProxyAudioConsumer *arg1 = (ProxyAudioConsumer *) 0 ;
+  int arg2 ;
+  int arg3 ;
+  int arg4 ;
+  int result;
+  
+  arg1 = (ProxyAudioConsumer *)jarg1; 
+  arg2 = (int)jarg2; 
+  arg3 = (int)jarg3; 
+  arg4 = (int)jarg4; 
+  result = (int)(arg1)->prepare(arg2,arg3,arg4);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_ProxyAudioConsumer_prepareSwigExplicitProxyAudioConsumer(void * jarg1, int jarg2, int jarg3, int jarg4) {
+  int jresult ;
+  ProxyAudioConsumer *arg1 = (ProxyAudioConsumer *) 0 ;
+  int arg2 ;
+  int arg3 ;
+  int arg4 ;
+  int result;
+  
+  arg1 = (ProxyAudioConsumer *)jarg1; 
+  arg2 = (int)jarg2; 
+  arg3 = (int)jarg3; 
+  arg4 = (int)jarg4; 
+  result = (int)(arg1)->ProxyAudioConsumer::prepare(arg2,arg3,arg4);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_ProxyAudioConsumer_start(void * jarg1) {
+  int jresult ;
+  ProxyAudioConsumer *arg1 = (ProxyAudioConsumer *) 0 ;
+  int result;
+  
+  arg1 = (ProxyAudioConsumer *)jarg1; 
+  result = (int)(arg1)->start();
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_ProxyAudioConsumer_startSwigExplicitProxyAudioConsumer(void * jarg1) {
+  int jresult ;
+  ProxyAudioConsumer *arg1 = (ProxyAudioConsumer *) 0 ;
+  int result;
+  
+  arg1 = (ProxyAudioConsumer *)jarg1; 
+  result = (int)(arg1)->ProxyAudioConsumer::start();
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_ProxyAudioConsumer_pause(void * jarg1) {
+  int jresult ;
+  ProxyAudioConsumer *arg1 = (ProxyAudioConsumer *) 0 ;
+  int result;
+  
+  arg1 = (ProxyAudioConsumer *)jarg1; 
+  result = (int)(arg1)->pause();
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_ProxyAudioConsumer_pauseSwigExplicitProxyAudioConsumer(void * jarg1) {
+  int jresult ;
+  ProxyAudioConsumer *arg1 = (ProxyAudioConsumer *) 0 ;
+  int result;
+  
+  arg1 = (ProxyAudioConsumer *)jarg1; 
+  result = (int)(arg1)->ProxyAudioConsumer::pause();
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_ProxyAudioConsumer_stop(void * jarg1) {
+  int jresult ;
+  ProxyAudioConsumer *arg1 = (ProxyAudioConsumer *) 0 ;
+  int result;
+  
+  arg1 = (ProxyAudioConsumer *)jarg1; 
+  result = (int)(arg1)->stop();
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_ProxyAudioConsumer_stopSwigExplicitProxyAudioConsumer(void * jarg1) {
+  int jresult ;
+  ProxyAudioConsumer *arg1 = (ProxyAudioConsumer *) 0 ;
+  int result;
+  
+  arg1 = (ProxyAudioConsumer *)jarg1; 
+  result = (int)(arg1)->ProxyAudioConsumer::stop();
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_ProxyAudioConsumer_setActivate(void * jarg1) {
+  ProxyAudioConsumer *arg1 = (ProxyAudioConsumer *) 0 ;
+  
+  arg1 = (ProxyAudioConsumer *)jarg1; 
+  (arg1)->setActivate();
+}
+
+
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_ProxyAudioConsumer_pull(void * jarg1, void * jarg2, unsigned int jarg3) {
+  unsigned int jresult ;
+  ProxyAudioConsumer *arg1 = (ProxyAudioConsumer *) 0 ;
+  void *arg2 = (void *) 0 ;
+  unsigned int arg3 ;
+  unsigned int result;
+  
+  arg1 = (ProxyAudioConsumer *)jarg1; 
+  arg2 = jarg2; 
+  arg3 = (unsigned int)jarg3; 
+  result = (unsigned int)(arg1)->pull(arg2,arg3);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_ProxyAudioConsumer_registerPlugin() {
+  unsigned int jresult ;
+  bool result;
+  
+  result = (bool)ProxyAudioConsumer::registerPlugin();
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_ProxyAudioConsumer_director_connect(void *objarg, SwigDirector_ProxyAudioConsumer::SWIG_Callback0_t callback0, SwigDirector_ProxyAudioConsumer::SWIG_Callback1_t callback1, SwigDirector_ProxyAudioConsumer::SWIG_Callback2_t callback2, SwigDirector_ProxyAudioConsumer::SWIG_Callback3_t callback3) {
+  ProxyAudioConsumer *obj = (ProxyAudioConsumer *)objarg;
+  SwigDirector_ProxyAudioConsumer *director = dynamic_cast<SwigDirector_ProxyAudioConsumer *>(obj);
+  if (director) {
+    director->swig_connect_director(callback0, callback1, callback2, callback3);
+  }
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_new_ProxyAudioProducer() {
+  void * jresult ;
+  ProxyAudioProducer *result = 0 ;
+  
+  result = (ProxyAudioProducer *)new SwigDirector_ProxyAudioProducer();
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_delete_ProxyAudioProducer(void * jarg1) {
+  ProxyAudioProducer *arg1 = (ProxyAudioProducer *) 0 ;
+  
+  arg1 = (ProxyAudioProducer *)jarg1; 
+  delete arg1;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_ProxyAudioProducer_prepare(void * jarg1, int jarg2, int jarg3, int jarg4) {
+  int jresult ;
+  ProxyAudioProducer *arg1 = (ProxyAudioProducer *) 0 ;
+  int arg2 ;
+  int arg3 ;
+  int arg4 ;
+  int result;
+  
+  arg1 = (ProxyAudioProducer *)jarg1; 
+  arg2 = (int)jarg2; 
+  arg3 = (int)jarg3; 
+  arg4 = (int)jarg4; 
+  result = (int)(arg1)->prepare(arg2,arg3,arg4);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_ProxyAudioProducer_prepareSwigExplicitProxyAudioProducer(void * jarg1, int jarg2, int jarg3, int jarg4) {
+  int jresult ;
+  ProxyAudioProducer *arg1 = (ProxyAudioProducer *) 0 ;
+  int arg2 ;
+  int arg3 ;
+  int arg4 ;
+  int result;
+  
+  arg1 = (ProxyAudioProducer *)jarg1; 
+  arg2 = (int)jarg2; 
+  arg3 = (int)jarg3; 
+  arg4 = (int)jarg4; 
+  result = (int)(arg1)->ProxyAudioProducer::prepare(arg2,arg3,arg4);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_ProxyAudioProducer_start(void * jarg1) {
+  int jresult ;
+  ProxyAudioProducer *arg1 = (ProxyAudioProducer *) 0 ;
+  int result;
+  
+  arg1 = (ProxyAudioProducer *)jarg1; 
+  result = (int)(arg1)->start();
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_ProxyAudioProducer_startSwigExplicitProxyAudioProducer(void * jarg1) {
+  int jresult ;
+  ProxyAudioProducer *arg1 = (ProxyAudioProducer *) 0 ;
+  int result;
+  
+  arg1 = (ProxyAudioProducer *)jarg1; 
+  result = (int)(arg1)->ProxyAudioProducer::start();
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_ProxyAudioProducer_pause(void * jarg1) {
+  int jresult ;
+  ProxyAudioProducer *arg1 = (ProxyAudioProducer *) 0 ;
+  int result;
+  
+  arg1 = (ProxyAudioProducer *)jarg1; 
+  result = (int)(arg1)->pause();
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_ProxyAudioProducer_pauseSwigExplicitProxyAudioProducer(void * jarg1) {
+  int jresult ;
+  ProxyAudioProducer *arg1 = (ProxyAudioProducer *) 0 ;
+  int result;
+  
+  arg1 = (ProxyAudioProducer *)jarg1; 
+  result = (int)(arg1)->ProxyAudioProducer::pause();
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_ProxyAudioProducer_stop(void * jarg1) {
+  int jresult ;
+  ProxyAudioProducer *arg1 = (ProxyAudioProducer *) 0 ;
+  int result;
+  
+  arg1 = (ProxyAudioProducer *)jarg1; 
+  result = (int)(arg1)->stop();
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_ProxyAudioProducer_stopSwigExplicitProxyAudioProducer(void * jarg1) {
+  int jresult ;
+  ProxyAudioProducer *arg1 = (ProxyAudioProducer *) 0 ;
+  int result;
+  
+  arg1 = (ProxyAudioProducer *)jarg1; 
+  result = (int)(arg1)->ProxyAudioProducer::stop();
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_ProxyAudioProducer_setActivate(void * jarg1) {
+  ProxyAudioProducer *arg1 = (ProxyAudioProducer *) 0 ;
+  
+  arg1 = (ProxyAudioProducer *)jarg1; 
+  (arg1)->setActivate();
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_ProxyAudioProducer_push(void * jarg1, void * jarg2, unsigned int jarg3) {
+  int jresult ;
+  ProxyAudioProducer *arg1 = (ProxyAudioProducer *) 0 ;
+  void *arg2 = (void *) 0 ;
+  unsigned int arg3 ;
+  int result;
+  
+  arg1 = (ProxyAudioProducer *)jarg1; 
+  arg2 = jarg2; 
+  arg3 = (unsigned int)jarg3; 
+  result = (int)(arg1)->push((void const *)arg2,arg3);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_ProxyAudioProducer_registerPlugin() {
+  unsigned int jresult ;
+  bool result;
+  
+  result = (bool)ProxyAudioProducer::registerPlugin();
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_ProxyAudioProducer_director_connect(void *objarg, SwigDirector_ProxyAudioProducer::SWIG_Callback0_t callback0, SwigDirector_ProxyAudioProducer::SWIG_Callback1_t callback1, SwigDirector_ProxyAudioProducer::SWIG_Callback2_t callback2, SwigDirector_ProxyAudioProducer::SWIG_Callback3_t callback3) {
+  ProxyAudioProducer *obj = (ProxyAudioProducer *)objarg;
+  SwigDirector_ProxyAudioProducer *director = dynamic_cast<SwigDirector_ProxyAudioProducer *>(obj);
+  if (director) {
+    director->swig_connect_director(callback0, callback1, callback2, callback3);
+  }
+}
+
+
 SWIGEXPORT void * SWIGSTDCALL CSharp_new_SipCallback() {
   void * jresult ;
   SipCallback *result = 0 ;
@@ -2055,6 +2604,10 @@ SWIGEXPORT SipEvent * SWIGSTDCALL CSharp_SubscriptionEventUpcast(SubscriptionEve
     return (SipEvent *)objectRef;
 }
 
+SWIGEXPORT SipSession * SWIGSTDCALL CSharp_CallSessionUpcast(CallSession *objectRef) {
+    return (SipSession *)objectRef;
+}
+
 SWIGEXPORT SipSession * SWIGSTDCALL CSharp_MessagingSessionUpcast(MessagingSession *objectRef) {
     return (SipSession *)objectRef;
 }

trunk/bindings/csharp/tinyWRAP_wrap.h

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 1.3.39
  * 
  * 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
@@ -11,6 +11,54 @@
 #ifndef SWIG_tinyWRAP_WRAP_H_
 #define SWIG_tinyWRAP_WRAP_H_
 
+class SwigDirector_ProxyAudioConsumer : public ProxyAudioConsumer, public Swig::Director {
+
+public:
+    SwigDirector_ProxyAudioConsumer();
+    virtual ~SwigDirector_ProxyAudioConsumer();
+    virtual int prepare(int ptime, int rate, int channels);
+    virtual int start();
+    virtual int pause();
+    virtual int stop();
+
+    typedef int (SWIGSTDCALL* SWIG_Callback0_t)(int, int, int);
+    typedef int (SWIGSTDCALL* SWIG_Callback1_t)();
+    typedef int (SWIGSTDCALL* SWIG_Callback2_t)();
+    typedef int (SWIGSTDCALL* SWIG_Callback3_t)();
+    void swig_connect_director(SWIG_Callback0_t callbackprepare, SWIG_Callback1_t callbackstart, SWIG_Callback2_t callbackpause, SWIG_Callback3_t callbackstop);
+
+private:
+    SWIG_Callback0_t swig_callbackprepare;
+    SWIG_Callback1_t swig_callbackstart;
+    SWIG_Callback2_t swig_callbackpause;
+    SWIG_Callback3_t swig_callbackstop;
+    void swig_init_callbacks();
+};
+
+class SwigDirector_ProxyAudioProducer : public ProxyAudioProducer, public Swig::Director {
+
+public:
+    SwigDirector_ProxyAudioProducer();
+    virtual ~SwigDirector_ProxyAudioProducer();
+    virtual int prepare(int ptime, int rate, int channels);
+    virtual int start();
+    virtual int pause();
+    virtual int stop();
+
+    typedef int (SWIGSTDCALL* SWIG_Callback0_t)(int, int, int);
+    typedef int (SWIGSTDCALL* SWIG_Callback1_t)();
+    typedef int (SWIGSTDCALL* SWIG_Callback2_t)();
+    typedef int (SWIGSTDCALL* SWIG_Callback3_t)();
+    void swig_connect_director(SWIG_Callback0_t callbackprepare, SWIG_Callback1_t callbackstart, SWIG_Callback2_t callbackpause, SWIG_Callback3_t callbackstop);
+
+private:
+    SWIG_Callback0_t swig_callbackprepare;
+    SWIG_Callback1_t swig_callbackstart;
+    SWIG_Callback2_t swig_callbackpause;
+    SWIG_Callback3_t swig_callbackstop;
+    void swig_init_callbacks();
+};
+
 class SwigDirector_SipCallback : public SipCallback, public Swig::Director {
 
 public:

trunk/bindings/csharp/tsip_event_type_t.cs

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

trunk/bindings/csharp/tsip_message_event_type_t.cs

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

trunk/bindings/csharp/tsip_options_event_type_t.cs

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

trunk/bindings/csharp/tsip_publish_event_type_t.cs

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

trunk/bindings/csharp/tsip_register_event_type_t.cs

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

trunk/bindings/csharp/tsip_subscribe_event_type_t.cs

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

trunk/bindings/java/CallSession.java

@@ -0,0 +1,48 @@
+/* ----------------------------------------------------------------------------
+ * This file was automatically generated by SWIG (http://www.swig.org).
+ * Version 1.3.39
+ *
+ * Do not make changes to this file unless you know what you are doing--modify
+ * the SWIG interface file instead.
+ * ----------------------------------------------------------------------------- */
+
+package org.doubango.tinyWRAP;
+
+public class CallSession extends SipSession {
+  private long swigCPtr;
+
+  protected CallSession(long cPtr, boolean cMemoryOwn) {
+    super(tinyWRAPJNI.SWIGCallSessionUpcast(cPtr), cMemoryOwn);
+    swigCPtr = cPtr;
+  }
+
+  protected static long getCPtr(CallSession obj) {
+    return (obj == null) ? 0 : obj.swigCPtr;
+  }
+
+  protected void finalize() {
+    delete();
+  }
+
+  public synchronized void delete() {
+    if(swigCPtr != 0 && swigCMemOwn) {
+      swigCMemOwn = false;
+      tinyWRAPJNI.delete_CallSession(swigCPtr);
+    }
+    swigCPtr = 0;
+    super.delete();
+  }
+
+  public CallSession(SipStack Stack) {
+    this(tinyWRAPJNI.new_CallSession(SipStack.getCPtr(Stack), Stack), true);
+  }
+
+  public boolean Call(String remoteUri) {
+    return tinyWRAPJNI.CallSession_Call(swigCPtr, this, remoteUri);
+  }
+
+  public boolean Hangup() {
+    return tinyWRAPJNI.CallSession_Hangup(swigCPtr, this);
+  }
+
+}

trunk/bindings/java/DDebugCallback.java

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 1.3.39
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -26,13 +26,11 @@ public class DDebugCallback {
   }
 
   public synchronized void delete() {
-    if (swigCPtr != 0) {
-      if (swigCMemOwn) {
-        swigCMemOwn = false;
-        tinyWRAPJNI.delete_DDebugCallback(swigCPtr);
-      }
-      swigCPtr = 0;
+    if(swigCPtr != 0 && swigCMemOwn) {
+      swigCMemOwn = false;
+      tinyWRAPJNI.delete_DDebugCallback(swigCPtr);
     }
+    swigCPtr = 0;
   }
 
   public DDebugCallback() {

trunk/bindings/java/DialogEvent.java

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 1.3.39
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -25,13 +25,11 @@ public class DialogEvent extends SipEvent {
   }
 
   public synchronized void delete() {
-    if (swigCPtr != 0) {
-      if (swigCMemOwn) {
-        swigCMemOwn = false;
-        tinyWRAPJNI.delete_DialogEvent(swigCPtr);
-      }
-      swigCPtr = 0;
+    if(swigCPtr != 0 && swigCMemOwn) {
+      swigCMemOwn = false;
+      tinyWRAPJNI.delete_DialogEvent(swigCPtr);
     }
+    swigCPtr = 0;
     super.delete();
   }
 

trunk/bindings/java/MessagingEvent.java

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 1.3.39
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -25,13 +25,11 @@ public class MessagingEvent extends SipEvent {
   }
 
   public synchronized void delete() {
-    if (swigCPtr != 0) {
-      if (swigCMemOwn) {
-        swigCMemOwn = false;
-        tinyWRAPJNI.delete_MessagingEvent(swigCPtr);
-      }
-      swigCPtr = 0;
+    if(swigCPtr != 0 && swigCMemOwn) {
+      swigCMemOwn = false;
+      tinyWRAPJNI.delete_MessagingEvent(swigCPtr);
     }
+    swigCPtr = 0;
     super.delete();
   }
 

trunk/bindings/java/MessagingSession.java

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 1.3.39
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -25,13 +25,11 @@ public class MessagingSession extends SipSession {
   }
 
   public synchronized void delete() {
-    if (swigCPtr != 0) {
-      if (swigCMemOwn) {
-        swigCMemOwn = false;
-        tinyWRAPJNI.delete_MessagingSession(swigCPtr);
-      }
-      swigCPtr = 0;
+    if(swigCPtr != 0 && swigCMemOwn) {
+      swigCMemOwn = false;
+      tinyWRAPJNI.delete_MessagingSession(swigCPtr);
     }
+    swigCPtr = 0;
     super.delete();
   }
 

trunk/bindings/java/OptionsEvent.java

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 1.3.39
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -25,13 +25,11 @@ public class OptionsEvent extends SipEvent {
   }
 
   public synchronized void delete() {
-    if (swigCPtr != 0) {
-      if (swigCMemOwn) {
-        swigCMemOwn = false;
-        tinyWRAPJNI.delete_OptionsEvent(swigCPtr);
-      }
-      swigCPtr = 0;
+    if(swigCPtr != 0 && swigCMemOwn) {
+      swigCMemOwn = false;
+      tinyWRAPJNI.delete_OptionsEvent(swigCPtr);
     }
+    swigCPtr = 0;
     super.delete();
   }
 

trunk/bindings/java/OptionsSession.java

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 1.3.39
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -25,13 +25,11 @@ public class OptionsSession extends SipSession {
   }
 
   public synchronized void delete() {
-    if (swigCPtr != 0) {
-      if (swigCMemOwn) {
-        swigCMemOwn = false;
-        tinyWRAPJNI.delete_OptionsSession(swigCPtr);
-      }
-      swigCPtr = 0;
+    if(swigCPtr != 0 && swigCMemOwn) {
+      swigCMemOwn = false;
+      tinyWRAPJNI.delete_OptionsSession(swigCPtr);
     }
+    swigCPtr = 0;
     super.delete();
   }
 

trunk/bindings/java/ProxyAudioConsumer.java

@@ -0,0 +1,84 @@
+/* ----------------------------------------------------------------------------
+ * This file was automatically generated by SWIG (http://www.swig.org).
+ * Version 1.3.39
+ *
+ * Do not make changes to this file unless you know what you are doing--modify
+ * the SWIG interface file instead.
+ * ----------------------------------------------------------------------------- */
+
+package org.doubango.tinyWRAP;
+
+public class ProxyAudioConsumer {
+  private long swigCPtr;
+  protected boolean swigCMemOwn;
+
+  protected ProxyAudioConsumer(long cPtr, boolean cMemoryOwn) {
+    swigCMemOwn = cMemoryOwn;
+    swigCPtr = cPtr;
+  }
+
+  protected static long getCPtr(ProxyAudioConsumer obj) {
+    return (obj == null) ? 0 : obj.swigCPtr;
+  }
+
+  protected void finalize() {
+    delete();
+  }
+
+  public synchronized void delete() {
+    if(swigCPtr != 0 && swigCMemOwn) {
+      swigCMemOwn = false;
+      tinyWRAPJNI.delete_ProxyAudioConsumer(swigCPtr);
+    }
+    swigCPtr = 0;
+  }
+
+  protected void swigDirectorDisconnect() {
+    swigCMemOwn = false;
+    delete();
+  }
+
+  public void swigReleaseOwnership() {
+    swigCMemOwn = false;
+    tinyWRAPJNI.ProxyAudioConsumer_change_ownership(this, swigCPtr, false);
+  }
+
+  public void swigTakeOwnership() {
+    swigCMemOwn = true;
+    tinyWRAPJNI.ProxyAudioConsumer_change_ownership(this, swigCPtr, true);
+  }
+
+  public ProxyAudioConsumer() {
+    this(tinyWRAPJNI.new_ProxyAudioConsumer(), true);
+    tinyWRAPJNI.ProxyAudioConsumer_director_connect(this, swigCPtr, swigCMemOwn, true);
+  }
+
+  public int prepare(int ptime, int rate, int channels) {
+    return (getClass() == ProxyAudioConsumer.class) ? tinyWRAPJNI.ProxyAudioConsumer_prepare(swigCPtr, this, ptime, rate, channels) : tinyWRAPJNI.ProxyAudioConsumer_prepareSwigExplicitProxyAudioConsumer(swigCPtr, this, ptime, rate, channels);
+  }
+
+  public int start() {
+    return (getClass() == ProxyAudioConsumer.class) ? tinyWRAPJNI.ProxyAudioConsumer_start(swigCPtr, this) : tinyWRAPJNI.ProxyAudioConsumer_startSwigExplicitProxyAudioConsumer(swigCPtr, this);
+  }
+
+  public int pause() {
+    return (getClass() == ProxyAudioConsumer.class) ? tinyWRAPJNI.ProxyAudioConsumer_pause(swigCPtr, this) : tinyWRAPJNI.ProxyAudioConsumer_pauseSwigExplicitProxyAudioConsumer(swigCPtr, this);
+  }
+
+  public int stop() {
+    return (getClass() == ProxyAudioConsumer.class) ? tinyWRAPJNI.ProxyAudioConsumer_stop(swigCPtr, this) : tinyWRAPJNI.ProxyAudioConsumer_stopSwigExplicitProxyAudioConsumer(swigCPtr, this);
+  }
+
+  public void setActivate() {
+    tinyWRAPJNI.ProxyAudioConsumer_setActivate(swigCPtr, this);
+  }
+
+  public long pull(java.nio.ByteBuffer output, long size) {
+    return tinyWRAPJNI.ProxyAudioConsumer_pull(swigCPtr, this, output, size);
+  }
+
+  public static boolean registerPlugin() {
+    return tinyWRAPJNI.ProxyAudioConsumer_registerPlugin();
+  }
+
+}

trunk/bindings/java/ProxyAudioProducer.java

@@ -0,0 +1,84 @@
+/* ----------------------------------------------------------------------------
+ * This file was automatically generated by SWIG (http://www.swig.org).
+ * Version 1.3.39
+ *
+ * Do not make changes to this file unless you know what you are doing--modify
+ * the SWIG interface file instead.
+ * ----------------------------------------------------------------------------- */
+
+package org.doubango.tinyWRAP;
+
+public class ProxyAudioProducer {
+  private long swigCPtr;
+  protected boolean swigCMemOwn;
+
+  protected ProxyAudioProducer(long cPtr, boolean cMemoryOwn) {
+    swigCMemOwn = cMemoryOwn;
+    swigCPtr = cPtr;
+  }
+
+  protected static long getCPtr(ProxyAudioProducer obj) {
+    return (obj == null) ? 0 : obj.swigCPtr;
+  }
+
+  protected void finalize() {
+    delete();
+  }
+
+  public synchronized void delete() {
+    if(swigCPtr != 0 && swigCMemOwn) {
+      swigCMemOwn = false;
+      tinyWRAPJNI.delete_ProxyAudioProducer(swigCPtr);
+    }
+    swigCPtr = 0;
+  }
+
+  protected void swigDirectorDisconnect() {
+    swigCMemOwn = false;
+    delete();
+  }
+
+  public void swigReleaseOwnership() {
+    swigCMemOwn = false;
+    tinyWRAPJNI.ProxyAudioProducer_change_ownership(this, swigCPtr, false);
+  }
+
+  public void swigTakeOwnership() {
+    swigCMemOwn = true;
+    tinyWRAPJNI.ProxyAudioProducer_change_ownership(this, swigCPtr, true);
+  }
+
+  public ProxyAudioProducer() {
+    this(tinyWRAPJNI.new_ProxyAudioProducer(), true);
+    tinyWRAPJNI.ProxyAudioProducer_director_connect(this, swigCPtr, swigCMemOwn, true);
+  }
+
+  public int prepare(int ptime, int rate, int channels) {
+    return (getClass() == ProxyAudioProducer.class) ? tinyWRAPJNI.ProxyAudioProducer_prepare(swigCPtr, this, ptime, rate, channels) : tinyWRAPJNI.ProxyAudioProducer_prepareSwigExplicitProxyAudioProducer(swigCPtr, this, ptime, rate, channels);
+  }
+
+  public int start() {
+    return (getClass() == ProxyAudioProducer.class) ? tinyWRAPJNI.ProxyAudioProducer_start(swigCPtr, this) : tinyWRAPJNI.ProxyAudioProducer_startSwigExplicitProxyAudioProducer(swigCPtr, this);
+  }
+
+  public int pause() {
+    return (getClass() == ProxyAudioProducer.class) ? tinyWRAPJNI.ProxyAudioProducer_pause(swigCPtr, this) : tinyWRAPJNI.ProxyAudioProducer_pauseSwigExplicitProxyAudioProducer(swigCPtr, this);
+  }
+
+  public int stop() {
+    return (getClass() == ProxyAudioProducer.class) ? tinyWRAPJNI.ProxyAudioProducer_stop(swigCPtr, this) : tinyWRAPJNI.ProxyAudioProducer_stopSwigExplicitProxyAudioProducer(swigCPtr, this);
+  }
+
+  public void setActivate() {
+    tinyWRAPJNI.ProxyAudioProducer_setActivate(swigCPtr, this);
+  }
+
+  public int push(java.nio.ByteBuffer buffer, long size) {
+    return tinyWRAPJNI.ProxyAudioProducer_push(swigCPtr, this, buffer, size);
+  }
+
+  public static boolean registerPlugin() {
+    return tinyWRAPJNI.ProxyAudioProducer_registerPlugin();
+  }
+
+}

trunk/bindings/java/PublicationEvent.java

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 1.3.39
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -25,13 +25,11 @@ public class PublicationEvent extends SipEvent {
   }
 
   public synchronized void delete() {
-    if (swigCPtr != 0) {
-      if (swigCMemOwn) {
-        swigCMemOwn = false;
-        tinyWRAPJNI.delete_PublicationEvent(swigCPtr);
-      }
-      swigCPtr = 0;
+    if(swigCPtr != 0 && swigCMemOwn) {
+      swigCMemOwn = false;
+      tinyWRAPJNI.delete_PublicationEvent(swigCPtr);
     }
+    swigCPtr = 0;
     super.delete();
   }
 

trunk/bindings/java/PublicationSession.java

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 1.3.39
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -25,13 +25,11 @@ public class PublicationSession extends SipSession {
   }
 
   public synchronized void delete() {
-    if (swigCPtr != 0) {
-      if (swigCMemOwn) {
-        swigCMemOwn = false;
-        tinyWRAPJNI.delete_PublicationSession(swigCPtr);
-      }
-      swigCPtr = 0;
+    if(swigCPtr != 0 && swigCMemOwn) {
+      swigCMemOwn = false;
+      tinyWRAPJNI.delete_PublicationSession(swigCPtr);
     }
+    swigCPtr = 0;
     super.delete();
   }
 

trunk/bindings/java/RegistrationEvent.java

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 1.3.39
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -25,13 +25,11 @@ public class RegistrationEvent extends SipEvent {
   }
 
   public synchronized void delete() {
-    if (swigCPtr != 0) {
-      if (swigCMemOwn) {
-        swigCMemOwn = false;
-        tinyWRAPJNI.delete_RegistrationEvent(swigCPtr);
-      }
-      swigCPtr = 0;
+    if(swigCPtr != 0 && swigCMemOwn) {
+      swigCMemOwn = false;
+      tinyWRAPJNI.delete_RegistrationEvent(swigCPtr);
     }
+    swigCPtr = 0;
     super.delete();
   }
 

trunk/bindings/java/RegistrationSession.java

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 1.3.39
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -25,13 +25,11 @@ public class RegistrationSession extends SipSession {
   }
 
   public synchronized void delete() {
-    if (swigCPtr != 0) {
-      if (swigCMemOwn) {
-        swigCMemOwn = false;
-        tinyWRAPJNI.delete_RegistrationSession(swigCPtr);
-      }
-      swigCPtr = 0;
+    if(swigCPtr != 0 && swigCMemOwn) {
+      swigCMemOwn = false;
+      tinyWRAPJNI.delete_RegistrationSession(swigCPtr);
     }
+    swigCPtr = 0;
     super.delete();
   }
 

trunk/bindings/java/SafeObject.java

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 1.3.39
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -26,13 +26,11 @@ public class SafeObject {
   }
 
   public synchronized void delete() {
-    if (swigCPtr != 0) {
-      if (swigCMemOwn) {
-        swigCMemOwn = false;
-        tinyWRAPJNI.delete_SafeObject(swigCPtr);
-      }
-      swigCPtr = 0;
+    if(swigCPtr != 0 && swigCMemOwn) {
+      swigCMemOwn = false;
+      tinyWRAPJNI.delete_SafeObject(swigCPtr);
     }
+    swigCPtr = 0;
   }
 
   public SafeObject() {

trunk/bindings/java/SipCallback.java

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 1.3.39
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -26,13 +26,11 @@ public class SipCallback {
   }
 
   public synchronized void delete() {
-    if (swigCPtr != 0) {
-      if (swigCMemOwn) {
-        swigCMemOwn = false;
-        tinyWRAPJNI.delete_SipCallback(swigCPtr);
-      }
-      swigCPtr = 0;
+    if(swigCPtr != 0 && swigCMemOwn) {
+      swigCMemOwn = false;
+      tinyWRAPJNI.delete_SipCallback(swigCPtr);
     }
+    swigCPtr = 0;
   }
 
   protected void swigDirectorDisconnect() {

trunk/bindings/java/SipEvent.java

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 1.3.39
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -26,13 +26,11 @@ public class SipEvent {
   }
 
   public synchronized void delete() {
-    if (swigCPtr != 0) {
-      if (swigCMemOwn) {
-        swigCMemOwn = false;
-        tinyWRAPJNI.delete_SipEvent(swigCPtr);
-      }
-      swigCPtr = 0;
+    if(swigCPtr != 0 && swigCMemOwn) {
+      swigCMemOwn = false;
+      tinyWRAPJNI.delete_SipEvent(swigCPtr);
     }
+    swigCPtr = 0;
   }
 
   public short getCode() {

trunk/bindings/java/SipMessage.java

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 1.3.39
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -26,13 +26,11 @@ public class SipMessage {
   }
 
   public synchronized void delete() {
-    if (swigCPtr != 0) {
-      if (swigCMemOwn) {
-        swigCMemOwn = false;
-        tinyWRAPJNI.delete_SipMessage(swigCPtr);
-      }
-      swigCPtr = 0;
+    if(swigCPtr != 0 && swigCMemOwn) {
+      swigCMemOwn = false;
+      tinyWRAPJNI.delete_SipMessage(swigCPtr);
     }
+    swigCPtr = 0;
   }
 
   public byte[] getSipContent() {

trunk/bindings/java/SipSession.java

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 1.3.39
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -26,13 +26,11 @@ public class SipSession {
   }
 
   public synchronized void delete() {
-    if (swigCPtr != 0) {
-      if (swigCMemOwn) {
-        swigCMemOwn = false;
-        tinyWRAPJNI.delete_SipSession(swigCPtr);
-      }
-      swigCPtr = 0;
+    if(swigCPtr != 0 && swigCMemOwn) {
+      swigCMemOwn = false;
+      tinyWRAPJNI.delete_SipSession(swigCPtr);
     }
+    swigCPtr = 0;
   }
 
   protected java.nio.ByteBuffer getByteBuffer(byte[] bytes) {

trunk/bindings/java/SipStack.java

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 1.3.39
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -25,13 +25,11 @@ public class SipStack extends SafeObject {
   }
 
   public synchronized void delete() {
-    if (swigCPtr != 0) {
-      if (swigCMemOwn) {
-        swigCMemOwn = false;
-        tinyWRAPJNI.delete_SipStack(swigCPtr);
-      }
-      swigCPtr = 0;
+    if(swigCPtr != 0 && swigCMemOwn) {
+      swigCMemOwn = false;
+      tinyWRAPJNI.delete_SipStack(swigCPtr);
     }
+    swigCPtr = 0;
     super.delete();
   }
 

trunk/bindings/java/SipUri.java

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 1.3.39
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -26,13 +26,11 @@ public class SipUri {
   }
 
   public synchronized void delete() {
-    if (swigCPtr != 0) {
-      if (swigCMemOwn) {
-        swigCMemOwn = false;
-        tinyWRAPJNI.delete_SipUri(swigCPtr);
-      }
-      swigCPtr = 0;
+    if(swigCPtr != 0 && swigCMemOwn) {
+      swigCMemOwn = false;
+      tinyWRAPJNI.delete_SipUri(swigCPtr);
     }
+    swigCPtr = 0;
   }
 
   public SipUri(String arg0) {

trunk/bindings/java/StackEvent.java

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 1.3.39
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -25,13 +25,11 @@ public class StackEvent extends SipEvent {
   }
 
   public synchronized void delete() {
-    if (swigCPtr != 0) {
-      if (swigCMemOwn) {
-        swigCMemOwn = false;
-        tinyWRAPJNI.delete_StackEvent(swigCPtr);
-      }
-      swigCPtr = 0;
+    if(swigCPtr != 0 && swigCMemOwn) {
+      swigCMemOwn = false;
+      tinyWRAPJNI.delete_StackEvent(swigCPtr);
     }
+    swigCPtr = 0;
     super.delete();
   }
 

trunk/bindings/java/SubscriptionEvent.java

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 1.3.39
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -25,13 +25,11 @@ public class SubscriptionEvent extends SipEvent {
   }
 
   public synchronized void delete() {
-    if (swigCPtr != 0) {
-      if (swigCMemOwn) {
-        swigCMemOwn = false;
-        tinyWRAPJNI.delete_SubscriptionEvent(swigCPtr);
-      }
-      swigCPtr = 0;
+    if(swigCPtr != 0 && swigCMemOwn) {
+      swigCMemOwn = false;
+      tinyWRAPJNI.delete_SubscriptionEvent(swigCPtr);
     }
+    swigCPtr = 0;
     super.delete();
   }
 

trunk/bindings/java/SubscriptionSession.java

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 1.3.39
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -25,13 +25,11 @@ public class SubscriptionSession extends SipSession {
   }
 
   public synchronized void delete() {
-    if (swigCPtr != 0) {
-      if (swigCMemOwn) {
-        swigCMemOwn = false;
-        tinyWRAPJNI.delete_SubscriptionSession(swigCPtr);
-      }
-      swigCPtr = 0;
+    if(swigCPtr != 0 && swigCMemOwn) {
+      swigCMemOwn = false;
+      tinyWRAPJNI.delete_SubscriptionSession(swigCPtr);
     }
+    swigCPtr = 0;
     super.delete();
   }
 

trunk/bindings/java/android/CallSession.java

@@ -0,0 +1,48 @@
+/* ----------------------------------------------------------------------------
+ * This file was automatically generated by SWIG (http://www.swig.org).
+ * Version 1.3.39
+ *
+ * Do not make changes to this file unless you know what you are doing--modify
+ * the SWIG interface file instead.
+ * ----------------------------------------------------------------------------- */
+
+package org.doubango.tinyWRAP;
+
+public class CallSession extends SipSession {
+  private long swigCPtr;
+
+  protected CallSession(long cPtr, boolean cMemoryOwn) {
+    super(tinyWRAPJNI.SWIGCallSessionUpcast(cPtr), cMemoryOwn);
+    swigCPtr = cPtr;
+  }
+
+  protected static long getCPtr(CallSession obj) {
+    return (obj == null) ? 0 : obj.swigCPtr;
+  }
+
+  protected void finalize() {
+    delete();
+  }
+
+  public synchronized void delete() {
+    if(swigCPtr != 0 && swigCMemOwn) {
+      swigCMemOwn = false;
+      tinyWRAPJNI.delete_CallSession(swigCPtr);
+    }
+    swigCPtr = 0;
+    super.delete();
+  }
+
+  public CallSession(SipStack Stack) {
+    this(tinyWRAPJNI.new_CallSession(SipStack.getCPtr(Stack), Stack), true);
+  }
+
+  public boolean Call(String remoteUri) {
+    return tinyWRAPJNI.CallSession_Call(swigCPtr, this, remoteUri);
+  }
+
+  public boolean Hangup() {
+    return tinyWRAPJNI.CallSession_Hangup(swigCPtr, this);
+  }
+
+}

trunk/bindings/java/android/DDebugCallback.java

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 1.3.39
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -26,13 +26,11 @@ public class DDebugCallback {
   }
 
   public synchronized void delete() {
-    if (swigCPtr != 0) {
-      if (swigCMemOwn) {
-        swigCMemOwn = false;
-        tinyWRAPJNI.delete_DDebugCallback(swigCPtr);
-      }
-      swigCPtr = 0;
+    if(swigCPtr != 0 && swigCMemOwn) {
+      swigCMemOwn = false;
+      tinyWRAPJNI.delete_DDebugCallback(swigCPtr);
     }
+    swigCPtr = 0;
   }
 
   public DDebugCallback() {

trunk/bindings/java/android/DialogEvent.java

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 1.3.39
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -25,13 +25,11 @@ public class DialogEvent extends SipEvent {
   }
 
   public synchronized void delete() {
-    if (swigCPtr != 0) {
-      if (swigCMemOwn) {
-        swigCMemOwn = false;
-        tinyWRAPJNI.delete_DialogEvent(swigCPtr);
-      }
-      swigCPtr = 0;
+    if(swigCPtr != 0 && swigCMemOwn) {
+      swigCMemOwn = false;
+      tinyWRAPJNI.delete_DialogEvent(swigCPtr);
     }
+    swigCPtr = 0;
     super.delete();
   }
 

trunk/bindings/java/android/MessagingEvent.java

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 1.3.39
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -25,13 +25,11 @@ public class MessagingEvent extends SipEvent {
   }
 
   public synchronized void delete() {
-    if (swigCPtr != 0) {
-      if (swigCMemOwn) {
-        swigCMemOwn = false;
-        tinyWRAPJNI.delete_MessagingEvent(swigCPtr);
-      }
-      swigCPtr = 0;
+    if(swigCPtr != 0 && swigCMemOwn) {
+      swigCMemOwn = false;
+      tinyWRAPJNI.delete_MessagingEvent(swigCPtr);
     }
+    swigCPtr = 0;
     super.delete();
   }
 

trunk/bindings/java/android/MessagingSession.java

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 1.3.39
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -25,13 +25,11 @@ public class MessagingSession extends SipSession {
   }
 
   public synchronized void delete() {
-    if (swigCPtr != 0) {
-      if (swigCMemOwn) {
-        swigCMemOwn = false;
-        tinyWRAPJNI.delete_MessagingSession(swigCPtr);
-      }
-      swigCPtr = 0;
+    if(swigCPtr != 0 && swigCMemOwn) {
+      swigCMemOwn = false;
+      tinyWRAPJNI.delete_MessagingSession(swigCPtr);
     }
+    swigCPtr = 0;
     super.delete();
   }
 

trunk/bindings/java/android/OptionsEvent.java

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 1.3.39
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -25,13 +25,11 @@ public class OptionsEvent extends SipEvent {
   }
 
   public synchronized void delete() {
-    if (swigCPtr != 0) {
-      if (swigCMemOwn) {
-        swigCMemOwn = false;
-        tinyWRAPJNI.delete_OptionsEvent(swigCPtr);
-      }
-      swigCPtr = 0;
+    if(swigCPtr != 0 && swigCMemOwn) {
+      swigCMemOwn = false;
+      tinyWRAPJNI.delete_OptionsEvent(swigCPtr);
     }
+    swigCPtr = 0;
     super.delete();
   }
 

trunk/bindings/java/android/OptionsSession.java

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 1.3.39
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -25,13 +25,11 @@ public class OptionsSession extends SipSession {
   }
 
   public synchronized void delete() {
-    if (swigCPtr != 0) {
-      if (swigCMemOwn) {
-        swigCMemOwn = false;
-        tinyWRAPJNI.delete_OptionsSession(swigCPtr);
-      }
-      swigCPtr = 0;
+    if(swigCPtr != 0 && swigCMemOwn) {
+      swigCMemOwn = false;
+      tinyWRAPJNI.delete_OptionsSession(swigCPtr);
     }
+    swigCPtr = 0;
     super.delete();
   }
 

trunk/bindings/java/android/ProxyAudioConsumer.java

@@ -0,0 +1,84 @@
+/* ----------------------------------------------------------------------------
+ * This file was automatically generated by SWIG (http://www.swig.org).
+ * Version 1.3.39
+ *
+ * Do not make changes to this file unless you know what you are doing--modify
+ * the SWIG interface file instead.
+ * ----------------------------------------------------------------------------- */
+
+package org.doubango.tinyWRAP;
+
+public class ProxyAudioConsumer {
+  private long swigCPtr;
+  protected boolean swigCMemOwn;
+
+  protected ProxyAudioConsumer(long cPtr, boolean cMemoryOwn) {
+    swigCMemOwn = cMemoryOwn;
+    swigCPtr = cPtr;
+  }
+
+  protected static long getCPtr(ProxyAudioConsumer obj) {
+    return (obj == null) ? 0 : obj.swigCPtr;
+  }
+
+  protected void finalize() {
+    delete();
+  }
+
+  public synchronized void delete() {
+    if(swigCPtr != 0 && swigCMemOwn) {
+      swigCMemOwn = false;
+      tinyWRAPJNI.delete_ProxyAudioConsumer(swigCPtr);
+    }
+    swigCPtr = 0;
+  }
+
+  protected void swigDirectorDisconnect() {
+    swigCMemOwn = false;
+    delete();
+  }
+
+  public void swigReleaseOwnership() {
+    swigCMemOwn = false;
+    tinyWRAPJNI.ProxyAudioConsumer_change_ownership(this, swigCPtr, false);
+  }
+
+  public void swigTakeOwnership() {
+    swigCMemOwn = true;
+    tinyWRAPJNI.ProxyAudioConsumer_change_ownership(this, swigCPtr, true);
+  }
+
+  public ProxyAudioConsumer() {
+    this(tinyWRAPJNI.new_ProxyAudioConsumer(), true);
+    tinyWRAPJNI.ProxyAudioConsumer_director_connect(this, swigCPtr, swigCMemOwn, false);
+  }
+
+  public int prepare(int ptime, int rate, int channels) {
+    return (getClass() == ProxyAudioConsumer.class) ? tinyWRAPJNI.ProxyAudioConsumer_prepare(swigCPtr, this, ptime, rate, channels) : tinyWRAPJNI.ProxyAudioConsumer_prepareSwigExplicitProxyAudioConsumer(swigCPtr, this, ptime, rate, channels);
+  }
+
+  public int start() {
+    return (getClass() == ProxyAudioConsumer.class) ? tinyWRAPJNI.ProxyAudioConsumer_start(swigCPtr, this) : tinyWRAPJNI.ProxyAudioConsumer_startSwigExplicitProxyAudioConsumer(swigCPtr, this);
+  }
+
+  public int pause() {
+    return (getClass() == ProxyAudioConsumer.class) ? tinyWRAPJNI.ProxyAudioConsumer_pause(swigCPtr, this) : tinyWRAPJNI.ProxyAudioConsumer_pauseSwigExplicitProxyAudioConsumer(swigCPtr, this);
+  }
+
+  public int stop() {
+    return (getClass() == ProxyAudioConsumer.class) ? tinyWRAPJNI.ProxyAudioConsumer_stop(swigCPtr, this) : tinyWRAPJNI.ProxyAudioConsumer_stopSwigExplicitProxyAudioConsumer(swigCPtr, this);
+  }
+
+  public void setActivate() {
+    tinyWRAPJNI.ProxyAudioConsumer_setActivate(swigCPtr, this);
+  }
+
+  public long pull(java.nio.ByteBuffer output, long size) {
+    return tinyWRAPJNI.ProxyAudioConsumer_pull(swigCPtr, this, output, size);
+  }
+
+  public static boolean registerPlugin() {
+    return tinyWRAPJNI.ProxyAudioConsumer_registerPlugin();
+  }
+
+}

trunk/bindings/java/android/ProxyAudioProducer.java

@@ -0,0 +1,84 @@
+/* ----------------------------------------------------------------------------
+ * This file was automatically generated by SWIG (http://www.swig.org).
+ * Version 1.3.39
+ *
+ * Do not make changes to this file unless you know what you are doing--modify
+ * the SWIG interface file instead.
+ * ----------------------------------------------------------------------------- */
+
+package org.doubango.tinyWRAP;
+
+public class ProxyAudioProducer {
+  private long swigCPtr;
+  protected boolean swigCMemOwn;
+
+  protected ProxyAudioProducer(long cPtr, boolean cMemoryOwn) {
+    swigCMemOwn = cMemoryOwn;
+    swigCPtr = cPtr;
+  }
+
+  protected static long getCPtr(ProxyAudioProducer obj) {
+    return (obj == null) ? 0 : obj.swigCPtr;
+  }
+
+  protected void finalize() {
+    delete();
+  }
+
+  public synchronized void delete() {
+    if(swigCPtr != 0 && swigCMemOwn) {
+      swigCMemOwn = false;
+      tinyWRAPJNI.delete_ProxyAudioProducer(swigCPtr);
+    }
+    swigCPtr = 0;
+  }
+
+  protected void swigDirectorDisconnect() {
+    swigCMemOwn = false;
+    delete();
+  }
+
+  public void swigReleaseOwnership() {
+    swigCMemOwn = false;
+    tinyWRAPJNI.ProxyAudioProducer_change_ownership(this, swigCPtr, false);
+  }
+
+  public void swigTakeOwnership() {
+    swigCMemOwn = true;
+    tinyWRAPJNI.ProxyAudioProducer_change_ownership(this, swigCPtr, true);
+  }
+
+  public ProxyAudioProducer() {
+    this(tinyWRAPJNI.new_ProxyAudioProducer(), true);
+    tinyWRAPJNI.ProxyAudioProducer_director_connect(this, swigCPtr, swigCMemOwn, false);
+  }
+
+  public int prepare(int ptime, int rate, int channels) {
+    return (getClass() == ProxyAudioProducer.class) ? tinyWRAPJNI.ProxyAudioProducer_prepare(swigCPtr, this, ptime, rate, channels) : tinyWRAPJNI.ProxyAudioProducer_prepareSwigExplicitProxyAudioProducer(swigCPtr, this, ptime, rate, channels);
+  }
+
+  public int start() {
+    return (getClass() == ProxyAudioProducer.class) ? tinyWRAPJNI.ProxyAudioProducer_start(swigCPtr, this) : tinyWRAPJNI.ProxyAudioProducer_startSwigExplicitProxyAudioProducer(swigCPtr, this);
+  }
+
+  public int pause() {
+    return (getClass() == ProxyAudioProducer.class) ? tinyWRAPJNI.ProxyAudioProducer_pause(swigCPtr, this) : tinyWRAPJNI.ProxyAudioProducer_pauseSwigExplicitProxyAudioProducer(swigCPtr, this);
+  }
+
+  public int stop() {
+    return (getClass() == ProxyAudioProducer.class) ? tinyWRAPJNI.ProxyAudioProducer_stop(swigCPtr, this) : tinyWRAPJNI.ProxyAudioProducer_stopSwigExplicitProxyAudioProducer(swigCPtr, this);
+  }
+
+  public void setActivate() {
+    tinyWRAPJNI.ProxyAudioProducer_setActivate(swigCPtr, this);
+  }
+
+  public int push(java.nio.ByteBuffer buffer, long size) {
+    return tinyWRAPJNI.ProxyAudioProducer_push(swigCPtr, this, buffer, size);
+  }
+
+  public static boolean registerPlugin() {
+    return tinyWRAPJNI.ProxyAudioProducer_registerPlugin();
+  }
+
+}

trunk/bindings/java/android/PublicationEvent.java

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 1.3.39
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -25,13 +25,11 @@ public class PublicationEvent extends SipEvent {
   }
 
   public synchronized void delete() {
-    if (swigCPtr != 0) {
-      if (swigCMemOwn) {
-        swigCMemOwn = false;
-        tinyWRAPJNI.delete_PublicationEvent(swigCPtr);
-      }
-      swigCPtr = 0;
+    if(swigCPtr != 0 && swigCMemOwn) {
+      swigCMemOwn = false;
+      tinyWRAPJNI.delete_PublicationEvent(swigCPtr);
     }
+    swigCPtr = 0;
     super.delete();
   }
 

trunk/bindings/java/android/PublicationSession.java

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 1.3.39
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -25,13 +25,11 @@ public class PublicationSession extends SipSession {
   }
 
   public synchronized void delete() {
-    if (swigCPtr != 0) {
-      if (swigCMemOwn) {
-        swigCMemOwn = false;
-        tinyWRAPJNI.delete_PublicationSession(swigCPtr);
-      }
-      swigCPtr = 0;
+    if(swigCPtr != 0 && swigCMemOwn) {
+      swigCMemOwn = false;
+      tinyWRAPJNI.delete_PublicationSession(swigCPtr);
     }
+    swigCPtr = 0;
     super.delete();
   }
 

trunk/bindings/java/android/RegistrationEvent.java

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 1.3.39
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -25,13 +25,11 @@ public class RegistrationEvent extends SipEvent {
   }
 
   public synchronized void delete() {
-    if (swigCPtr != 0) {
-      if (swigCMemOwn) {
-        swigCMemOwn = false;
-        tinyWRAPJNI.delete_RegistrationEvent(swigCPtr);
-      }
-      swigCPtr = 0;
+    if(swigCPtr != 0 && swigCMemOwn) {
+      swigCMemOwn = false;
+      tinyWRAPJNI.delete_RegistrationEvent(swigCPtr);
     }
+    swigCPtr = 0;
     super.delete();
   }
 

trunk/bindings/java/android/RegistrationSession.java

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 1.3.39
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -25,13 +25,11 @@ public class RegistrationSession extends SipSession {
   }
 
   public synchronized void delete() {
-    if (swigCPtr != 0) {
-      if (swigCMemOwn) {
-        swigCMemOwn = false;
-        tinyWRAPJNI.delete_RegistrationSession(swigCPtr);
-      }
-      swigCPtr = 0;
+    if(swigCPtr != 0 && swigCMemOwn) {
+      swigCMemOwn = false;
+      tinyWRAPJNI.delete_RegistrationSession(swigCPtr);
     }
+    swigCPtr = 0;
     super.delete();
   }
 

trunk/bindings/java/android/SafeObject.java

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 1.3.39
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -26,13 +26,11 @@ public class SafeObject {
   }
 
   public synchronized void delete() {
-    if (swigCPtr != 0) {
-      if (swigCMemOwn) {
-        swigCMemOwn = false;
-        tinyWRAPJNI.delete_SafeObject(swigCPtr);
-      }
-      swigCPtr = 0;
+    if(swigCPtr != 0 && swigCMemOwn) {
+      swigCMemOwn = false;
+      tinyWRAPJNI.delete_SafeObject(swigCPtr);
     }
+    swigCPtr = 0;
   }
 
   public SafeObject() {

trunk/bindings/java/android/SipCallback.java

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 1.3.39
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -26,13 +26,11 @@ public class SipCallback {
   }
 
   public synchronized void delete() {
-    if (swigCPtr != 0) {
-      if (swigCMemOwn) {
-        swigCMemOwn = false;
-        tinyWRAPJNI.delete_SipCallback(swigCPtr);
-      }
-      swigCPtr = 0;
+    if(swigCPtr != 0 && swigCMemOwn) {
+      swigCMemOwn = false;
+      tinyWRAPJNI.delete_SipCallback(swigCPtr);
     }
+    swigCPtr = 0;
   }
 
   protected void swigDirectorDisconnect() {

trunk/bindings/java/android/SipEvent.java

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 1.3.39
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -26,13 +26,11 @@ public class SipEvent {
   }
 
   public synchronized void delete() {
-    if (swigCPtr != 0) {
-      if (swigCMemOwn) {
-        swigCMemOwn = false;
-        tinyWRAPJNI.delete_SipEvent(swigCPtr);
-      }
-      swigCPtr = 0;
+    if(swigCPtr != 0 && swigCMemOwn) {
+      swigCMemOwn = false;
+      tinyWRAPJNI.delete_SipEvent(swigCPtr);
     }
+    swigCPtr = 0;
   }
 
   public short getCode() {

trunk/bindings/java/android/SipMessage.java

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 1.3.39
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -26,13 +26,11 @@ public class SipMessage {
   }
 
   public synchronized void delete() {
-    if (swigCPtr != 0) {
-      if (swigCMemOwn) {
-        swigCMemOwn = false;
-        tinyWRAPJNI.delete_SipMessage(swigCPtr);
-      }
-      swigCPtr = 0;
+    if(swigCPtr != 0 && swigCMemOwn) {
+      swigCMemOwn = false;
+      tinyWRAPJNI.delete_SipMessage(swigCPtr);
     }
+    swigCPtr = 0;
   }
 
   public byte[] getSipContent() {

trunk/bindings/java/android/SipSession.java

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 1.3.39
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -26,13 +26,11 @@ public class SipSession {
   }
 
   public synchronized void delete() {
-    if (swigCPtr != 0) {
-      if (swigCMemOwn) {
-        swigCMemOwn = false;
-        tinyWRAPJNI.delete_SipSession(swigCPtr);
-      }
-      swigCPtr = 0;
+    if(swigCPtr != 0 && swigCMemOwn) {
+      swigCMemOwn = false;
+      tinyWRAPJNI.delete_SipSession(swigCPtr);
     }
+    swigCPtr = 0;
   }
 
   protected java.nio.ByteBuffer getByteBuffer(byte[] bytes) {

trunk/bindings/java/android/SipStack.java

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 1.3.39
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -25,13 +25,11 @@ public class SipStack extends SafeObject {
   }
 
   public synchronized void delete() {
-    if (swigCPtr != 0) {
-      if (swigCMemOwn) {
-        swigCMemOwn = false;
-        tinyWRAPJNI.delete_SipStack(swigCPtr);
-      }
-      swigCPtr = 0;
+    if(swigCPtr != 0 && swigCMemOwn) {
+      swigCMemOwn = false;
+      tinyWRAPJNI.delete_SipStack(swigCPtr);
     }
+    swigCPtr = 0;
     super.delete();
   }
 

trunk/bindings/java/android/SipUri.java

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 1.3.39
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -26,13 +26,11 @@ public class SipUri {
   }
 
   public synchronized void delete() {
-    if (swigCPtr != 0) {
-      if (swigCMemOwn) {
-        swigCMemOwn = false;
-        tinyWRAPJNI.delete_SipUri(swigCPtr);
-      }
-      swigCPtr = 0;
+    if(swigCPtr != 0 && swigCMemOwn) {
+      swigCMemOwn = false;
+      tinyWRAPJNI.delete_SipUri(swigCPtr);
     }
+    swigCPtr = 0;
   }
 
   public SipUri(String arg0) {

trunk/bindings/java/android/StackEvent.java

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 1.3.39
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -25,13 +25,11 @@ public class StackEvent extends SipEvent {
   }
 
   public synchronized void delete() {
-    if (swigCPtr != 0) {
-      if (swigCMemOwn) {
-        swigCMemOwn = false;
-        tinyWRAPJNI.delete_StackEvent(swigCPtr);
-      }
-      swigCPtr = 0;
+    if(swigCPtr != 0 && swigCMemOwn) {
+      swigCMemOwn = false;
+      tinyWRAPJNI.delete_StackEvent(swigCPtr);
     }
+    swigCPtr = 0;
     super.delete();
   }
 

trunk/bindings/java/android/SubscriptionEvent.java

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 1.3.39
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -25,13 +25,11 @@ public class SubscriptionEvent extends SipEvent {
   }
 
   public synchronized void delete() {
-    if (swigCPtr != 0) {
-      if (swigCMemOwn) {
-        swigCMemOwn = false;
-        tinyWRAPJNI.delete_SubscriptionEvent(swigCPtr);
-      }
-      swigCPtr = 0;
+    if(swigCPtr != 0 && swigCMemOwn) {
+      swigCMemOwn = false;
+      tinyWRAPJNI.delete_SubscriptionEvent(swigCPtr);
     }
+    swigCPtr = 0;
     super.delete();
   }
 

trunk/bindings/java/android/SubscriptionSession.java

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 1.3.39
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -25,13 +25,11 @@ public class SubscriptionSession extends SipSession {
   }
 
   public synchronized void delete() {
-    if (swigCPtr != 0) {
-      if (swigCMemOwn) {
-        swigCMemOwn = false;
-        tinyWRAPJNI.delete_SubscriptionSession(swigCPtr);
-      }
-      swigCPtr = 0;
+    if(swigCPtr != 0 && swigCMemOwn) {
+      swigCMemOwn = false;
+      tinyWRAPJNI.delete_SubscriptionSession(swigCPtr);
     }
+    swigCPtr = 0;
     super.delete();
   }
 

trunk/bindings/java/android/buildAll.sh

@@ -3,7 +3,7 @@
 
 #export CFLAGS="-Os"
 
-for project in tinySAK tinyNET tinyIPSec tinySMS tinyHTTP tinySDP tinyMEDIA tinySIP
+for project in tinySAK tinyNET tinyIPSec tinySMS tinyHTTP tinySIGCOMP tinySDP tinyRTP tinyMEDIA tinyDAV tinySIP
 do
 	echo -e building "$project....\n"
 	make PROJECT=$project clean

trunk/bindings/java/android/droid-makefile

@@ -1,7 +1,10 @@
 APP := lib$(PROJECT).$(EXT)
 
-CFLAGS := $(CFLAGS_LIB) -fno-rtti -fno-exceptions -I../../_common -I../../. -I../../../tinySAK/src -I../../../tinyNET/src -I../../../tinyHTTP/include -I../../../tinySIP/include
-LDFLAGS := $(LDFLAGS_LIB) -lstdc++ -llog -ltinySAK -ltinyHTTP -ltinyIPSec -ltinyNET -ltinySIP
+CFLAGS := $(CFLAGS_LIB) -fno-rtti -fno-exceptions -I../../_common -I../../. -I../../../tinySAK/src -I../../../tinyNET/src -I../../../tinyHTTP/include \
+	-I../../../tinySDP/include -I../../../tinyMEDIA/include -I../../../tinyDAV/include -I../../../tinySIP/include
+	
+# Because of the static build, you need all librarires
+LDFLAGS := $(LDFLAGS_LIB) -lstdc++ -llog -ltinySAK -ltinyHTTP -ltinyIPSec -ltinySIGCOMP -ltinyNET -ltinySDP -ltinyRTP -ltinyMEDIA -ltinyDAV -ltinySIP -lm
 
 
 
@@ -9,6 +12,8 @@ all: $(APP)
 
 OBJS = tinyWRAP_wrap.o\
 	../../_common/DDebug.o \
+	../../_common/ProxyConsumer.o \
+	../../_common/ProxyProducer.o \
 	../../_common/SafeObject.o \
 	../../_common/SipCallback.o \
 	../../_common/SipEvent.o \

trunk/bindings/java/android/tinyWRAP.java

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

trunk/bindings/java/android/tinyWRAPConstants.java

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

trunk/bindings/java/android/tinyWRAPJNI.java

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 1.3.39
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -63,6 +63,10 @@ class tinyWRAPJNI {
   public final static native boolean SipSession_setToUri(long jarg1, SipSession jarg1_, String jarg2);
   public final static native boolean SipSession_setSilentHangup(long jarg1, SipSession jarg1_, boolean jarg2);
   public final static native long SipSession_getId(long jarg1, SipSession jarg1_);
+  public final static native long new_CallSession(long jarg1, SipStack jarg1_);
+  public final static native void delete_CallSession(long jarg1);
+  public final static native boolean CallSession_Call(long jarg1, CallSession jarg1_, String jarg2);
+  public final static native boolean CallSession_Hangup(long jarg1, CallSession jarg1_);
   public final static native long new_MessagingSession(long jarg1, SipStack jarg1_);
   public final static native void delete_MessagingSession(long jarg1);
   public final static native boolean MessagingSession_Send(long jarg1, MessagingSession jarg1_, java.nio.ByteBuffer jarg2, long jarg3);
@@ -83,6 +87,36 @@ class tinyWRAPJNI {
   public final static native void delete_SubscriptionSession(long jarg1);
   public final static native boolean SubscriptionSession_Subscribe(long jarg1, SubscriptionSession jarg1_);
   public final static native boolean SubscriptionSession_UnSubscribe(long jarg1, SubscriptionSession jarg1_);
+  public final static native long new_ProxyAudioConsumer();
+  public final static native void delete_ProxyAudioConsumer(long jarg1);
+  public final static native int ProxyAudioConsumer_prepare(long jarg1, ProxyAudioConsumer jarg1_, int jarg2, int jarg3, int jarg4);
+  public final static native int ProxyAudioConsumer_prepareSwigExplicitProxyAudioConsumer(long jarg1, ProxyAudioConsumer jarg1_, int jarg2, int jarg3, int jarg4);
+  public final static native int ProxyAudioConsumer_start(long jarg1, ProxyAudioConsumer jarg1_);
+  public final static native int ProxyAudioConsumer_startSwigExplicitProxyAudioConsumer(long jarg1, ProxyAudioConsumer jarg1_);
+  public final static native int ProxyAudioConsumer_pause(long jarg1, ProxyAudioConsumer jarg1_);
+  public final static native int ProxyAudioConsumer_pauseSwigExplicitProxyAudioConsumer(long jarg1, ProxyAudioConsumer jarg1_);
+  public final static native int ProxyAudioConsumer_stop(long jarg1, ProxyAudioConsumer jarg1_);
+  public final static native int ProxyAudioConsumer_stopSwigExplicitProxyAudioConsumer(long jarg1, ProxyAudioConsumer jarg1_);
+  public final static native void ProxyAudioConsumer_setActivate(long jarg1, ProxyAudioConsumer jarg1_);
+  public final static native long ProxyAudioConsumer_pull(long jarg1, ProxyAudioConsumer jarg1_, java.nio.ByteBuffer jarg2, long jarg3);
+  public final static native boolean ProxyAudioConsumer_registerPlugin();
+  public final static native void ProxyAudioConsumer_director_connect(ProxyAudioConsumer obj, long cptr, boolean mem_own, boolean weak_global);
+  public final static native void ProxyAudioConsumer_change_ownership(ProxyAudioConsumer obj, long cptr, boolean take_or_release);
+  public final static native long new_ProxyAudioProducer();
+  public final static native void delete_ProxyAudioProducer(long jarg1);
+  public final static native int ProxyAudioProducer_prepare(long jarg1, ProxyAudioProducer jarg1_, int jarg2, int jarg3, int jarg4);
+  public final static native int ProxyAudioProducer_prepareSwigExplicitProxyAudioProducer(long jarg1, ProxyAudioProducer jarg1_, int jarg2, int jarg3, int jarg4);
+  public final static native int ProxyAudioProducer_start(long jarg1, ProxyAudioProducer jarg1_);
+  public final static native int ProxyAudioProducer_startSwigExplicitProxyAudioProducer(long jarg1, ProxyAudioProducer jarg1_);
+  public final static native int ProxyAudioProducer_pause(long jarg1, ProxyAudioProducer jarg1_);
+  public final static native int ProxyAudioProducer_pauseSwigExplicitProxyAudioProducer(long jarg1, ProxyAudioProducer jarg1_);
+  public final static native int ProxyAudioProducer_stop(long jarg1, ProxyAudioProducer jarg1_);
+  public final static native int ProxyAudioProducer_stopSwigExplicitProxyAudioProducer(long jarg1, ProxyAudioProducer jarg1_);
+  public final static native void ProxyAudioProducer_setActivate(long jarg1, ProxyAudioProducer jarg1_);
+  public final static native int ProxyAudioProducer_push(long jarg1, ProxyAudioProducer jarg1_, java.nio.ByteBuffer jarg2, long jarg3);
+  public final static native boolean ProxyAudioProducer_registerPlugin();
+  public final static native void ProxyAudioProducer_director_connect(ProxyAudioProducer obj, long cptr, boolean mem_own, boolean weak_global);
+  public final static native void ProxyAudioProducer_change_ownership(ProxyAudioProducer obj, long cptr, boolean take_or_release);
   public final static native long new_SipCallback();
   public final static native void delete_SipCallback(long jarg1);
   public final static native int SipCallback_OnDialogEvent(long jarg1, SipCallback jarg1_, long jarg2, DialogEvent jarg2_);
@@ -130,6 +164,7 @@ class tinyWRAPJNI {
   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 SWIGCallSessionUpcast(long jarg1);
   public final static native long SWIGMessagingSessionUpcast(long jarg1);
   public final static native long SWIGOptionsSessionUpcast(long jarg1);
   public final static native long SWIGPublicationSessionUpcast(long jarg1);
@@ -137,6 +172,30 @@ class tinyWRAPJNI {
   public final static native long SWIGSubscriptionSessionUpcast(long jarg1);
   public final static native long SWIGSipStackUpcast(long jarg1);
 
+  public static int SwigDirector_ProxyAudioConsumer_prepare(ProxyAudioConsumer self, int ptime, int rate, int channels) {
+    return self.prepare(ptime, rate, channels);
+  }
+  public static int SwigDirector_ProxyAudioConsumer_start(ProxyAudioConsumer self) {
+    return self.start();
+  }
+  public static int SwigDirector_ProxyAudioConsumer_pause(ProxyAudioConsumer self) {
+    return self.pause();
+  }
+  public static int SwigDirector_ProxyAudioConsumer_stop(ProxyAudioConsumer self) {
+    return self.stop();
+  }
+  public static int SwigDirector_ProxyAudioProducer_prepare(ProxyAudioProducer self, int ptime, int rate, int channels) {
+    return self.prepare(ptime, rate, channels);
+  }
+  public static int SwigDirector_ProxyAudioProducer_start(ProxyAudioProducer self) {
+    return self.start();
+  }
+  public static int SwigDirector_ProxyAudioProducer_pause(ProxyAudioProducer self) {
+    return self.pause();
+  }
+  public static int SwigDirector_ProxyAudioProducer_stop(ProxyAudioProducer self) {
+    return self.stop();
+  }
   public static int SwigDirector_SipCallback_OnDialogEvent(SipCallback self, long e) {
     return self.OnDialogEvent((e == 0) ? null : new DialogEvent(e, false));
   }