Changeset 4489 for pjproject/trunk/pjsip-apps/src/pjsua/main.c

Timestamp:

Apr 23, 2013 7:53:25 AM (11 years ago)

Author:

riza

Message:

Re #1643: Modification to avoid namespace conflict with pjsua

File:

• pjproject/trunk/pjsip-apps/src/pjsua/main.c (modified) (6 diffs)

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

@@ -25 +25 @@
 static pj_status_t          receive_end_sig;
 static pj_thread_t          *sig_thread;
-static app_cfg_t            cfg;
+static pjsua_app_cfg_t      cfg;
 
 /* Called when CLI (re)started */
@@ -33 +33 @@
 }
 
-pj_bool_t on_app_stopped(pj_bool_t restart, int argc, char** argv)
+void on_app_stopped(pj_bool_t restart, int argc, char** argv)
 {
     cfg.argc = argc;
@@ -39 +39 @@
 
     running = restart;
-    return PJ_TRUE;
 }
 
@@ -61 +60 @@
             PJ_LOG(3,(THIS_FILE, "Ctrl-C detected, quitting.."));
             receive_end_sig = PJ_TRUE;
-            app_destroy();          
+            pjsua_app_destroy();            
             ExitProcess(1);
             PJ_UNREACHED(return TRUE;)
@@ -105 +104 @@
 
     while (running) {        
-        status = app_init(&cfg);
+        status = pjsua_app_init(&cfg);
         if (status == PJ_SUCCESS) {
-            status = app_run(PJ_TRUE);
+            status = pjsua_app_run(PJ_TRUE);
         } else {
             pj_perror(3, THIS_FILE, status, "Failed init");
@@ -114 +113 @@
 
         if (!receive_end_sig) {
-            app_destroy();
+            pjsua_app_destroy();
 
             /* This is on purpose */
-            app_destroy();
+            pjsua_app_destroy();
         } else {
             pj_thread_join(sig_thread);