From 210b5105b133b39c8b282e94c0c2865edd81ce7e Mon Sep 17 00:00:00 2001 From: Stefan Sayer Date: Wed, 28 Mar 2007 22:58:25 +0000 Subject: [PATCH] some more b2ab classes git-svn-id: http://svn.berlios.de/svnroot/repos/sems/trunk@291 8eb893ce-cfd4-0310-b710-fb5ebe64c474 --- apps/py_sems/sip/Makefile.gen | 6 +- apps/py_sems/sip/PySemsB2ABDialog.sip | 42 ++- apps/py_sems/sip/py_sems.sbf | 4 +- apps/py_sems/sip/sipAPIpy_sems_lib.h | 12 +- .../sip/sippy_sems_libAmAudioEvent.cpp | 4 +- apps/py_sems/sip/sippy_sems_libAmAudioEvent.h | 4 +- .../py_sems/sip/sippy_sems_libAmAudioFile.cpp | 2 +- apps/py_sems/sip/sippy_sems_libAmAudioFile.h | 4 +- .../sip/sippy_sems_libAmB2ABCalleeSession.cpp | 173 +++++++++++ .../sip/sippy_sems_libAmB2ABCalleeSession.h | 20 ++ apps/py_sems/sip/sippy_sems_libAmEvent.cpp | 2 +- apps/py_sems/sip/sippy_sems_libAmEvent.h | 4 +- .../py_sems/sip/sippy_sems_libAmSipDialog.cpp | 2 +- apps/py_sems/sip/sippy_sems_libAmSipDialog.h | 4 +- apps/py_sems/sip/sippy_sems_libAmSipReply.cpp | 2 +- apps/py_sems/sip/sippy_sems_libAmSipReply.h | 4 +- .../sip/sippy_sems_libAmSipRequest.cpp | 2 +- apps/py_sems/sip/sippy_sems_libAmSipRequest.h | 4 +- apps/py_sems/sip/sippy_sems_libB2ABEvent.cpp | 85 ++++++ apps/py_sems/sip/sippy_sems_libB2ABEvent.h | 20 ++ .../sip/sippy_sems_libPySemsB2ABDialog.cpp | 286 +++++++++++++++++- .../sip/sippy_sems_libPySemsB2ABDialog.h | 22 +- .../sip/sippy_sems_libPySemsB2BDialog.cpp | 22 +- .../sip/sippy_sems_libPySemsB2BDialog.h | 4 +- .../sip/sippy_sems_libPySemsDialog.cpp | 22 +- apps/py_sems/sip/sippy_sems_libPySemsDialog.h | 4 +- apps/py_sems/sip/sippy_sems_libcmodule.cpp | 63 +++- apps/py_sems/sip/sippy_sems_libstring.cpp | 2 +- apps/py_sems/sip/sippy_sems_libstring.h | 2 +- 29 files changed, 742 insertions(+), 85 deletions(-) create mode 100644 apps/py_sems/sip/sippy_sems_libAmB2ABCalleeSession.cpp create mode 100644 apps/py_sems/sip/sippy_sems_libAmB2ABCalleeSession.h create mode 100644 apps/py_sems/sip/sippy_sems_libB2ABEvent.cpp create mode 100644 apps/py_sems/sip/sippy_sems_libB2ABEvent.h diff --git a/apps/py_sems/sip/Makefile.gen b/apps/py_sems/sip/Makefile.gen index c8009dad..f13f06c7 100644 --- a/apps/py_sems/sip/Makefile.gen +++ b/apps/py_sems/sip/Makefile.gen @@ -1,6 +1,6 @@ TARGET = py_sems_lib.so -OFILES = sippy_sems_libcmodule.o sippy_sems_libPySemsB2ABDialog.o sippy_sems_libPySemsB2BDialog.o sippy_sems_libPySemsDialog.o sippy_sems_libAmAudioFile.o sippy_sems_libAmAudioEvent.o sippy_sems_libAmEvent.o sippy_sems_libAmSipDialog.o sippy_sems_libAmSipReply.o sippy_sems_libAmSipRequest.o sippy_sems_libstring.o -HFILES = sipAPIpy_sems_lib.h sippy_sems_libPySemsB2ABDialog.h sippy_sems_libPySemsB2BDialog.h sippy_sems_libPySemsDialog.h sippy_sems_libAmAudioFile.h sippy_sems_libAmAudioEvent.h sippy_sems_libAmEvent.h sippy_sems_libAmSipDialog.h sippy_sems_libAmSipReply.h sippy_sems_libAmSipRequest.h sippy_sems_libstring.h +OFILES = sippy_sems_libcmodule.o sippy_sems_libB2ABEvent.o sippy_sems_libAmB2ABCalleeSession.o sippy_sems_libPySemsB2ABDialog.o sippy_sems_libPySemsB2BDialog.o sippy_sems_libPySemsDialog.o sippy_sems_libAmAudioFile.o sippy_sems_libAmAudioEvent.o sippy_sems_libAmEvent.o sippy_sems_libAmSipDialog.o sippy_sems_libAmSipReply.o sippy_sems_libAmSipRequest.o sippy_sems_libstring.o +HFILES = sipAPIpy_sems_lib.h sippy_sems_libB2ABEvent.h sippy_sems_libAmB2ABCalleeSession.h sippy_sems_libPySemsB2ABDialog.h sippy_sems_libPySemsB2BDialog.h sippy_sems_libPySemsDialog.h sippy_sems_libAmAudioFile.h sippy_sems_libAmAudioEvent.h sippy_sems_libAmEvent.h sippy_sems_libAmSipDialog.h sippy_sems_libAmSipReply.h sippy_sems_libAmSipRequest.h sippy_sems_libstring.h CC = gcc CXX = g++ @@ -42,6 +42,8 @@ install: $(TARGET) clean: -rm -f $(TARGET) -rm -f sippy_sems_libcmodule.o + -rm -f sippy_sems_libB2ABEvent.o + -rm -f sippy_sems_libAmB2ABCalleeSession.o -rm -f sippy_sems_libPySemsB2ABDialog.o -rm -f sippy_sems_libPySemsB2BDialog.o -rm -f sippy_sems_libPySemsDialog.o diff --git a/apps/py_sems/sip/PySemsB2ABDialog.sip b/apps/py_sems/sip/PySemsB2ABDialog.sip index 455eb03e..3f348136 100644 --- a/apps/py_sems/sip/PySemsB2ABDialog.sip +++ b/apps/py_sems/sip/PySemsB2ABDialog.sip @@ -1,9 +1,9 @@ - class PySemsB2ABDialog { %TypeHeaderCode #include "../PySemsB2ABDialog.h" +#include "../../../core/AmB2ABSession.h" %End public: @@ -30,14 +30,50 @@ public: virtual void onBye(const AmSipRequest& /* req */); virtual void onDtmf(int /* event */, int /* duration_msec */); - void setInput(AmAudioFile* /In/ /*in*/); void setOutput(AmAudioFile* /In/ /*out*/); void setInOut(AmAudioFile* /In/ /*in*/, AmAudioFile* /*out*/); virtual void process(AmEvent* /*In,Out*/); + + void connectCallee(const string& /*remote_party*/, + const string& /*remote_uri*/, + const string& /*local_party*/, + const string& /*local_uri*/); + void reconnectAudio(); + + int getCalleeStatus(); +protected: + virtual AmB2ABCalleeSession* createCalleeSession(); + virtual void onB2ABEvent(B2ABEvent* /*In,Out*/); + + virtual void relayEvent(AmEvent* ev); private: - PySemsB2ABDialog(const PySemsB2ABDialog&); + PySemsB2ABDialog(const PySemsB2ABDialog&); }; + +class AmB2ABCalleeSession +{ +%TypeHeaderCode +#include "../../../core/AmB2ABSession.h" +%End +public: + AmB2ABCalleeSession(const string& /*other_local_tag*/); + + void onB2ABEvent(B2ABEvent* /*In,Out*/); + void reconnectAudio(); +private: + AmB2ABCalleeSession(const AmB2ABCalleeSession& /* other_s*/); + +}; + +class B2ABEvent +{ +%TypeHeaderCode +#include "../../../core/AmB2ABSession.h" +%End + B2ABEvent(int /* ev_id */); +}; + diff --git a/apps/py_sems/sip/py_sems.sbf b/apps/py_sems/sip/py_sems.sbf index c5911a2c..92123ff3 100644 --- a/apps/py_sems/sip/py_sems.sbf +++ b/apps/py_sems/sip/py_sems.sbf @@ -1,3 +1,3 @@ target = py_sems_lib -sources = sippy_sems_libcmodule.cpp sippy_sems_libPySemsB2ABDialog.cpp sippy_sems_libPySemsB2BDialog.cpp sippy_sems_libPySemsDialog.cpp sippy_sems_libAmAudioFile.cpp sippy_sems_libAmAudioEvent.cpp sippy_sems_libAmEvent.cpp sippy_sems_libAmSipDialog.cpp sippy_sems_libAmSipReply.cpp sippy_sems_libAmSipRequest.cpp sippy_sems_libstring.cpp -headers = sipAPIpy_sems_lib.h sippy_sems_libPySemsB2ABDialog.h sippy_sems_libPySemsB2BDialog.h sippy_sems_libPySemsDialog.h sippy_sems_libAmAudioFile.h sippy_sems_libAmAudioEvent.h sippy_sems_libAmEvent.h sippy_sems_libAmSipDialog.h sippy_sems_libAmSipReply.h sippy_sems_libAmSipRequest.h sippy_sems_libstring.h +sources = sippy_sems_libcmodule.cpp sippy_sems_libB2ABEvent.cpp sippy_sems_libAmB2ABCalleeSession.cpp sippy_sems_libPySemsB2ABDialog.cpp sippy_sems_libPySemsB2BDialog.cpp sippy_sems_libPySemsDialog.cpp sippy_sems_libAmAudioFile.cpp sippy_sems_libAmAudioEvent.cpp sippy_sems_libAmEvent.cpp sippy_sems_libAmSipDialog.cpp sippy_sems_libAmSipReply.cpp sippy_sems_libAmSipRequest.cpp sippy_sems_libstring.cpp +headers = sipAPIpy_sems_lib.h sippy_sems_libB2ABEvent.h sippy_sems_libAmB2ABCalleeSession.h sippy_sems_libPySemsB2ABDialog.h sippy_sems_libPySemsB2BDialog.h sippy_sems_libPySemsDialog.h sippy_sems_libAmAudioFile.h sippy_sems_libAmAudioEvent.h sippy_sems_libAmEvent.h sippy_sems_libAmSipDialog.h sippy_sems_libAmSipReply.h sippy_sems_libAmSipRequest.h sippy_sems_libstring.h diff --git a/apps/py_sems/sip/sipAPIpy_sems_lib.h b/apps/py_sems/sip/sipAPIpy_sems_lib.h index 5887c1b8..8250af69 100644 --- a/apps/py_sems/sip/sipAPIpy_sems_lib.h +++ b/apps/py_sems/sip/sipAPIpy_sems_lib.h @@ -1,7 +1,7 @@ /* * Internal module API header file. * - * Generated by SIP 4.5.2 (4.5.2) on Wed Mar 28 22:59:14 2007 + * Generated by SIP 4.5.2 (4.5.2) on Thu Mar 29 00:29:43 2007 */ #ifndef _py_sems_libAPI_H @@ -19,6 +19,8 @@ * These are part of the public API. */ +#define sipName_B2ABEvent sipNm_py_sems_lib_B2ABEvent +#define sipName_AmB2ABCalleeSession sipNm_py_sems_lib_AmB2ABCalleeSession #define sipName_PySemsB2ABDialog sipNm_py_sems_lib_PySemsB2ABDialog #define sipName_PySemsB2BDialog sipNm_py_sems_lib_PySemsB2BDialog #define sipName_PySemsDialog sipNm_py_sems_lib_PySemsDialog @@ -109,6 +111,14 @@ /* The strings used by this module. */ extern char sipNm_py_sems_lib_get_header_param[]; +extern char sipNm_py_sems_lib_B2ABEvent[]; +extern char sipNm_py_sems_lib_AmB2ABCalleeSession[]; +extern char sipNm_py_sems_lib_relayEvent[]; +extern char sipNm_py_sems_lib_onB2ABEvent[]; +extern char sipNm_py_sems_lib_createCalleeSession[]; +extern char sipNm_py_sems_lib_getCalleeStatus[]; +extern char sipNm_py_sems_lib_reconnectAudio[]; +extern char sipNm_py_sems_lib_connectCallee[]; extern char sipNm_py_sems_lib_PySemsB2ABDialog[]; extern char sipNm_py_sems_lib_PySemsB2BDialog[]; extern char sipNm_py_sems_lib_process[]; diff --git a/apps/py_sems/sip/sippy_sems_libAmAudioEvent.cpp b/apps/py_sems/sip/sippy_sems_libAmAudioEvent.cpp index a29a6e3d..33a6baf5 100644 --- a/apps/py_sems/sip/sippy_sems_libAmAudioEvent.cpp +++ b/apps/py_sems/sip/sippy_sems_libAmAudioEvent.cpp @@ -1,7 +1,7 @@ /* * Interface wrapper code. * - * Generated by SIP 4.5.2 (4.5.2) on Wed Mar 28 22:59:14 2007 + * Generated by SIP 4.5.2 (4.5.2) on Thu Mar 29 00:29:43 2007 */ #include "sipAPIpy_sems_lib.h" @@ -126,7 +126,7 @@ static void *forceConvertTo_AmAudioEvent(PyObject *valobj,int *iserrp) /* Define this type's super-types. */ -static sipEncodedClassDef supers_AmAudioEvent[] = {{4, 255, 1}}; +static sipEncodedClassDef supers_AmAudioEvent[] = {{6, 255, 1}}; static sipEnumMemberDef enummembers_AmAudioEvent[] = { {sipNm_py_sems_lib_cleared, AmAudioEvent::cleared, 1}, diff --git a/apps/py_sems/sip/sippy_sems_libAmAudioEvent.h b/apps/py_sems/sip/sippy_sems_libAmAudioEvent.h index c9db5dd6..0486ed41 100644 --- a/apps/py_sems/sip/sippy_sems_libAmAudioEvent.h +++ b/apps/py_sems/sip/sippy_sems_libAmAudioEvent.h @@ -1,7 +1,7 @@ /* * Interface header file. * - * Generated by SIP 4.5.2 (4.5.2) on Wed Mar 28 22:59:14 2007 + * Generated by SIP 4.5.2 (4.5.2) on Thu Mar 29 00:29:43 2007 */ #ifndef _py_sems_libAmAudioEvent_h @@ -11,7 +11,7 @@ #include "../../../core/AmAudio.h" #line 13 "sippy_sems_libAmAudioEvent.h" -#define sipClass_AmAudioEvent sipModuleAPI_py_sems_lib.em_types[5] +#define sipClass_AmAudioEvent sipModuleAPI_py_sems_lib.em_types[7] #define sipCast_AmAudioEvent sipType_py_sems_lib_AmAudioEvent.td_cast #define sipForceConvertTo_AmAudioEvent sipType_py_sems_lib_AmAudioEvent.td_fcto diff --git a/apps/py_sems/sip/sippy_sems_libAmAudioFile.cpp b/apps/py_sems/sip/sippy_sems_libAmAudioFile.cpp index 576f9b66..cbab3678 100644 --- a/apps/py_sems/sip/sippy_sems_libAmAudioFile.cpp +++ b/apps/py_sems/sip/sippy_sems_libAmAudioFile.cpp @@ -1,7 +1,7 @@ /* * Interface wrapper code. * - * Generated by SIP 4.5.2 (4.5.2) on Wed Mar 28 22:59:14 2007 + * Generated by SIP 4.5.2 (4.5.2) on Thu Mar 29 00:29:43 2007 */ #include "sipAPIpy_sems_lib.h" diff --git a/apps/py_sems/sip/sippy_sems_libAmAudioFile.h b/apps/py_sems/sip/sippy_sems_libAmAudioFile.h index eee26d66..775ae295 100644 --- a/apps/py_sems/sip/sippy_sems_libAmAudioFile.h +++ b/apps/py_sems/sip/sippy_sems_libAmAudioFile.h @@ -1,7 +1,7 @@ /* * Interface header file. * - * Generated by SIP 4.5.2 (4.5.2) on Wed Mar 28 22:59:14 2007 + * Generated by SIP 4.5.2 (4.5.2) on Thu Mar 29 00:29:43 2007 */ #ifndef _py_sems_libAmAudioFile_h @@ -11,7 +11,7 @@ #include "../../../core/AmAudio.h" #line 13 "sippy_sems_libAmAudioFile.h" -#define sipClass_AmAudioFile sipModuleAPI_py_sems_lib.em_types[3] +#define sipClass_AmAudioFile sipModuleAPI_py_sems_lib.em_types[5] #define sipCast_AmAudioFile sipType_py_sems_lib_AmAudioFile.td_cast #define sipForceConvertTo_AmAudioFile sipType_py_sems_lib_AmAudioFile.td_fcto diff --git a/apps/py_sems/sip/sippy_sems_libAmB2ABCalleeSession.cpp b/apps/py_sems/sip/sippy_sems_libAmB2ABCalleeSession.cpp new file mode 100644 index 00000000..45812829 --- /dev/null +++ b/apps/py_sems/sip/sippy_sems_libAmB2ABCalleeSession.cpp @@ -0,0 +1,173 @@ +/* + * Interface wrapper code. + * + * Generated by SIP 4.5.2 (4.5.2) on Thu Mar 29 00:29:43 2007 + */ + +#include "sipAPIpy_sems_lib.h" +#include "sippy_sems_libAmB2ABCalleeSession.h" + +#include "sippy_sems_libstring.h" +#include "sippy_sems_libAmB2ABCalleeSession.h" +#include "sippy_sems_libB2ABEvent.h" + + + +extern "C" {static PyObject *meth_AmB2ABCalleeSession_onB2ABEvent(PyObject *, PyObject *);} +static PyObject *meth_AmB2ABCalleeSession_onB2ABEvent(PyObject *sipSelf,PyObject *sipArgs) +{ + sipTrace(SIP_TRACE_METHODS,"meth_AmB2ABCalleeSession_onB2ABEvent()\n"); + + int sipArgsParsed = 0; + + { + B2ABEvent * a0; + AmB2ABCalleeSession *sipCpp; + + if (sipParseArgs(&sipArgsParsed,sipArgs,"BJ@",&sipSelf,sipClass_AmB2ABCalleeSession,&sipCpp,sipClass_B2ABEvent,&a0)) + { + sipCpp->onB2ABEvent(a0); + + Py_INCREF(Py_None); + return Py_None; + } + } + + /* Raise an exception if the arguments couldn't be parsed. */ + sipNoMethod(sipArgsParsed,sipNm_py_sems_lib_AmB2ABCalleeSession,sipNm_py_sems_lib_onB2ABEvent); + + return NULL; +} + + +extern "C" {static PyObject *meth_AmB2ABCalleeSession_reconnectAudio(PyObject *, PyObject *);} +static PyObject *meth_AmB2ABCalleeSession_reconnectAudio(PyObject *sipSelf,PyObject *sipArgs) +{ + sipTrace(SIP_TRACE_METHODS,"meth_AmB2ABCalleeSession_reconnectAudio()\n"); + + int sipArgsParsed = 0; + + { + AmB2ABCalleeSession *sipCpp; + + if (sipParseArgs(&sipArgsParsed,sipArgs,"B",&sipSelf,sipClass_AmB2ABCalleeSession,&sipCpp)) + { + sipCpp->reconnectAudio(); + + Py_INCREF(Py_None); + return Py_None; + } + } + + /* Raise an exception if the arguments couldn't be parsed. */ + sipNoMethod(sipArgsParsed,sipNm_py_sems_lib_AmB2ABCalleeSession,sipNm_py_sems_lib_reconnectAudio); + + return NULL; +} + + +/* Cast a pointer to a type somewhere in its superclass hierarchy. */ +extern "C" {static void *cast_AmB2ABCalleeSession(void *, sipWrapperType *);} +static void *cast_AmB2ABCalleeSession(void *ptr,sipWrapperType *targetClass) +{ + if (targetClass == sipClass_AmB2ABCalleeSession) + return ptr; + + return NULL; +} + + +/* Call the instance's destructor. */ +extern "C" {static void release_AmB2ABCalleeSession(void *, int);} +static void release_AmB2ABCalleeSession(void *ptr,int) +{ + delete reinterpret_cast(ptr); +} + + +extern "C" {static void dealloc_AmB2ABCalleeSession(sipWrapper *);} +static void dealloc_AmB2ABCalleeSession(sipWrapper *sipSelf) +{ + sipTrace(SIP_TRACE_DEALLOCS,"dealloc_AmB2ABCalleeSession()\n"); + + if (sipIsPyOwned(sipSelf)) + { + release_AmB2ABCalleeSession(sipSelf->u.cppPtr,0); + } +} + + +extern "C" {static void *init_AmB2ABCalleeSession(sipWrapper *, PyObject *, sipWrapper **, int *);} +static void *init_AmB2ABCalleeSession(sipWrapper *,PyObject *sipArgs,sipWrapper **,int *sipArgsParsed) +{ + AmB2ABCalleeSession *sipCpp = 0; + + sipTrace(SIP_TRACE_INITS,"init_AmB2ABCalleeSession()\n"); + + if (!sipCpp) + { + const string * a0; + int a0State = 0; + + if (sipParseArgs(sipArgsParsed,sipArgs,"M1",sipMappedType_string,&a0,&a0State)) + { + sipCpp = new AmB2ABCalleeSession(*a0); + + sipReleaseMappedType(const_cast(a0),sipMappedType_string,a0State); + } + } + + return sipCpp; +} + + +extern "C" {static void *forceConvertTo_AmB2ABCalleeSession(PyObject *, int *);} +static void *forceConvertTo_AmB2ABCalleeSession(PyObject *valobj,int *iserrp) +{ + if (*iserrp || valobj == NULL) + return NULL; + + if (valobj == Py_None || sipIsSubClassInstance(valobj,sipClass_AmB2ABCalleeSession)) + return sipConvertToCpp(valobj,sipClass_AmB2ABCalleeSession,iserrp); + + sipBadClass(sipNm_py_sems_lib_AmB2ABCalleeSession); + + *iserrp = 1; + + return NULL; +} + + +static PyMethodDef methods_AmB2ABCalleeSession[] = { + {sipNm_py_sems_lib_onB2ABEvent, meth_AmB2ABCalleeSession_onB2ABEvent, METH_VARARGS, NULL}, + {sipNm_py_sems_lib_reconnectAudio, meth_AmB2ABCalleeSession_reconnectAudio, METH_VARARGS, NULL} +}; + + +sipTypeDef sipType_py_sems_lib_AmB2ABCalleeSession = { + 0, + 0, + "py_sems_lib.AmB2ABCalleeSession", + 0, + {0, 0, 1}, + 0, + 0, + 2, methods_AmB2ABCalleeSession, + 0, 0, + 0, + init_AmB2ABCalleeSession, + 0, + 0, + 0, + 0, + 0, + 0, + dealloc_AmB2ABCalleeSession, + cast_AmB2ABCalleeSession, + release_AmB2ABCalleeSession, + forceConvertTo_AmB2ABCalleeSession, + 0, + 0, + {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + 0 +}; diff --git a/apps/py_sems/sip/sippy_sems_libAmB2ABCalleeSession.h b/apps/py_sems/sip/sippy_sems_libAmB2ABCalleeSession.h new file mode 100644 index 00000000..06708679 --- /dev/null +++ b/apps/py_sems/sip/sippy_sems_libAmB2ABCalleeSession.h @@ -0,0 +1,20 @@ +/* + * Interface header file. + * + * Generated by SIP 4.5.2 (4.5.2) on Thu Mar 29 00:29:43 2007 + */ + +#ifndef _py_sems_libAmB2ABCalleeSession_h +#define _py_sems_libAmB2ABCalleeSession_h + +#line 60 "PySemsB2ABDialog.sip" +#include "../../../core/AmB2ABSession.h" +#line 13 "sippy_sems_libAmB2ABCalleeSession.h" + +#define sipClass_AmB2ABCalleeSession sipModuleAPI_py_sems_lib.em_types[1] +#define sipCast_AmB2ABCalleeSession sipType_py_sems_lib_AmB2ABCalleeSession.td_cast +#define sipForceConvertTo_AmB2ABCalleeSession sipType_py_sems_lib_AmB2ABCalleeSession.td_fcto + +extern sipTypeDef sipType_py_sems_lib_AmB2ABCalleeSession; + +#endif diff --git a/apps/py_sems/sip/sippy_sems_libAmEvent.cpp b/apps/py_sems/sip/sippy_sems_libAmEvent.cpp index 4e91890c..fc68eab2 100644 --- a/apps/py_sems/sip/sippy_sems_libAmEvent.cpp +++ b/apps/py_sems/sip/sippy_sems_libAmEvent.cpp @@ -1,7 +1,7 @@ /* * Interface wrapper code. * - * Generated by SIP 4.5.2 (4.5.2) on Wed Mar 28 22:59:14 2007 + * Generated by SIP 4.5.2 (4.5.2) on Thu Mar 29 00:29:43 2007 */ #include "sipAPIpy_sems_lib.h" diff --git a/apps/py_sems/sip/sippy_sems_libAmEvent.h b/apps/py_sems/sip/sippy_sems_libAmEvent.h index dda90f94..cc38789f 100644 --- a/apps/py_sems/sip/sippy_sems_libAmEvent.h +++ b/apps/py_sems/sip/sippy_sems_libAmEvent.h @@ -1,7 +1,7 @@ /* * Interface header file. * - * Generated by SIP 4.5.2 (4.5.2) on Wed Mar 28 22:59:14 2007 + * Generated by SIP 4.5.2 (4.5.2) on Thu Mar 29 00:29:43 2007 */ #ifndef _py_sems_libAmEvent_h @@ -11,7 +11,7 @@ #include "../../../core/AmEvent.h" #line 13 "sippy_sems_libAmEvent.h" -#define sipClass_AmEvent sipModuleAPI_py_sems_lib.em_types[4] +#define sipClass_AmEvent sipModuleAPI_py_sems_lib.em_types[6] #define sipCast_AmEvent sipType_py_sems_lib_AmEvent.td_cast #define sipForceConvertTo_AmEvent sipType_py_sems_lib_AmEvent.td_fcto diff --git a/apps/py_sems/sip/sippy_sems_libAmSipDialog.cpp b/apps/py_sems/sip/sippy_sems_libAmSipDialog.cpp index f6a5482b..d0b5bd3a 100644 --- a/apps/py_sems/sip/sippy_sems_libAmSipDialog.cpp +++ b/apps/py_sems/sip/sippy_sems_libAmSipDialog.cpp @@ -1,7 +1,7 @@ /* * Interface wrapper code. * - * Generated by SIP 4.5.2 (4.5.2) on Wed Mar 28 22:59:14 2007 + * Generated by SIP 4.5.2 (4.5.2) on Thu Mar 29 00:29:43 2007 */ #include "sipAPIpy_sems_lib.h" diff --git a/apps/py_sems/sip/sippy_sems_libAmSipDialog.h b/apps/py_sems/sip/sippy_sems_libAmSipDialog.h index a8a7e7da..58903640 100644 --- a/apps/py_sems/sip/sippy_sems_libAmSipDialog.h +++ b/apps/py_sems/sip/sippy_sems_libAmSipDialog.h @@ -1,7 +1,7 @@ /* * Interface header file. * - * Generated by SIP 4.5.2 (4.5.2) on Wed Mar 28 22:59:14 2007 + * Generated by SIP 4.5.2 (4.5.2) on Thu Mar 29 00:29:43 2007 */ #ifndef _py_sems_libAmSipDialog_h @@ -11,7 +11,7 @@ #include "../../../core/AmSipDialog.h" #line 13 "sippy_sems_libAmSipDialog.h" -#define sipClass_AmSipDialog sipModuleAPI_py_sems_lib.em_types[6] +#define sipClass_AmSipDialog sipModuleAPI_py_sems_lib.em_types[8] #define sipCast_AmSipDialog sipType_py_sems_lib_AmSipDialog.td_cast #define sipForceConvertTo_AmSipDialog sipType_py_sems_lib_AmSipDialog.td_fcto diff --git a/apps/py_sems/sip/sippy_sems_libAmSipReply.cpp b/apps/py_sems/sip/sippy_sems_libAmSipReply.cpp index cee6687b..d9482ba4 100644 --- a/apps/py_sems/sip/sippy_sems_libAmSipReply.cpp +++ b/apps/py_sems/sip/sippy_sems_libAmSipReply.cpp @@ -1,7 +1,7 @@ /* * Interface wrapper code. * - * Generated by SIP 4.5.2 (4.5.2) on Wed Mar 28 22:59:14 2007 + * Generated by SIP 4.5.2 (4.5.2) on Thu Mar 29 00:29:43 2007 */ #include "sipAPIpy_sems_lib.h" diff --git a/apps/py_sems/sip/sippy_sems_libAmSipReply.h b/apps/py_sems/sip/sippy_sems_libAmSipReply.h index 0726d402..eb5e07d3 100644 --- a/apps/py_sems/sip/sippy_sems_libAmSipReply.h +++ b/apps/py_sems/sip/sippy_sems_libAmSipReply.h @@ -1,7 +1,7 @@ /* * Interface header file. * - * Generated by SIP 4.5.2 (4.5.2) on Wed Mar 28 22:59:14 2007 + * Generated by SIP 4.5.2 (4.5.2) on Thu Mar 29 00:29:43 2007 */ #ifndef _py_sems_libAmSipReply_h @@ -11,7 +11,7 @@ #include "../../../core/AmSipReply.h" #line 13 "sippy_sems_libAmSipReply.h" -#define sipClass_AmSipReply sipModuleAPI_py_sems_lib.em_types[7] +#define sipClass_AmSipReply sipModuleAPI_py_sems_lib.em_types[9] #define sipCast_AmSipReply sipType_py_sems_lib_AmSipReply.td_cast #define sipForceConvertTo_AmSipReply sipType_py_sems_lib_AmSipReply.td_fcto diff --git a/apps/py_sems/sip/sippy_sems_libAmSipRequest.cpp b/apps/py_sems/sip/sippy_sems_libAmSipRequest.cpp index 2a56b5ea..3bc6ae34 100644 --- a/apps/py_sems/sip/sippy_sems_libAmSipRequest.cpp +++ b/apps/py_sems/sip/sippy_sems_libAmSipRequest.cpp @@ -1,7 +1,7 @@ /* * Interface wrapper code. * - * Generated by SIP 4.5.2 (4.5.2) on Wed Mar 28 22:59:14 2007 + * Generated by SIP 4.5.2 (4.5.2) on Thu Mar 29 00:29:43 2007 */ #include "sipAPIpy_sems_lib.h" diff --git a/apps/py_sems/sip/sippy_sems_libAmSipRequest.h b/apps/py_sems/sip/sippy_sems_libAmSipRequest.h index e441a3ef..5dc18214 100644 --- a/apps/py_sems/sip/sippy_sems_libAmSipRequest.h +++ b/apps/py_sems/sip/sippy_sems_libAmSipRequest.h @@ -1,7 +1,7 @@ /* * Interface header file. * - * Generated by SIP 4.5.2 (4.5.2) on Wed Mar 28 22:59:14 2007 + * Generated by SIP 4.5.2 (4.5.2) on Thu Mar 29 00:29:43 2007 */ #ifndef _py_sems_libAmSipRequest_h @@ -11,7 +11,7 @@ #include "../../../core/AmSipRequest.h" #line 13 "sippy_sems_libAmSipRequest.h" -#define sipClass_AmSipRequest sipModuleAPI_py_sems_lib.em_types[8] +#define sipClass_AmSipRequest sipModuleAPI_py_sems_lib.em_types[10] #define sipCast_AmSipRequest sipType_py_sems_lib_AmSipRequest.td_cast #define sipForceConvertTo_AmSipRequest sipType_py_sems_lib_AmSipRequest.td_fcto diff --git a/apps/py_sems/sip/sippy_sems_libB2ABEvent.cpp b/apps/py_sems/sip/sippy_sems_libB2ABEvent.cpp new file mode 100644 index 00000000..c97220df --- /dev/null +++ b/apps/py_sems/sip/sippy_sems_libB2ABEvent.cpp @@ -0,0 +1,85 @@ +/* + * Interface wrapper code. + * + * Generated by SIP 4.5.2 (4.5.2) on Thu Mar 29 00:29:43 2007 + */ + +#include "sipAPIpy_sems_lib.h" +#include "sippy_sems_libB2ABEvent.h" + + +/* Cast a pointer to a type somewhere in its superclass hierarchy. */ +extern "C" {static void *cast_B2ABEvent(void *, sipWrapperType *);} +static void *cast_B2ABEvent(void *ptr,sipWrapperType *targetClass) +{ + if (targetClass == sipClass_B2ABEvent) + return ptr; + + return NULL; +} + + +/* Call the instance's destructor. */ +extern "C" {static void release_B2ABEvent(void *, int);} +static void release_B2ABEvent(void *ptr,int) +{ + delete reinterpret_cast(ptr); +} + + +extern "C" {static void dealloc_B2ABEvent(sipWrapper *);} +static void dealloc_B2ABEvent(sipWrapper *sipSelf) +{ + sipTrace(SIP_TRACE_DEALLOCS,"dealloc_B2ABEvent()\n"); + + if (sipIsPyOwned(sipSelf)) + { + release_B2ABEvent(sipSelf->u.cppPtr,0); + } +} + + +extern "C" {static void *forceConvertTo_B2ABEvent(PyObject *, int *);} +static void *forceConvertTo_B2ABEvent(PyObject *valobj,int *iserrp) +{ + if (*iserrp || valobj == NULL) + return NULL; + + if (valobj == Py_None || sipIsSubClassInstance(valobj,sipClass_B2ABEvent)) + return sipConvertToCpp(valobj,sipClass_B2ABEvent,iserrp); + + sipBadClass(sipNm_py_sems_lib_B2ABEvent); + + *iserrp = 1; + + return NULL; +} + + +sipTypeDef sipType_py_sems_lib_B2ABEvent = { + 0, + 0, + "py_sems_lib.B2ABEvent", + 0, + {0, 0, 1}, + 0, + 0, + 0, 0, + 0, 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + dealloc_B2ABEvent, + cast_B2ABEvent, + release_B2ABEvent, + forceConvertTo_B2ABEvent, + 0, + 0, + {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + 0 +}; diff --git a/apps/py_sems/sip/sippy_sems_libB2ABEvent.h b/apps/py_sems/sip/sippy_sems_libB2ABEvent.h new file mode 100644 index 00000000..4323bdd5 --- /dev/null +++ b/apps/py_sems/sip/sippy_sems_libB2ABEvent.h @@ -0,0 +1,20 @@ +/* + * Interface header file. + * + * Generated by SIP 4.5.2 (4.5.2) on Thu Mar 29 00:29:43 2007 + */ + +#ifndef _py_sems_libB2ABEvent_h +#define _py_sems_libB2ABEvent_h + +#line 75 "PySemsB2ABDialog.sip" +#include "../../../core/AmB2ABSession.h" +#line 13 "sippy_sems_libB2ABEvent.h" + +#define sipClass_B2ABEvent sipModuleAPI_py_sems_lib.em_types[0] +#define sipCast_B2ABEvent sipType_py_sems_lib_B2ABEvent.td_cast +#define sipForceConvertTo_B2ABEvent sipType_py_sems_lib_B2ABEvent.td_fcto + +extern sipTypeDef sipType_py_sems_lib_B2ABEvent; + +#endif diff --git a/apps/py_sems/sip/sippy_sems_libPySemsB2ABDialog.cpp b/apps/py_sems/sip/sippy_sems_libPySemsB2ABDialog.cpp index 71a955d1..c8cfcd9e 100644 --- a/apps/py_sems/sip/sippy_sems_libPySemsB2ABDialog.cpp +++ b/apps/py_sems/sip/sippy_sems_libPySemsB2ABDialog.cpp @@ -1,7 +1,7 @@ /* * Interface wrapper code. * - * Generated by SIP 4.5.2 (4.5.2) on Wed Mar 28 22:59:14 2007 + * Generated by SIP 4.5.2 (4.5.2) on Thu Mar 29 00:29:43 2007 */ #include "sipAPIpy_sems_lib.h" @@ -10,16 +10,18 @@ #include "sippy_sems_libAmSipDialog.h" #include "sippy_sems_libPySemsB2ABDialog.h" #include "sippy_sems_libAmEvent.h" +#include "sippy_sems_libB2ABEvent.h" +#include "sippy_sems_libAmB2ABCalleeSession.h" +#include "sippy_sems_libstring.h" #include "sippy_sems_libAmAudioFile.h" #include "sippy_sems_libAmSipRequest.h" -#include "sippy_sems_libstring.h" sipPySemsB2ABDialog::sipPySemsB2ABDialog(): PySemsB2ABDialog(), sipPySelf(0) { sipTrace(SIP_TRACE_CTORS,"sipPySemsB2ABDialog::sipPySemsB2ABDialog() (this=0x%08x)\n",this); - sipCommonCtor(sipPyMethods,6); + sipCommonCtor(sipPyMethods,9); } sipPySemsB2ABDialog::~sipPySemsB2ABDialog() @@ -33,7 +35,7 @@ void sipPySemsB2ABDialog::onInvite(const AmSipRequest& a0) { sipTrace(SIP_TRACE_CATCHERS,"void sipPySemsB2ABDialog::onInvite(const AmSipRequest&) (this=0x%08x)\n",this); - extern void sipVH_py_sems_lib_2(sip_gilstate_t,PyObject *,const AmSipRequest&); + extern void sipVH_py_sems_lib_4(sip_gilstate_t,PyObject *,const AmSipRequest&); sip_gilstate_t sipGILState; PyObject *meth; @@ -46,14 +48,14 @@ void sipPySemsB2ABDialog::onInvite(const AmSipRequest& a0) return; } - sipVH_py_sems_lib_2(sipGILState,meth,a0); + sipVH_py_sems_lib_4(sipGILState,meth,a0); } void sipPySemsB2ABDialog::onSessionStart(const AmSipRequest& a0) { sipTrace(SIP_TRACE_CATCHERS,"void sipPySemsB2ABDialog::onSessionStart(const AmSipRequest&) (this=0x%08x)\n",this); - extern void sipVH_py_sems_lib_2(sip_gilstate_t,PyObject *,const AmSipRequest&); + extern void sipVH_py_sems_lib_4(sip_gilstate_t,PyObject *,const AmSipRequest&); sip_gilstate_t sipGILState; PyObject *meth; @@ -66,14 +68,14 @@ void sipPySemsB2ABDialog::onSessionStart(const AmSipRequest& a0) return; } - sipVH_py_sems_lib_2(sipGILState,meth,a0); + sipVH_py_sems_lib_4(sipGILState,meth,a0); } void sipPySemsB2ABDialog::onCancel() { sipTrace(SIP_TRACE_CATCHERS,"void sipPySemsB2ABDialog::onCancel() (this=0x%08x)\n",this); - extern void sipVH_py_sems_lib_3(sip_gilstate_t,PyObject *); + extern void sipVH_py_sems_lib_5(sip_gilstate_t,PyObject *); sip_gilstate_t sipGILState; PyObject *meth; @@ -86,14 +88,14 @@ void sipPySemsB2ABDialog::onCancel() return; } - sipVH_py_sems_lib_3(sipGILState,meth); + sipVH_py_sems_lib_5(sipGILState,meth); } void sipPySemsB2ABDialog::onBye(const AmSipRequest& a0) { sipTrace(SIP_TRACE_CATCHERS,"void sipPySemsB2ABDialog::onBye(const AmSipRequest&) (this=0x%08x)\n",this); - extern void sipVH_py_sems_lib_2(sip_gilstate_t,PyObject *,const AmSipRequest&); + extern void sipVH_py_sems_lib_4(sip_gilstate_t,PyObject *,const AmSipRequest&); sip_gilstate_t sipGILState; PyObject *meth; @@ -106,14 +108,14 @@ void sipPySemsB2ABDialog::onBye(const AmSipRequest& a0) return; } - sipVH_py_sems_lib_2(sipGILState,meth,a0); + sipVH_py_sems_lib_4(sipGILState,meth,a0); } void sipPySemsB2ABDialog::onDtmf(int a0,int a1) { sipTrace(SIP_TRACE_CATCHERS,"void sipPySemsB2ABDialog::onDtmf(int,int) (this=0x%08x)\n",this); - extern void sipVH_py_sems_lib_1(sip_gilstate_t,PyObject *,int,int); + extern void sipVH_py_sems_lib_3(sip_gilstate_t,PyObject *,int,int); sip_gilstate_t sipGILState; PyObject *meth; @@ -126,7 +128,7 @@ void sipPySemsB2ABDialog::onDtmf(int a0,int a1) return; } - sipVH_py_sems_lib_1(sipGILState,meth,a0,a1); + sipVH_py_sems_lib_3(sipGILState,meth,a0,a1); } void sipPySemsB2ABDialog::process(AmEvent *a0) @@ -149,6 +151,78 @@ void sipPySemsB2ABDialog::process(AmEvent *a0) sipVH_py_sems_lib_0(sipGILState,meth,a0); } +AmB2ABCalleeSession * sipPySemsB2ABDialog::createCalleeSession() +{ + sipTrace(SIP_TRACE_CATCHERS,"AmB2ABCalleeSession * sipPySemsB2ABDialog::createCalleeSession() (this=0x%08x)\n",this); + + extern AmB2ABCalleeSession * sipVH_py_sems_lib_2(sip_gilstate_t,PyObject *); + + sip_gilstate_t sipGILState; + PyObject *meth; + + meth = sipIsPyMethod(&sipGILState,&sipPyMethods[6],sipPySelf,NULL,sipNm_py_sems_lib_createCalleeSession); + + if (!meth) + return PySemsB2ABDialog::createCalleeSession(); + + return sipVH_py_sems_lib_2(sipGILState,meth); +} + +void sipPySemsB2ABDialog::onB2ABEvent(B2ABEvent *a0) +{ + sipTrace(SIP_TRACE_CATCHERS,"void sipPySemsB2ABDialog::onB2ABEvent(B2ABEvent *) (this=0x%08x)\n",this); + + extern void sipVH_py_sems_lib_1(sip_gilstate_t,PyObject *,B2ABEvent *); + + sip_gilstate_t sipGILState; + PyObject *meth; + + meth = sipIsPyMethod(&sipGILState,&sipPyMethods[7],sipPySelf,NULL,sipNm_py_sems_lib_onB2ABEvent); + + if (!meth) + { + PySemsB2ABDialog::onB2ABEvent(a0); + return; + } + + sipVH_py_sems_lib_1(sipGILState,meth,a0); +} + +void sipPySemsB2ABDialog::relayEvent(AmEvent *a0) +{ + sipTrace(SIP_TRACE_CATCHERS,"void sipPySemsB2ABDialog::relayEvent(AmEvent *) (this=0x%08x)\n",this); + + extern void sipVH_py_sems_lib_0(sip_gilstate_t,PyObject *,AmEvent *); + + sip_gilstate_t sipGILState; + PyObject *meth; + + meth = sipIsPyMethod(&sipGILState,&sipPyMethods[8],sipPySelf,NULL,sipNm_py_sems_lib_relayEvent); + + if (!meth) + { + PySemsB2ABDialog::relayEvent(a0); + return; + } + + sipVH_py_sems_lib_0(sipGILState,meth,a0); +} + +AmB2ABCalleeSession * sipPySemsB2ABDialog::sipProtectVirt_createCalleeSession(bool sipSelfWasArg) +{ + return (sipSelfWasArg ? PySemsB2ABDialog::createCalleeSession() : createCalleeSession()); +} + +void sipPySemsB2ABDialog::sipProtectVirt_onB2ABEvent(bool sipSelfWasArg,B2ABEvent *a0) +{ + (sipSelfWasArg ? PySemsB2ABDialog::onB2ABEvent(a0) : onB2ABEvent(a0)); +} + +void sipPySemsB2ABDialog::sipProtectVirt_relayEvent(bool sipSelfWasArg,AmEvent *a0) +{ + (sipSelfWasArg ? PySemsB2ABDialog::relayEvent(a0) : relayEvent(a0)); +} + extern "C" {static PyObject *meth_PySemsB2ABDialog_acceptAudio(PyObject *, PyObject *);} static PyObject *meth_PySemsB2ABDialog_acceptAudio(PyObject *sipSelf,PyObject *sipArgs) @@ -462,6 +536,182 @@ static PyObject *meth_PySemsB2ABDialog_process(PyObject *sipSelf,PyObject *sipAr } +extern "C" {static PyObject *meth_PySemsB2ABDialog_connectCallee(PyObject *, PyObject *);} +static PyObject *meth_PySemsB2ABDialog_connectCallee(PyObject *sipSelf,PyObject *sipArgs) +{ + sipTrace(SIP_TRACE_METHODS,"meth_PySemsB2ABDialog_connectCallee()\n"); + + int sipArgsParsed = 0; + + { + const string * a0; + int a0State = 0; + const string * a1; + int a1State = 0; + const string * a2; + int a2State = 0; + const string * a3; + int a3State = 0; + PySemsB2ABDialog *sipCpp; + + if (sipParseArgs(&sipArgsParsed,sipArgs,"BM1M1M1M1",&sipSelf,sipClass_PySemsB2ABDialog,&sipCpp,sipMappedType_string,&a0,&a0State,sipMappedType_string,&a1,&a1State,sipMappedType_string,&a2,&a2State,sipMappedType_string,&a3,&a3State)) + { + sipCpp->connectCallee(*a0,*a1,*a2,*a3); + + sipReleaseMappedType(const_cast(a0),sipMappedType_string,a0State); + sipReleaseMappedType(const_cast(a1),sipMappedType_string,a1State); + sipReleaseMappedType(const_cast(a2),sipMappedType_string,a2State); + sipReleaseMappedType(const_cast(a3),sipMappedType_string,a3State); + + Py_INCREF(Py_None); + return Py_None; + } + } + + /* Raise an exception if the arguments couldn't be parsed. */ + sipNoMethod(sipArgsParsed,sipNm_py_sems_lib_PySemsB2ABDialog,sipNm_py_sems_lib_connectCallee); + + return NULL; +} + + +extern "C" {static PyObject *meth_PySemsB2ABDialog_reconnectAudio(PyObject *, PyObject *);} +static PyObject *meth_PySemsB2ABDialog_reconnectAudio(PyObject *sipSelf,PyObject *sipArgs) +{ + sipTrace(SIP_TRACE_METHODS,"meth_PySemsB2ABDialog_reconnectAudio()\n"); + + int sipArgsParsed = 0; + + { + PySemsB2ABDialog *sipCpp; + + if (sipParseArgs(&sipArgsParsed,sipArgs,"B",&sipSelf,sipClass_PySemsB2ABDialog,&sipCpp)) + { + sipCpp->reconnectAudio(); + + Py_INCREF(Py_None); + return Py_None; + } + } + + /* Raise an exception if the arguments couldn't be parsed. */ + sipNoMethod(sipArgsParsed,sipNm_py_sems_lib_PySemsB2ABDialog,sipNm_py_sems_lib_reconnectAudio); + + return NULL; +} + + +extern "C" {static PyObject *meth_PySemsB2ABDialog_getCalleeStatus(PyObject *, PyObject *);} +static PyObject *meth_PySemsB2ABDialog_getCalleeStatus(PyObject *sipSelf,PyObject *sipArgs) +{ + sipTrace(SIP_TRACE_METHODS,"meth_PySemsB2ABDialog_getCalleeStatus()\n"); + + int sipArgsParsed = 0; + + { + PySemsB2ABDialog *sipCpp; + + if (sipParseArgs(&sipArgsParsed,sipArgs,"B",&sipSelf,sipClass_PySemsB2ABDialog,&sipCpp)) + { + int sipRes; + + sipRes = sipCpp->getCalleeStatus(); + + return PyInt_FromLong(sipRes); + } + } + + /* Raise an exception if the arguments couldn't be parsed. */ + sipNoMethod(sipArgsParsed,sipNm_py_sems_lib_PySemsB2ABDialog,sipNm_py_sems_lib_getCalleeStatus); + + return NULL; +} + + +extern "C" {static PyObject *meth_PySemsB2ABDialog_createCalleeSession(PyObject *, PyObject *);} +static PyObject *meth_PySemsB2ABDialog_createCalleeSession(PyObject *sipSelf,PyObject *sipArgs) +{ + sipTrace(SIP_TRACE_METHODS,"meth_PySemsB2ABDialog_createCalleeSession()\n"); + + int sipArgsParsed = 0; + bool sipSelfWasArg = !sipSelf; + + { + sipPySemsB2ABDialog *sipCpp; + + if (sipParseArgs(&sipArgsParsed,sipArgs,"p",&sipSelf,sipClass_PySemsB2ABDialog,&sipCpp)) + { + AmB2ABCalleeSession *sipRes; + + sipRes = sipCpp->sipProtectVirt_createCalleeSession(sipSelfWasArg); + + return sipConvertFromInstance(sipRes,sipClass_AmB2ABCalleeSession,NULL); + } + } + + /* Raise an exception if the arguments couldn't be parsed. */ + sipNoMethod(sipArgsParsed,sipNm_py_sems_lib_PySemsB2ABDialog,sipNm_py_sems_lib_createCalleeSession); + + return NULL; +} + + +extern "C" {static PyObject *meth_PySemsB2ABDialog_onB2ABEvent(PyObject *, PyObject *);} +static PyObject *meth_PySemsB2ABDialog_onB2ABEvent(PyObject *sipSelf,PyObject *sipArgs) +{ + sipTrace(SIP_TRACE_METHODS,"meth_PySemsB2ABDialog_onB2ABEvent()\n"); + + int sipArgsParsed = 0; + bool sipSelfWasArg = !sipSelf; + + { + B2ABEvent * a0; + sipPySemsB2ABDialog *sipCpp; + + if (sipParseArgs(&sipArgsParsed,sipArgs,"pJ@",&sipSelf,sipClass_PySemsB2ABDialog,&sipCpp,sipClass_B2ABEvent,&a0)) + { + sipCpp->sipProtectVirt_onB2ABEvent(sipSelfWasArg,a0); + + Py_INCREF(Py_None); + return Py_None; + } + } + + /* Raise an exception if the arguments couldn't be parsed. */ + sipNoMethod(sipArgsParsed,sipNm_py_sems_lib_PySemsB2ABDialog,sipNm_py_sems_lib_onB2ABEvent); + + return NULL; +} + + +extern "C" {static PyObject *meth_PySemsB2ABDialog_relayEvent(PyObject *, PyObject *);} +static PyObject *meth_PySemsB2ABDialog_relayEvent(PyObject *sipSelf,PyObject *sipArgs) +{ + sipTrace(SIP_TRACE_METHODS,"meth_PySemsB2ABDialog_relayEvent()\n"); + + int sipArgsParsed = 0; + bool sipSelfWasArg = !sipSelf; + + { + AmEvent * a0; + sipPySemsB2ABDialog *sipCpp; + + if (sipParseArgs(&sipArgsParsed,sipArgs,"pJ@",&sipSelf,sipClass_PySemsB2ABDialog,&sipCpp,sipClass_AmEvent,&a0)) + { + sipCpp->sipProtectVirt_relayEvent(sipSelfWasArg,a0); + + Py_INCREF(Py_None); + return Py_None; + } + } + + /* Raise an exception if the arguments couldn't be parsed. */ + sipNoMethod(sipArgsParsed,sipNm_py_sems_lib_PySemsB2ABDialog,sipNm_py_sems_lib_relayEvent); + + return NULL; +} + + /* Cast a pointer to a type somewhere in its superclass hierarchy. */ extern "C" {static void *cast_PySemsB2ABDialog(void *, sipWrapperType *);} static void *cast_PySemsB2ABDialog(void *ptr,sipWrapperType *targetClass) @@ -496,7 +746,7 @@ static void dealloc_PySemsB2ABDialog(sipWrapper *sipSelf) { #line 17 "PySemsB2ABDialog.sip" fprintf(stderr,"------------- dealloc_PySemsB2ABDialog ----------\n"); -#line 500 "sippy_sems_libPySemsB2ABDialog.cpp" +#line 750 "sippy_sems_libPySemsB2ABDialog.cpp" release_PySemsB2ABDialog(sipSelf->u.cppPtr,sipSelf->flags); } @@ -580,12 +830,18 @@ static void *forceConvertTo_PySemsB2ABDialog(PyObject *valobj,int *iserrp) static PyMethodDef methods_PySemsB2ABDialog[] = { {sipNm_py_sems_lib_acceptAudio, meth_PySemsB2ABDialog_acceptAudio, METH_VARARGS, NULL}, + {sipNm_py_sems_lib_connectCallee, meth_PySemsB2ABDialog_connectCallee, METH_VARARGS, NULL}, + {sipNm_py_sems_lib_createCalleeSession, meth_PySemsB2ABDialog_createCalleeSession, METH_VARARGS, NULL}, + {sipNm_py_sems_lib_getCalleeStatus, meth_PySemsB2ABDialog_getCalleeStatus, METH_VARARGS, NULL}, + {sipNm_py_sems_lib_onB2ABEvent, meth_PySemsB2ABDialog_onB2ABEvent, METH_VARARGS, NULL}, {sipNm_py_sems_lib_onBye, meth_PySemsB2ABDialog_onBye, METH_VARARGS, NULL}, {sipNm_py_sems_lib_onCancel, meth_PySemsB2ABDialog_onCancel, METH_VARARGS, NULL}, {sipNm_py_sems_lib_onDtmf, meth_PySemsB2ABDialog_onDtmf, METH_VARARGS, NULL}, {sipNm_py_sems_lib_onInvite, meth_PySemsB2ABDialog_onInvite, METH_VARARGS, NULL}, {sipNm_py_sems_lib_onSessionStart, meth_PySemsB2ABDialog_onSessionStart, METH_VARARGS, NULL}, {sipNm_py_sems_lib_process, meth_PySemsB2ABDialog_process, METH_VARARGS, NULL}, + {sipNm_py_sems_lib_reconnectAudio, meth_PySemsB2ABDialog_reconnectAudio, METH_VARARGS, NULL}, + {sipNm_py_sems_lib_relayEvent, meth_PySemsB2ABDialog_relayEvent, METH_VARARGS, NULL}, {sipNm_py_sems_lib_setInOut, meth_PySemsB2ABDialog_setInOut, METH_VARARGS, NULL}, {sipNm_py_sems_lib_setInput, meth_PySemsB2ABDialog_setInput, METH_VARARGS, NULL}, {sipNm_py_sems_lib_setOutput, meth_PySemsB2ABDialog_setOutput, METH_VARARGS, NULL}, @@ -601,7 +857,7 @@ sipTypeDef sipType_py_sems_lib_PySemsB2ABDialog = { {0, 0, 1}, 0, 0, - 11, methods_PySemsB2ABDialog, + 17, methods_PySemsB2ABDialog, 0, 0, variables_PySemsB2ABDialog, init_PySemsB2ABDialog, diff --git a/apps/py_sems/sip/sippy_sems_libPySemsB2ABDialog.h b/apps/py_sems/sip/sippy_sems_libPySemsB2ABDialog.h index f8796498..13b95716 100644 --- a/apps/py_sems/sip/sippy_sems_libPySemsB2ABDialog.h +++ b/apps/py_sems/sip/sippy_sems_libPySemsB2ABDialog.h @@ -1,17 +1,18 @@ /* * Interface header file. * - * Generated by SIP 4.5.2 (4.5.2) on Wed Mar 28 22:59:14 2007 + * Generated by SIP 4.5.2 (4.5.2) on Thu Mar 29 00:29:43 2007 */ #ifndef _py_sems_libPySemsB2ABDialog_h #define _py_sems_libPySemsB2ABDialog_h -#line 6 "PySemsB2ABDialog.sip" +#line 5 "PySemsB2ABDialog.sip" #include "../PySemsB2ABDialog.h" -#line 13 "sippy_sems_libPySemsB2ABDialog.h" +#include "../../../core/AmB2ABSession.h" +#line 14 "sippy_sems_libPySemsB2ABDialog.h" -#define sipClass_PySemsB2ABDialog sipModuleAPI_py_sems_lib.em_types[0] +#define sipClass_PySemsB2ABDialog sipModuleAPI_py_sems_lib.em_types[2] #define sipCast_PySemsB2ABDialog sipType_py_sems_lib_PySemsB2ABDialog.td_cast #define sipForceConvertTo_PySemsB2ABDialog sipType_py_sems_lib_PySemsB2ABDialog.td_fcto @@ -24,6 +25,14 @@ public: sipPySemsB2ABDialog(); virtual ~sipPySemsB2ABDialog(); + /* + * There is a public method for every protected method visible from + * this class. + */ + AmB2ABCalleeSession * sipProtectVirt_createCalleeSession(bool); + void sipProtectVirt_onB2ABEvent(bool,B2ABEvent *); + void sipProtectVirt_relayEvent(bool,AmEvent *); + /* * There is a protected method for every virtual method visible from * this class. @@ -35,6 +44,9 @@ protected: void onBye(const AmSipRequest&); void onDtmf(int,int); void process(AmEvent *); + AmB2ABCalleeSession * createCalleeSession(); + void onB2ABEvent(B2ABEvent *); + void relayEvent(AmEvent *); public: sipWrapper *sipPySelf; @@ -43,7 +55,7 @@ private: sipPySemsB2ABDialog(const sipPySemsB2ABDialog &); sipPySemsB2ABDialog &operator = (const sipPySemsB2ABDialog &); - sipMethodCache sipPyMethods[6]; + sipMethodCache sipPyMethods[9]; }; #endif diff --git a/apps/py_sems/sip/sippy_sems_libPySemsB2BDialog.cpp b/apps/py_sems/sip/sippy_sems_libPySemsB2BDialog.cpp index bbc4cb39..e13c10ee 100644 --- a/apps/py_sems/sip/sippy_sems_libPySemsB2BDialog.cpp +++ b/apps/py_sems/sip/sippy_sems_libPySemsB2BDialog.cpp @@ -1,7 +1,7 @@ /* * Interface wrapper code. * - * Generated by SIP 4.5.2 (4.5.2) on Wed Mar 28 22:59:14 2007 + * Generated by SIP 4.5.2 (4.5.2) on Thu Mar 29 00:29:43 2007 */ #include "sipAPIpy_sems_lib.h" @@ -33,7 +33,7 @@ void sipPySemsB2BDialog::onInvite(const AmSipRequest& a0) { sipTrace(SIP_TRACE_CATCHERS,"void sipPySemsB2BDialog::onInvite(const AmSipRequest&) (this=0x%08x)\n",this); - extern void sipVH_py_sems_lib_2(sip_gilstate_t,PyObject *,const AmSipRequest&); + extern void sipVH_py_sems_lib_4(sip_gilstate_t,PyObject *,const AmSipRequest&); sip_gilstate_t sipGILState; PyObject *meth; @@ -46,14 +46,14 @@ void sipPySemsB2BDialog::onInvite(const AmSipRequest& a0) return; } - sipVH_py_sems_lib_2(sipGILState,meth,a0); + sipVH_py_sems_lib_4(sipGILState,meth,a0); } void sipPySemsB2BDialog::onSessionStart(const AmSipRequest& a0) { sipTrace(SIP_TRACE_CATCHERS,"void sipPySemsB2BDialog::onSessionStart(const AmSipRequest&) (this=0x%08x)\n",this); - extern void sipVH_py_sems_lib_2(sip_gilstate_t,PyObject *,const AmSipRequest&); + extern void sipVH_py_sems_lib_4(sip_gilstate_t,PyObject *,const AmSipRequest&); sip_gilstate_t sipGILState; PyObject *meth; @@ -66,14 +66,14 @@ void sipPySemsB2BDialog::onSessionStart(const AmSipRequest& a0) return; } - sipVH_py_sems_lib_2(sipGILState,meth,a0); + sipVH_py_sems_lib_4(sipGILState,meth,a0); } void sipPySemsB2BDialog::onCancel() { sipTrace(SIP_TRACE_CATCHERS,"void sipPySemsB2BDialog::onCancel() (this=0x%08x)\n",this); - extern void sipVH_py_sems_lib_3(sip_gilstate_t,PyObject *); + extern void sipVH_py_sems_lib_5(sip_gilstate_t,PyObject *); sip_gilstate_t sipGILState; PyObject *meth; @@ -86,14 +86,14 @@ void sipPySemsB2BDialog::onCancel() return; } - sipVH_py_sems_lib_3(sipGILState,meth); + sipVH_py_sems_lib_5(sipGILState,meth); } void sipPySemsB2BDialog::onBye(const AmSipRequest& a0) { sipTrace(SIP_TRACE_CATCHERS,"void sipPySemsB2BDialog::onBye(const AmSipRequest&) (this=0x%08x)\n",this); - extern void sipVH_py_sems_lib_2(sip_gilstate_t,PyObject *,const AmSipRequest&); + extern void sipVH_py_sems_lib_4(sip_gilstate_t,PyObject *,const AmSipRequest&); sip_gilstate_t sipGILState; PyObject *meth; @@ -106,14 +106,14 @@ void sipPySemsB2BDialog::onBye(const AmSipRequest& a0) return; } - sipVH_py_sems_lib_2(sipGILState,meth,a0); + sipVH_py_sems_lib_4(sipGILState,meth,a0); } void sipPySemsB2BDialog::onDtmf(int a0,int a1) { sipTrace(SIP_TRACE_CATCHERS,"void sipPySemsB2BDialog::onDtmf(int,int) (this=0x%08x)\n",this); - extern void sipVH_py_sems_lib_1(sip_gilstate_t,PyObject *,int,int); + extern void sipVH_py_sems_lib_3(sip_gilstate_t,PyObject *,int,int); sip_gilstate_t sipGILState; PyObject *meth; @@ -126,7 +126,7 @@ void sipPySemsB2BDialog::onDtmf(int a0,int a1) return; } - sipVH_py_sems_lib_1(sipGILState,meth,a0,a1); + sipVH_py_sems_lib_3(sipGILState,meth,a0,a1); } void sipPySemsB2BDialog::process(AmEvent *a0) diff --git a/apps/py_sems/sip/sippy_sems_libPySemsB2BDialog.h b/apps/py_sems/sip/sippy_sems_libPySemsB2BDialog.h index e1eb826d..c7a97c56 100644 --- a/apps/py_sems/sip/sippy_sems_libPySemsB2BDialog.h +++ b/apps/py_sems/sip/sippy_sems_libPySemsB2BDialog.h @@ -1,7 +1,7 @@ /* * Interface header file. * - * Generated by SIP 4.5.2 (4.5.2) on Wed Mar 28 22:59:14 2007 + * Generated by SIP 4.5.2 (4.5.2) on Thu Mar 29 00:29:43 2007 */ #ifndef _py_sems_libPySemsB2BDialog_h @@ -11,7 +11,7 @@ #include "../PySemsB2BDialog.h" #line 13 "sippy_sems_libPySemsB2BDialog.h" -#define sipClass_PySemsB2BDialog sipModuleAPI_py_sems_lib.em_types[1] +#define sipClass_PySemsB2BDialog sipModuleAPI_py_sems_lib.em_types[3] #define sipCast_PySemsB2BDialog sipType_py_sems_lib_PySemsB2BDialog.td_cast #define sipForceConvertTo_PySemsB2BDialog sipType_py_sems_lib_PySemsB2BDialog.td_fcto diff --git a/apps/py_sems/sip/sippy_sems_libPySemsDialog.cpp b/apps/py_sems/sip/sippy_sems_libPySemsDialog.cpp index 294aed8f..ad49096e 100644 --- a/apps/py_sems/sip/sippy_sems_libPySemsDialog.cpp +++ b/apps/py_sems/sip/sippy_sems_libPySemsDialog.cpp @@ -1,7 +1,7 @@ /* * Interface wrapper code. * - * Generated by SIP 4.5.2 (4.5.2) on Wed Mar 28 22:59:14 2007 + * Generated by SIP 4.5.2 (4.5.2) on Thu Mar 29 00:29:43 2007 */ #include "sipAPIpy_sems_lib.h" @@ -33,7 +33,7 @@ void sipPySemsDialog::onInvite(const AmSipRequest& a0) { sipTrace(SIP_TRACE_CATCHERS,"void sipPySemsDialog::onInvite(const AmSipRequest&) (this=0x%08x)\n",this); - extern void sipVH_py_sems_lib_2(sip_gilstate_t,PyObject *,const AmSipRequest&); + extern void sipVH_py_sems_lib_4(sip_gilstate_t,PyObject *,const AmSipRequest&); sip_gilstate_t sipGILState; PyObject *meth; @@ -46,14 +46,14 @@ void sipPySemsDialog::onInvite(const AmSipRequest& a0) return; } - sipVH_py_sems_lib_2(sipGILState,meth,a0); + sipVH_py_sems_lib_4(sipGILState,meth,a0); } void sipPySemsDialog::onSessionStart(const AmSipRequest& a0) { sipTrace(SIP_TRACE_CATCHERS,"void sipPySemsDialog::onSessionStart(const AmSipRequest&) (this=0x%08x)\n",this); - extern void sipVH_py_sems_lib_2(sip_gilstate_t,PyObject *,const AmSipRequest&); + extern void sipVH_py_sems_lib_4(sip_gilstate_t,PyObject *,const AmSipRequest&); sip_gilstate_t sipGILState; PyObject *meth; @@ -66,14 +66,14 @@ void sipPySemsDialog::onSessionStart(const AmSipRequest& a0) return; } - sipVH_py_sems_lib_2(sipGILState,meth,a0); + sipVH_py_sems_lib_4(sipGILState,meth,a0); } void sipPySemsDialog::onCancel() { sipTrace(SIP_TRACE_CATCHERS,"void sipPySemsDialog::onCancel() (this=0x%08x)\n",this); - extern void sipVH_py_sems_lib_3(sip_gilstate_t,PyObject *); + extern void sipVH_py_sems_lib_5(sip_gilstate_t,PyObject *); sip_gilstate_t sipGILState; PyObject *meth; @@ -86,14 +86,14 @@ void sipPySemsDialog::onCancel() return; } - sipVH_py_sems_lib_3(sipGILState,meth); + sipVH_py_sems_lib_5(sipGILState,meth); } void sipPySemsDialog::onBye(const AmSipRequest& a0) { sipTrace(SIP_TRACE_CATCHERS,"void sipPySemsDialog::onBye(const AmSipRequest&) (this=0x%08x)\n",this); - extern void sipVH_py_sems_lib_2(sip_gilstate_t,PyObject *,const AmSipRequest&); + extern void sipVH_py_sems_lib_4(sip_gilstate_t,PyObject *,const AmSipRequest&); sip_gilstate_t sipGILState; PyObject *meth; @@ -106,14 +106,14 @@ void sipPySemsDialog::onBye(const AmSipRequest& a0) return; } - sipVH_py_sems_lib_2(sipGILState,meth,a0); + sipVH_py_sems_lib_4(sipGILState,meth,a0); } void sipPySemsDialog::onDtmf(int a0,int a1) { sipTrace(SIP_TRACE_CATCHERS,"void sipPySemsDialog::onDtmf(int,int) (this=0x%08x)\n",this); - extern void sipVH_py_sems_lib_1(sip_gilstate_t,PyObject *,int,int); + extern void sipVH_py_sems_lib_3(sip_gilstate_t,PyObject *,int,int); sip_gilstate_t sipGILState; PyObject *meth; @@ -126,7 +126,7 @@ void sipPySemsDialog::onDtmf(int a0,int a1) return; } - sipVH_py_sems_lib_1(sipGILState,meth,a0,a1); + sipVH_py_sems_lib_3(sipGILState,meth,a0,a1); } void sipPySemsDialog::process(AmEvent *a0) diff --git a/apps/py_sems/sip/sippy_sems_libPySemsDialog.h b/apps/py_sems/sip/sippy_sems_libPySemsDialog.h index 13823c7e..a3494eb5 100644 --- a/apps/py_sems/sip/sippy_sems_libPySemsDialog.h +++ b/apps/py_sems/sip/sippy_sems_libPySemsDialog.h @@ -1,7 +1,7 @@ /* * Interface header file. * - * Generated by SIP 4.5.2 (4.5.2) on Wed Mar 28 22:59:14 2007 + * Generated by SIP 4.5.2 (4.5.2) on Thu Mar 29 00:29:43 2007 */ #ifndef _py_sems_libPySemsDialog_h @@ -11,7 +11,7 @@ #include "../PySemsDialog.h" #line 13 "sippy_sems_libPySemsDialog.h" -#define sipClass_PySemsDialog sipModuleAPI_py_sems_lib.em_types[2] +#define sipClass_PySemsDialog sipModuleAPI_py_sems_lib.em_types[4] #define sipCast_PySemsDialog sipType_py_sems_lib_PySemsDialog.td_cast #define sipForceConvertTo_PySemsDialog sipType_py_sems_lib_PySemsDialog.td_fcto diff --git a/apps/py_sems/sip/sippy_sems_libcmodule.cpp b/apps/py_sems/sip/sippy_sems_libcmodule.cpp index c13e89dd..fbe2df9f 100644 --- a/apps/py_sems/sip/sippy_sems_libcmodule.cpp +++ b/apps/py_sems/sip/sippy_sems_libcmodule.cpp @@ -1,11 +1,13 @@ /* * Module code. * - * Generated by SIP 4.5.2 (4.5.2) on Wed Mar 28 22:59:14 2007 + * Generated by SIP 4.5.2 (4.5.2) on Thu Mar 29 00:29:43 2007 */ #include "sipAPIpy_sems_lib.h" +#include "sippy_sems_libB2ABEvent.h" +#include "sippy_sems_libAmB2ABCalleeSession.h" #include "sippy_sems_libPySemsB2ABDialog.h" #include "sippy_sems_libPySemsB2BDialog.h" #include "sippy_sems_libPySemsDialog.h" @@ -20,6 +22,14 @@ /* Define the strings used by this module. */ char sipNm_py_sems_lib_get_header_param[] = "get_header_param"; +char sipNm_py_sems_lib_B2ABEvent[] = "B2ABEvent"; +char sipNm_py_sems_lib_AmB2ABCalleeSession[] = "AmB2ABCalleeSession"; +char sipNm_py_sems_lib_relayEvent[] = "relayEvent"; +char sipNm_py_sems_lib_onB2ABEvent[] = "onB2ABEvent"; +char sipNm_py_sems_lib_createCalleeSession[] = "createCalleeSession"; +char sipNm_py_sems_lib_getCalleeStatus[] = "getCalleeStatus"; +char sipNm_py_sems_lib_reconnectAudio[] = "reconnectAudio"; +char sipNm_py_sems_lib_connectCallee[] = "connectCallee"; char sipNm_py_sems_lib_PySemsB2ABDialog[] = "PySemsB2ABDialog"; char sipNm_py_sems_lib_PySemsB2BDialog[] = "PySemsB2BDialog"; char sipNm_py_sems_lib_process[] = "process"; @@ -116,7 +126,36 @@ void sipVH_py_sems_lib_0(sip_gilstate_t sipGILState,PyObject *sipMethod,AmEvent SIP_RELEASE_GIL(sipGILState) } -void sipVH_py_sems_lib_1(sip_gilstate_t sipGILState,PyObject *sipMethod,int a0,int a1) +void sipVH_py_sems_lib_1(sip_gilstate_t sipGILState,PyObject *sipMethod,B2ABEvent *a0) +{ + PyObject *sipResObj = sipCallMethod(0,sipMethod,"C",a0,sipClass_B2ABEvent,NULL); + + if (!sipResObj || sipParseResult(0,sipMethod,sipResObj,"Z") < 0) + PyErr_Print(); + + Py_XDECREF(sipResObj); + Py_DECREF(sipMethod); + + SIP_RELEASE_GIL(sipGILState) +} + +AmB2ABCalleeSession * sipVH_py_sems_lib_2(sip_gilstate_t sipGILState,PyObject *sipMethod) +{ + AmB2ABCalleeSession * sipRes = 0; + PyObject *sipResObj = sipCallMethod(0,sipMethod,""); + + if (!sipResObj || sipParseResult(0,sipMethod,sipResObj,"C4",sipClass_AmB2ABCalleeSession,&sipRes) < 0) + PyErr_Print(); + + Py_XDECREF(sipResObj); + Py_DECREF(sipMethod); + + SIP_RELEASE_GIL(sipGILState) + + return sipRes; +} + +void sipVH_py_sems_lib_3(sip_gilstate_t sipGILState,PyObject *sipMethod,int a0,int a1) { PyObject *sipResObj = sipCallMethod(0,sipMethod,"ii",a0,a1); @@ -129,7 +168,7 @@ void sipVH_py_sems_lib_1(sip_gilstate_t sipGILState,PyObject *sipMethod,int a0,i SIP_RELEASE_GIL(sipGILState) } -void sipVH_py_sems_lib_2(sip_gilstate_t sipGILState,PyObject *sipMethod,const AmSipRequest& a0) +void sipVH_py_sems_lib_4(sip_gilstate_t sipGILState,PyObject *sipMethod,const AmSipRequest& a0) { PyObject *sipResObj = sipCallMethod(0,sipMethod,"C",const_cast(&a0),sipClass_AmSipRequest,NULL); @@ -142,7 +181,7 @@ void sipVH_py_sems_lib_2(sip_gilstate_t sipGILState,PyObject *sipMethod,const Am SIP_RELEASE_GIL(sipGILState) } -void sipVH_py_sems_lib_3(sip_gilstate_t sipGILState,PyObject *sipMethod) +void sipVH_py_sems_lib_5(sip_gilstate_t sipGILState,PyObject *sipMethod) { PyObject *sipResObj = sipCallMethod(0,sipMethod,""); @@ -263,7 +302,7 @@ static sipWrapperType *sipSubClass_AmEvent(void **sipCppRet) else { sipClass = sipClass_AmEvent; } -#line 267 "sippy_sems_libcmodule.cpp" +#line 306 "sippy_sems_libcmodule.cpp" return sipClass; } @@ -274,6 +313,8 @@ static sipWrapperType *sipSubClass_AmEvent(void **sipCppRet) * proper Python types during the export process. */ static sipWrapperType *typesTable[] = { + (sipWrapperType *)(void *)&sipType_py_sems_lib_B2ABEvent, + (sipWrapperType *)(void *)&sipType_py_sems_lib_AmB2ABCalleeSession, (sipWrapperType *)(void *)&sipType_py_sems_lib_PySemsB2ABDialog, (sipWrapperType *)(void *)&sipType_py_sems_lib_PySemsB2BDialog, (sipWrapperType *)(void *)&sipType_py_sems_lib_PySemsDialog, @@ -295,9 +336,9 @@ static sipMappedType *mappedTypesTable[] = { /* Define each named enum in this module. */ static sipEnumDef enumTypesTable[] = { - {"py_sems_lib.AmAudioFile.OpenMode", NULL, 3, NULL}, - {"py_sems_lib.AmAudioEvent.EventType", NULL, 5, NULL}, - {"py_sems_lib.AmSipDialog.Status", NULL, 6, NULL}, + {"py_sems_lib.AmAudioFile.OpenMode", NULL, 5, NULL}, + {"py_sems_lib.AmAudioEvent.EventType", NULL, 7, NULL}, + {"py_sems_lib.AmSipDialog.Status", NULL, 8, NULL}, }; @@ -310,12 +351,14 @@ static sipVirtHandlerFunc virtHandlersTable[] = { (sipVirtHandlerFunc)sipVH_py_sems_lib_1, (sipVirtHandlerFunc)sipVH_py_sems_lib_2, (sipVirtHandlerFunc)sipVH_py_sems_lib_3, + (sipVirtHandlerFunc)sipVH_py_sems_lib_4, + (sipVirtHandlerFunc)sipVH_py_sems_lib_5, }; /* This defines the class sub-convertors that this module defines. */ static sipSubClassConvertorDef convertorsTable[] = { - {sipSubClass_AmEvent, {4, 255, 0}, NULL}, + {sipSubClass_AmEvent, {6, 255, 0}, NULL}, {NULL, {0, 0, 0}, NULL} }; @@ -329,7 +372,7 @@ sipExportedModuleDef sipModuleAPI_py_sems_lib = { 0, NULL, NULL, - 9, + 11, typesTable, NULL, mappedTypesTable, diff --git a/apps/py_sems/sip/sippy_sems_libstring.cpp b/apps/py_sems/sip/sippy_sems_libstring.cpp index f71bf75c..860c2af9 100644 --- a/apps/py_sems/sip/sippy_sems_libstring.cpp +++ b/apps/py_sems/sip/sippy_sems_libstring.cpp @@ -1,7 +1,7 @@ /* * Interface wrapper code. * - * Generated by SIP 4.5.2 (4.5.2) on Wed Mar 28 22:59:14 2007 + * Generated by SIP 4.5.2 (4.5.2) on Thu Mar 29 00:29:43 2007 */ #include "sipAPIpy_sems_lib.h" diff --git a/apps/py_sems/sip/sippy_sems_libstring.h b/apps/py_sems/sip/sippy_sems_libstring.h index 6a2fe05a..5f45ffc5 100644 --- a/apps/py_sems/sip/sippy_sems_libstring.h +++ b/apps/py_sems/sip/sippy_sems_libstring.h @@ -1,7 +1,7 @@ /* * Interface header file. * - * Generated by SIP 4.5.2 (4.5.2) on Wed Mar 28 22:59:14 2007 + * Generated by SIP 4.5.2 (4.5.2) on Thu Mar 29 00:29:43 2007 */ #ifndef _py_sems_libstring_h