Changeset 4696 for pjproject

Timestamp:

Dec 18, 2013 7:14:54 AM (11 years ago)

Author:

riza

Message:

Re #1716:Added java desktop sample application.

Location:

pjproject/branches/projects/pjsua2/pjsip-apps/src/swig/java

Files:

• Makefile (modified) (2 diffs)
• android/src/org/pjsip/pjsua2/app/MyApp.java (modified) (2 diffs)
• sample.java (added)

pjproject/branches/projects/pjsua2/pjsip-apps/src/swig/java/Makefile

@@ -80 +80 @@
 endif
 
+MY_APP_JAVA = android/src/$(subst .,/,$(MY_PACKAGE_NAME))/app/MyApp.java
+
 .PHONY: all java install uninstall
 
@@ -97 +99 @@
         rm -rf $(LIBPJSUA2_SO) $(OUT_DIR)/* $(MY_PACKAGE_PATH)/*.java $(MY_PACKAGE_PATH)/*.class
 
-java: $(MY_PACKAGE_PATH)/Error.class $(MY_PACKAGE_PATH)/test.class
+java: $(MY_PACKAGE_PATH)/Error.class $(MY_PACKAGE_PATH)/test.class $(MY_PACKAGE_PATH)/sample.class
 
 $(MY_PACKAGE_PATH)/Error.class: $(MY_PACKAGE_PATH)/Error.java
-        $(MY_JAVAC) -d $(OUT_DIR) $(MY_PACKAGE_PATH)/*.java
+        $(MY_JAVAC) -d $(OUT_DIR) $(MY_PACKAGE_PATH)/*.java $(MY_APP_JAVA)
 
 $(MY_PACKAGE_PATH)/test.class: test.java
         $(MY_JAVAC) -d $(OUT_DIR) -classpath "$(OUT_DIR)" test.java
+        
+$(MY_PACKAGE_PATH)/sample.class: sample.java
+        $(MY_JAVAC) -d $(OUT_DIR) -classpath "$(OUT_DIR)" sample.java
 
 test:
         @# Need to specify classpath and library path, alternatively, they can be set via
         @# CLASSPATH and java.library.path env settings
-        $(MY_JAVA) -cp "$(OUT_DIR);$(MY_PACKAGE_PATH)" -Djava.library.path="$(OUT_DIR)" test
+        $(MY_JAVA) -cp "$(OUT_DIR)" -Djava.library.path="$(OUT_DIR)" test
+        
+sample:
+        @# Need to specify classpath and library path, alternatively, they can be set via
+        @# CLASSPATH and java.library.path env settings
+        $(MY_JAVA) -cp "$(OUT_DIR)" -Djava.library.path="$(OUT_DIR)" org.pjsip.pjsua2.app.sample        
 
 install:

pjproject/branches/projects/pjsua2/pjsip-apps/src/swig/java/android/src/org/pjsip/pjsua2/app/MyApp.java

@@ -239 +239 @@
         
         public void init(MyAppObserver obs, String app_dir) {
+                init(obs, app_dir, false);
+        }
+        
+        public void init(MyAppObserver obs, String app_dir, boolean own_worker_thread) {
                 observer = obs;
                 appDir = app_dir;
@@ -274 +278 @@
                 UaConfig ua_cfg = epConfig.getUaConfig();
                 ua_cfg.setUserAgent("Pjsua2And" + ep.libVersion().getFull());
+                if (own_worker_thread) {
+                        ua_cfg.setThreadCnt(0);
+                        ua_cfg.setMainThreadOnly(true);
+                }
                 
                 /* Init endpoint */