Changeset 4575 for pjproject/branches/projects/jni/pjsip-apps/src/jni/src/org/pjsip

Timestamp:

Jul 26, 2013 9:16:37 AM (11 years ago)

Author:

nanang

Message:

JNI projects:

• separate makefile for Android and desktop/development
• simplify build process for Android (upload pregenerated SWIG interface)
• removed main loop for Android sample app

Location:

pjproject/branches/projects/jni/pjsip-apps/src/jni/src/org/pjsip/hello

Files:

• MainActivity.java (modified) (1 diff)
• hello.java (modified) (9 diffs)

pjproject/branches/projects/jni/pjsip-apps/src/jni/src/org/pjsip/hello/MainActivity.java

@@ -12 +12 @@
                 setContentView(R.layout.activity_main);
                 
-                /* Call test app here
-                String [] args = {"sip:192.168.1.49"};
-                hello.main(args);
-                */
+                hello.init();
         }
 

pjproject/branches/projects/jni/pjsip-apps/src/jni/src/org/pjsip/hello/hello.java

@@ -11 +11 @@
 class app_config {
         public static int cur_call_id = -1;
+        public static int cur_acc_id = -1;
 }
 
@@ -83 +84 @@
                 return (app_config.cur_call_id > -1);
         }
-
-        public static void main(String[] args) {
+        
+        public static int init() {
                 int[] tp_id = new int[1];
                 int[] acc_id = new int[1];
-                int[] call_id = new int[1];
                 int status;
 
@@ -98 +98 @@
                         if (status != pjsua.PJ_SUCCESS) {
                                 System.out.println("Error creating pjsua: " + status);
-                                System.exit(status);
+                                return status;
                         }
                 }
@@ -115 +115 @@
                         status = pjsua.init(cfg, log_cfg, null);
                         if (status != pjsua.PJ_SUCCESS) {
-                                pj_error_exit("Error inintializing pjsua", status);
+                                System.out.println("Error initializing pjsua: " + status);
+                                return status;
                         }
                 }
@@ -126 +127 @@
                         status = pjsua.transport_create(pjsip_transport_type_e.PJSIP_TRANSPORT_UDP, cfg, tp_id);
                         if (status != pjsua.PJ_SUCCESS) {
-                                pj_error_exit("Error creating transport", status);
+                                System.out.println("Error creating transport: " + status);
+                                return status;
                         }
                 }
@@ -134 +136 @@
                         status = pjsua.acc_add_local(tp_id[0], true, acc_id);
                         if (status != pjsua.PJ_SUCCESS) {
-                                pj_error_exit("Error creating local UDP account", status);
-                        }
+                                System.out.println("Error creating local UDP account: " + status);
+                                return status;
+                        }
+                        app_config.cur_acc_id = acc_id[0]; 
                 }
                 
@@ -142 +146 @@
                         status = pjsua.start();
                         if (status != pjsua.PJ_SUCCESS) {
-                                pj_error_exit("Error starting pjsua", status);
-                        }
-                }
-                
-                /* Make call to the URL. */
-                if (false) {
-                        status = pjsua.call_make_call(acc_id[0], "sip:localhost:6000", null, 0, null, call_id);
-                        if (status != pjsua.PJ_SUCCESS) {
-                                pj_error_exit("Error making call", status);
-                        }
-                        app_config.cur_call_id = call_id[0];
+                                System.out.println("Error starting pjsua: " + status);
+                                return status;
+                        }
                 }
                 
@@ -165 +161 @@
 
                         pjsua.schedule_timer(timer, tv);
+                }
+                
+                return pjsua.PJ_SUCCESS;
+        }
+
+
+        public static void destroy() {
+                pjsua.destroy();
+        }
+        
+
+        public static void main(String[] args)
+        {
+                /* Init pjsua */
+                int status = init();
+                if (status != pjsua.PJ_SUCCESS) {
+                        pj_error_exit("Failed initializing pjsua", status);
+                }
+                
+                /* Make call to the URL. */
+                if (args.length > 1) {
+                        int[] call_id = new int[1];
+                        status = pjsua.call_make_call(app_config.cur_acc_id, args[1], null, 0, null, call_id);
+                        if (status != pjsua.PJ_SUCCESS) {
+                                pj_error_exit("Error making call", status);
+                        }
+                        app_config.cur_call_id = call_id[0];
                 }
                 
@@ -221 +244 @@
                         }
                 }
-
+                
                 /* Finally, destroy pjsua */
-                {
-                        pjsua.destroy();
-                }
-                
-        }
-}
+                destroy();
+
+        }
+}