Changeset 4639 for pjproject/branches/projects/pjsua2/pjsip/include/pjsua2/types.hpp

Timestamp:

Nov 1, 2013 7:11:48 AM (10 years ago)

Author:

bennylp

Message:

Re #1519: Major change in pjsua2.i and etc after actual test in Python:

• Major changes in SWIG interface file (pjsua2.i).
  • The "ignore" and "unignore" approach caused link error with vector (duplicate symbols because SWIG generates two identical vector functions in the wrapper) so it cannot be used (tried with many combinations and still doesn't work).
  • So scrap that, and now we use "importing" approach, where needed symbols must be listed in symbols.lst file, then use importsym.py to import the symbol declarations to symbols.i. Then include symbols.i in pjsua.i
  • Due to the way importsym.py work, some macros and naked constants need to be placed into a named enumeration, for example:
    • #define PJ_SUCCESS 0 ==> enum pj_constants_ { PJ_SUCCESS=0 }; [types.h]
    • enum { PJMEDIA_VID_DEFAULT_CAPTURE_DEV = -1 } ==> enum pjmedia_vid_dev_std_index { PJMEDIA_VID_DEFAULT_CAPTURE_DEV = -1 }; [videodev.h]
  • Makefile was changed so that symbols.i would be generated if symbols.lst has changed
• Added "make install" and "make uninstall" targets for swig. Only implemented on Python. This will install to user's lib dir so doesn't need sudo.
• Deleted approachX.hpp files
• Added libVersion() method to Endpoint along with Version struct.
• Fix pjsua2.i to make exception (or redirection?) works in Python
• Add polling and worker thread related API:
  • PJSUA-LIB: pjsua_register_worker_thread(), pjsua_stop_worker_threads()
  • Endpoint: libRegisterWorkerThread(), libStopWorkerThreads(), libHandleEvents();

File:

• pjproject/branches/projects/pjsua2/pjsip/include/pjsua2/types.hpp (modified) (6 diffs)

pjproject/branches/projects/pjsua2/pjsip/include/pjsua2/types.hpp

@@ -71 +71 @@
 
 /*
- * Forward declaration of Account, AccountConfig, to be used
+ * Forward declaration of Account to be used
  * by Endpoint.
  */
 class Account;
-class AccountConfig;
 
 
@@ -143 +142 @@
 
 #   define PJSUA2_RAISE_ERROR3(status,op,txt)   \
-        throw Error(status, op, txt, __FILE__, __LINE__)
+        do { \
+            Error err_ = Error(status, op, txt, __FILE__, __LINE__); \
+            PJ_LOG(1,(THIS_FILE, "%s", err_.info().c_str())); \
+            throw err_; \
+        } while (0)
 
 #else
@@ -153 +156 @@
 
 #   define PJSUA2_RAISE_ERROR3(status,op,txt)   \
-        throw Error(status, op, txt, string(), 0)
+        do { \
+            Error err_ = Error(status, op, txt, string(), 0); \
+            PJ_LOG(1,(THIS_FILE, "%s", err_.info().c_str())); \
+            throw err_; \
+        } while (0)
 
 #endif
@@ -159 +166 @@
 #define PJSUA2_CHECK_RAISE_ERROR2(status, op)   \
         do { \
-            if (status != PJ_SUCCESS) \
+            if (status != PJ_SUCCESS) { \
                 PJSUA2_RAISE_ERROR2(status, op); \
+            } \
         } while (0)
 
@@ -171 +179 @@
             PJSUA2_CHECK_RAISE_ERROR2(the_status, #expr); \
         } while (0)
+
+//////////////////////////////////////////////////////////////////////////////
+
+struct Version
+{
+    /** Major number */
+    int         major;
+
+    /** Minor number */
+    int         minor;
+
+    /** Additional revision number */
+    int         rev;
+
+    /** Version suffix (e.g. "-svn") */
+    string      suffix;
+
+    /** The full version info (e.g. "2.1.0-svn") */
+    string      full;
+
+    /**
+     * PJLIB version number as three bytes with the following format:
+     * 0xMMIIRR00, where MM: major number, II: minor number, RR: revision
+     * number, 00: always zero for now.
+     */
+    unsigned    numeric;
+};
 
 //////////////////////////////////////////////////////////////////////////////
@@ -232 +267 @@
                  const int data_type,
                  const string data);
-};
-
-/** Array of SIP credentials */
-typedef std::vector<AuthCredInfo> AuthCredInfoVector;
+
+};
+
 
 //////////////////////////////////////////////////////////////////////////////