Changeset 6075

Timestamp:

Sep 24, 2019 11:12:45 AM (5 years ago)

Author:

nanang

Message:

Close #2233: Changed enumeration approach in SWIG Java to type-unsafe enums.

Location:

pjproject/trunk/pjsip-apps/src/swig

Files:

• importsym.py (modified) (1 diff)
• java/android/app/src/main/java/org/pjsip/pjsua2/app/CallActivity.java (modified) (3 diffs)
• java/android/app/src/main/java/org/pjsip/pjsua2/app/MainActivity.java (modified) (2 diffs)
• java/android/app/src/main/java/org/pjsip/pjsua2/app/MyApp.java (modified) (2 diffs)
• java/sample.java (modified) (1 diff)
• pjsua2.i (modified) (1 diff)
• symbols.i (modified) (3 diffs)

pjproject/trunk/pjsip-apps/src/swig/importsym.py

@@ -56 +56 @@
 # Hardcoded!
 if sys.platform == 'win32':
-        PYCPARSER_DIR="C:/devs/tools/pycparser"
+        PYCPARSER_DIR="D:/work/tool/pycparser-master"
 elif sys.platform == "linux2":
         PYCPARSER_DIR="/home/bennylp/Desktop/opt/src/pycparser-master"

pjproject/trunk/pjsip-apps/src/swig/java/android/app/src/main/java/org/pjsip/pjsua2/app/CallActivity.java

@@ -143 +143 @@
         Display display;
         int rotation;
-        pjmedia_orient orient;
+        int orient;
 
         wm = (WindowManager)this.getSystemService(Context.WINDOW_SERVICE);
@@ -340 +340 @@
         }
 
-        if (ci.getState().swigValue() <
-            pjsip_inv_state.PJSIP_INV_STATE_CONFIRMED.swigValue())
+        if (ci.getState() <
+            pjsip_inv_state.PJSIP_INV_STATE_CONFIRMED)
         {
             if (ci.getRole() == pjsip_role_e.PJSIP_ROLE_UAS) {
@@ -351 +351 @@
             }
         }
-        else if (ci.getState().swigValue() >=
-                 pjsip_inv_state.PJSIP_INV_STATE_CONFIRMED.swigValue())
+        else if (ci.getState() >=
+                 pjsip_inv_state.PJSIP_INV_STATE_CONFIRMED)
         {
             buttonAccept.setVisibility(View.GONE);

pjproject/trunk/pjsip-apps/src/swig/java/android/app/src/main/java/org/pjsip/pjsua2/app/MainActivity.java

@@ -583 +583 @@
     }
 
-    public void notifyRegState(pjsip_status_code code, String reason,
+    public void notifyRegState(int code, String reason,
                                long expiration)
     {
@@ -592 +592 @@
             msg_str += "Registration";
 
-        if (code.swigValue()/100 == 2)
+        if (code/100 == 2)
             msg_str += " successful";
         else

pjproject/trunk/pjsip-apps/src/swig/java/android/app/src/main/java/org/pjsip/pjsua2/app/MyApp.java

@@ -28 +28 @@
 interface MyAppObserver
 {
-    abstract void notifyRegState(pjsip_status_code code, String reason,
-                                 long expiration);
+    abstract void notifyRegState(int code, String reason, long expiration);
     abstract void notifyIncomingCall(MyCall call);
     abstract void notifyCallState(MyCall call);
@@ -352 +351 @@
         log_cfg.setWriter(logWriter);
         log_cfg.setDecor(log_cfg.getDecor() & 
-                         ~(pj_log_decoration.PJ_LOG_HAS_CR.swigValue() | 
-                         pj_log_decoration.PJ_LOG_HAS_NEWLINE.swigValue()));
+                         ~(pj_log_decoration.PJ_LOG_HAS_CR | 
+                         pj_log_decoration.PJ_LOG_HAS_NEWLINE));
 
         /* Write log to file (just uncomment whenever needed) */

pjproject/trunk/pjsip-apps/src/swig/java/sample.java

@@ -38 +38 @@
         
         @Override
-        public void notifyRegState(pjsip_status_code code, String reason, long expiration) {}
+        public void notifyRegState(int code, String reason, long expiration) {}
         
         @Override

pjproject/trunk/pjsip-apps/src/swig/pjsua2.i

@@ -68 +68 @@
 
 // Constants from PJSIP libraries
+
+#ifdef SWIGJAVA
+%include "enumtypeunsafe.swg"
+%javaconst(1);
+#endif
+
 %include "symbols.i"
 

pjproject/trunk/pjsip-apps/src/swig/symbols.i

@@ -201 +201 @@
   PJ_TURN_TP_UDP = 17,
   PJ_TURN_TP_TCP = 6,
-  PJ_TURN_TP_TLS = 255
+  PJ_TURN_TP_TLS = 56
 } pj_turn_tp_type;
 
@@ -234 +234 @@
   PJMEDIA_EVENT_ORIENT_CHANGED = ((('T' << 24) | ('N' << 16)) | ('R' << 8)) | 'O',
   PJMEDIA_EVENT_RX_RTCP_FB = ((('B' << 24) | ('F' << 16)) | ('T' << 8)) | 'R',
-  PJMEDIA_EVENT_AUD_DEV_ERROR = ((('R' << 24) | ('R' << 16)) | ('E' << 8)) | 'A'
+  PJMEDIA_EVENT_AUD_DEV_ERROR = ((('R' << 24) | ('R' << 16)) | ('E' << 8)) | 'A',
+  PJMEDIA_EVENT_VID_DEV_ERROR = ((('R' << 24) | ('R' << 16)) | ('E' << 8)) | 'V',
+  PJMEDIA_EVENT_MEDIA_TP_ERR = ((('R' << 24) | ('R' << 16)) | ('E' << 8)) | 'T'
 } pjmedia_event_type;
 
@@ -827 +829 @@
 typedef enum pjsua_snd_dev_id
 {
-  PJSUA_SND_DEFAULT_CAPTURE_DEV = PJMEDIA_AUD_DEFAULT_CAPTURE_DEV,
-  PJSUA_SND_DEFAULT_PLAYBACK_DEV = PJMEDIA_AUD_DEFAULT_PLAYBACK_DEV,
-  PJSUA_SND_NO_DEV = PJMEDIA_AUD_INVALID_DEV,
+  PJSUA_SND_DEFAULT_CAPTURE_DEV = -1,
+  PJSUA_SND_DEFAULT_PLAYBACK_DEV = -2,
+  PJSUA_SND_NO_DEV = -3,
   PJSUA_SND_NULL_DEV = -99
 } pjsua_snd_dev_id;