Changeset 4464

Timestamp:

Apr 12, 2013 8:05:12 AM (12 years ago)

Author:

ming

Message:

Re #1655: pjsua app CLI for iOS

Location:

pjproject/trunk/pjsip-apps/src/pjsua

Files:

• ios (added)
• ios/ipjsua (added)
• ios/ipjsua.xcodeproj (added)
• ios/ipjsua.xcodeproj/project.pbxproj (added)
• ios/ipjsua/Default-568h@2x.png (added)
• ios/ipjsua/Default.png (added)
• ios/ipjsua/Default@2x.png (added)
• ios/ipjsua/en.lproj (added)
• ios/ipjsua/en.lproj/InfoPlist.strings (added)
• ios/ipjsua/en.lproj/ipjsuaViewController_iPad.xib (added)
• ios/ipjsua/en.lproj/ipjsuaViewController_iPhone.xib (added)
• ios/ipjsua/ipjsua-Info.plist (added)
• ios/ipjsua/ipjsua-Prefix.pch (added)
• ios/ipjsua/ipjsuaAppDelegate.h (added)
• ios/ipjsua/ipjsuaAppDelegate.m (added)
• ios/ipjsua/ipjsuaViewController.h (added)
• ios/ipjsua/ipjsuaViewController.m (added)
• ios/ipjsua/main.m (added)
• ios/ipjsua/pjsua.png (added)
• pjsua_app.c (modified) (4 diffs)

pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app.c

@@ -19 +19 @@
  */
 #include "pjsua_common.h"
-#include "gui.h"
+
+#define USE_GUI
 
 #define THIS_FILE       "pjsua_app.c"
@@ -79 +80 @@
  * Configuration manipulation
  */
-
-#if (defined(PJ_IPHONE_OS_HAS_MULTITASKING_SUPPORT) && \
-    PJ_IPHONE_OS_HAS_MULTITASKING_SUPPORT!=0) || \
-    defined(__IPHONE_4_0)
-void keepAliveFunction(int timeout)
-{
-    int i;
-    for (i=0; i<(int)pjsua_acc_get_count(); ++i) {
-        if (!pjsua_acc_is_valid(i))
-            continue;
-
-        if (app_config.acc_cfg[i].reg_timeout < timeout) {
-            pjsua_acc_get_config(i, &app_config.acc_cfg[i]);
-            app_config.acc_cfg[i].reg_timeout = timeout;
-            pjsua_acc_modify(i, &app_config.acc_cfg[i]);
-        } else {
-            pjsua_acc_set_registration(i, PJ_TRUE);
-        }
-    }
-}
-#endif
 
 /*****************************************************************************
@@ -2036 +2016 @@
 }
 
+pj_cli_telnet_on_started on_started_cb = &cli_telnet_started;
+pj_cli_on_quit on_quit_cb = &cli_on_quit;
+pj_cli_on_destroy on_destroy_cb = &cli_on_destroy;
+pj_cli_on_restart_pjsua on_restart_pjsua_cb = &cli_on_restart_pjsua;
+
 /** ======================= **/
 
@@ -2051 +2036 @@
     do {
         if (app_restart) {          
-            status = app_init(cli_telnet_started, cli_on_quit,
-                              cli_on_destroy, cli_on_restart_pjsua);
+            status = app_init(on_started_cb, on_quit_cb,
+                              on_destroy_cb, on_restart_pjsua_cb);
             if (status != PJ_SUCCESS)
                 return 1;