Changeset 928 for pjproject/trunk/pjsip-apps/src/py_pjsua/py_pjsua.c

Timestamp:

Feb 3, 2007 5:23:22 PM (17 years ago)

Author:

bennylp

Message:

Added various PJSIP constants to Python module and bugfix in call_hangup()

File:

• pjproject/trunk/pjsip-apps/src/py_pjsua/py_pjsua.c (modified) (4 diffs)

pjproject/trunk/pjsip-apps/src/py_pjsua/py_pjsua.c

@@ -1 +1 @@
 /* $Id$ */
 /* 
- * Copyright (C) 2003-2006 Benny Prijono <benny@prijono.org>
+ * Copyright (C) 2003-2007 Benny Prijono <benny@prijono.org>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -7511 +7511 @@
         return NULL;
     }
-    if (sr != Py_None)
+    if (sr == Py_None)
     {
         reason = NULL;
@@ -8360 +8360 @@
 {
     PyObject* m = NULL;
+#define ADD_CONSTANT(mod,name)  PyModule_AddIntConstant(mod,#name,name)
 
     
@@ -8588 +8589 @@
     /* END OF LIB CALL */
 
-#ifdef PJSUA_INVALID_ID
+
     /*
-     * Constant to identify invalid ID for all sorts of IDs.
+     * Add various constants.
      */
-    PyModule_AddIntConstant(m, "PJSUA_INVALID_ID", PJSUA_INVALID_ID);
-#endif
-
-#ifdef PJSUA_ACC_MAX_PROXIES
-    /*
-     * Maximum proxies in account.
-     */
-    PyModule_AddIntConstant(
-        m, "PJSUA_ACC_MAX_PROXIES ", PJSUA_ACC_MAX_PROXIES
-    );
-#endif
-
-#ifdef PJSUA_MAX_ACC
-    /*
-     * Maximum account.
-     */
-    PyModule_AddIntConstant(
-        m, "PJSUA_MAX_ACC", PJSUA_MAX_ACC
-    );
-#endif
-
-#ifdef PJSUA_REG_INTERVAL
-    /*
-     * Default registration interval..
-     */
-    PyModule_AddIntConstant(
-        m, "PJSUA_REG_INTERVAL", PJSUA_REG_INTERVAL
-    );
-#endif
-
-#ifdef PJSUA_PUBLISH_EXPIRATION
-    /*
-     * Default PUBLISH expiration
-     */
-    PyModule_AddIntConstant(
-        m, "PJSUA_PUBLISH_EXPIRATION", PJSUA_PUBLISH_EXPIRATION
-    );
-#endif
-        
-#ifdef PJSUA_DEFAULT_ACC_PRIORITY
-    /*
-     * Default account priority.
-     */
-    PyModule_AddIntConstant(
-        m, "PJSUA_DEFAULT_ACC_PRIORITY", PJSUA_DEFAULT_ACC_PRIORITY
-    );
-#endif
-
-#ifdef PJSUA_MAX_BUDDIES
-    /*
-     * Default account priority.
-     */
-    PyModule_AddIntConstant(
-        m, "PJSUA_MAX_BUDDIES", PJSUA_MAX_BUDDIES
-    );
-#endif
-
-#ifdef  PJSUA_MAX_CONF_PORTS
-
-    /*
-     * Max ports in the conference bridge.
-     */
-    PyModule_AddIntConstant(
-        m, "PJSUA_MAX_CONF_PORTS", PJSUA_MAX_CONF_PORTS
-    );
-
-#endif
-
-#ifdef  PJSUA_DEFAULT_CLOCK_RATE  
-
-    PyModule_AddIntConstant(
-        m, "PJSUA_DEFAULT_CLOCK_RATE", PJSUA_DEFAULT_CLOCK_RATE
-    );
-
-#endif
-
-#ifdef  PJSUA_DEFAULT_CODEC_QUALITY  
-
-    PyModule_AddIntConstant(
-        m, "PJSUA_DEFAULT_CODEC_QUALITY", PJSUA_DEFAULT_CODEC_QUALITY
-    );
-
-#endif
-
-#ifdef  PJSUA_DEFAULT_ILBC_MODE   
-
-    PyModule_AddIntConstant(
-        m, "PJSUA_DEFAULT_ILBC_MODE", PJSUA_DEFAULT_ILBC_MODE
-    );
-
-#endif
-
-#ifdef  PJSUA_DEFAULT_EC_TAIL_LEN  
-
-    PyModule_AddIntConstant(
-        m, "PJSUA_DEFAULT_EC_TAIL_LEN", PJSUA_DEFAULT_EC_TAIL_LEN
-    );
-
-#endif
-
-#ifdef  PJSUA_MAX_CALLS  
-
-    PyModule_AddIntConstant(
-        m, "PJSUA_MAX_CALLS", PJSUA_MAX_CALLS
-    );
-
-#endif
-
-#ifdef  PJSUA_XFER_NO_REQUIRE_REPLACES
-
-    PyModule_AddIntConstant(
-        m, "PJSUA_XFER_NO_REQUIRE_REPLACES", PJSUA_XFER_NO_REQUIRE_REPLACES
-    );
-#endif
-
-}
+
+    /* Call states */
+    ADD_CONSTANT(m, PJSIP_INV_STATE_NULL);
+    ADD_CONSTANT(m, PJSIP_INV_STATE_CALLING);
+    ADD_CONSTANT(m, PJSIP_INV_STATE_INCOMING);
+    ADD_CONSTANT(m, PJSIP_INV_STATE_EARLY);
+    ADD_CONSTANT(m, PJSIP_INV_STATE_CONNECTING);
+    ADD_CONSTANT(m, PJSIP_INV_STATE_CONFIRMED);
+    ADD_CONSTANT(m, PJSIP_INV_STATE_DISCONNECTED);
+
+    /* Call media status (enum pjsua_call_media_status) */
+    ADD_CONSTANT(m, PJSUA_CALL_MEDIA_NONE);
+    ADD_CONSTANT(m, PJSUA_CALL_MEDIA_ACTIVE);
+    ADD_CONSTANT(m, PJSUA_CALL_MEDIA_LOCAL_HOLD);
+    ADD_CONSTANT(m, PJSUA_CALL_MEDIA_REMOTE_HOLD);
+
+    /* Buddy status */
+    ADD_CONSTANT(m, PJSUA_BUDDY_STATUS_UNKNOWN);
+    ADD_CONSTANT(m, PJSUA_BUDDY_STATUS_ONLINE);
+    ADD_CONSTANT(m, PJSUA_BUDDY_STATUS_OFFLINE);
+
+    /* PJSIP transport types (enum pjsip_transport_type_e) */
+    ADD_CONSTANT(m, PJSIP_TRANSPORT_UNSPECIFIED);
+    ADD_CONSTANT(m, PJSIP_TRANSPORT_UDP);
+    ADD_CONSTANT(m, PJSIP_TRANSPORT_TCP);
+    ADD_CONSTANT(m, PJSIP_TRANSPORT_TLS);
+    ADD_CONSTANT(m, PJSIP_TRANSPORT_SCTP);
+    ADD_CONSTANT(m, PJSIP_TRANSPORT_LOOP);
+    ADD_CONSTANT(m, PJSIP_TRANSPORT_LOOP_DGRAM);
+
+
+    /* Invalid IDs */
+    ADD_CONSTANT(m, PJSUA_INVALID_ID);
+
+
+    /* Various compile time constants */
+    ADD_CONSTANT(m, PJSUA_ACC_MAX_PROXIES);
+    ADD_CONSTANT(m, PJSUA_MAX_ACC);
+    ADD_CONSTANT(m, PJSUA_REG_INTERVAL);
+    ADD_CONSTANT(m, PJSUA_PUBLISH_EXPIRATION);
+    ADD_CONSTANT(m, PJSUA_DEFAULT_ACC_PRIORITY);
+    ADD_CONSTANT(m, PJSUA_MAX_BUDDIES);
+    ADD_CONSTANT(m, PJSUA_MAX_CONF_PORTS);
+    ADD_CONSTANT(m, PJSUA_DEFAULT_CLOCK_RATE);
+    ADD_CONSTANT(m, PJSUA_DEFAULT_CODEC_QUALITY);
+    ADD_CONSTANT(m, PJSUA_DEFAULT_ILBC_MODE);
+    ADD_CONSTANT(m, PJSUA_DEFAULT_EC_TAIL_LEN);
+    ADD_CONSTANT(m, PJSUA_MAX_CALLS);
+    ADD_CONSTANT(m, PJSUA_XFER_NO_REQUIRE_REPLACES);
+
+
+#undef ADD_CONSTANT
+}