Changeset 4489

Timestamp:

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

Author:

riza

Message:

Re #1643: Modification to avoid namespace conflict with pjsua

Location:

pjproject/trunk/pjsip-apps

Files:

• build/Makefile (modified) (1 diff)
• build/pjsua.vcproj (modified) (2 diffs)
• src/pjsua/main.c (modified) (6 diffs)
• src/pjsua/pjsua_app.c (modified) (8 diffs)
• src/pjsua/pjsua_app.h (modified) (6 diffs)
• src/pjsua/pjsua_app_cli.c (added)
• src/pjsua/pjsua_app_common.c (added)
• src/pjsua/pjsua_app_common.h (added)
• src/pjsua/pjsua_app_config.c (added)
• src/pjsua/pjsua_app_legacy.c (added)
• src/pjsua/pjsua_cli.c (deleted)
• src/pjsua/pjsua_common.c (deleted)
• src/pjsua/pjsua_common.h (deleted)
• src/pjsua/pjsua_config.c (deleted)
• src/pjsua/pjsua_legacy.c (deleted)

pjproject/trunk/pjsip-apps/build/Makefile

@@ -34 +34 @@
 export PJSUA_SRCDIR = ../src/pjsua
 export PJSUA_OBJS += $(OS_OBJS) $(M_OBJS) $(CC_OBJS) $(HOST_OBJS) \
-            main.o pjsua_app.o pjsua_cli.o pjsua_common.o \
-            pjsua_config.o pjsua_legacy.o
+            main.o pjsua_app.o pjsua_app_cli.o pjsua_app_common.o \
+            pjsua_app_config.o pjsua_app_legacy.o
 export PJSUA_CFLAGS += $(_CFLAGS)
 export PJSUA_LDFLAGS += $(APP_LDFLAGS) $(APP_LDLIBS) $(LDFLAGS)

pjproject/trunk/pjsip-apps/build/pjsua.vcproj

@@ -3709 +3709 @@
                         </File>
                         <File
-                                RelativePath="..\src\pjsua\pjsua_cli.c"
+                                RelativePath="..\src\pjsua\pjsua_app_cli.c"
                                 >
                         </File>
                         <File
-                                RelativePath="..\src\pjsua\pjsua_common.c"
+                                RelativePath="..\src\pjsua\pjsua_app_common.c"
                                 >
                         </File>
                         <File
-                                RelativePath="..\src\pjsua\pjsua_config.c"
+                                RelativePath="..\src\pjsua\pjsua_app_config.c"
                                 >
                         </File>
                         <File
-                                RelativePath="..\src\pjsua\pjsua_legacy.c"
+                                RelativePath="..\src\pjsua\pjsua_app_legacy.c"
                                 >
                         </File>
@@ -3734 +3734 @@
                         </File>
                         <File
-                                RelativePath="..\src\pjsua\pjsua_common.h"
+                                RelativePath="..\src\pjsua\pjsua_app_common.h"
                                 >
                         </File>

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);

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

@@ -47 +47 @@
 #endif
 
-pj_status_t app_destroy(void);
-
 static void ringback_start(pjsua_call_id call_id);
 static void ring_start(pjsua_call_id call_id);
 static void ring_stop(pjsua_call_id call_id);
-static pj_status_t pjsua_app_init();
-static pj_status_t pjsua_app_destroy();
-
-static app_cfg_t app_cfg;
+static pj_status_t app_init();
+static pj_status_t app_destroy();
+
+static pjsua_app_cfg_t app_cfg;
 pj_str_t                    uri_arg;
 pj_bool_t                   app_running = PJ_FALSE;
@@ -1217 +1215 @@
 
 /* Called on CLI (re)started, e.g: initial start, after iOS bg */
-PJ_DEF(void) cli_on_started(pj_status_t status)
+void cli_on_started(pj_status_t status)
 {
     /* Notify app */
@@ -1236 +1234 @@
 
 /* Called on CLI quit */
-PJ_DEF(pj_bool_t) cli_on_stopped(pj_bool_t restart, int argc, char* argv[])
+void cli_on_stopped(pj_bool_t restart, int argc, char* argv[])
 {
     /* Notify app */
     if (app_cfg.on_stopped)
-        return (*app_cfg.on_stopped)(restart, argc, argv);
-
-    return PJ_SUCCESS;
+        (*app_cfg.on_stopped)(restart, argc, argv);
 }
 
 
 /* Called on pjsua legacy quit */
-PJ_DEF(pj_bool_t) legacy_on_stopped(pj_bool_t restart)
+void legacy_on_stopped(pj_bool_t restart)
 {
     /* Notify app */
     if (app_cfg.on_stopped)
-        return (*app_cfg.on_stopped)(restart, 0, NULL);
-
-    return PJ_SUCCESS;
-}
-
-
+        (*app_cfg.on_stopped)(restart, 1, NULL);
+}
 
 /*****************************************************************************
@@ -1283 +1275 @@
 }
 
-static pj_status_t pjsua_app_init()
+static pj_status_t app_init()
 {
     pjsua_transport_id transport_id = -1;
@@ -1845 +1837 @@
 }
 
-PJ_DEF(pj_status_t) app_init(const app_cfg_t *cfg)
+pj_status_t pjsua_app_init(const pjsua_app_cfg_t *cfg)
 {
     pj_status_t status;
     pj_memcpy(&app_cfg, cfg, sizeof(app_cfg));
 
-    status = pjsua_app_init();
+    status = app_init();
     if (status != PJ_SUCCESS)
         return status;
@@ -1861 +1853 @@
 }
 
-pj_status_t app_run(pj_bool_t wait_telnet_cli)
+pj_status_t pjsua_app_run(pj_bool_t wait_telnet_cli)
 {
     pj_thread_t *stdout_refresh_thread = NULL;
@@ -1917 +1909 @@
 }
 
-static pj_status_t pjsua_app_destroy()
+static pj_status_t app_destroy()
 {
     pj_status_t status = PJ_SUCCESS;
@@ -1982 +1974 @@
 }
 
-pj_status_t app_destroy()
+pj_status_t pjsua_app_destroy()
 {
     pj_status_t status;
 
-    status = pjsua_app_destroy();
+    status = app_destroy();
 
     if (app_config.use_cli) {   

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

@@ -25 +25 @@
  */
 
-#include "pjsua_common.h"
+#include "pjsua_app_common.h"
 
 PJ_BEGIN_DECL
@@ -32 +32 @@
  * This structure contains the configuration of application.
  */
-typedef struct app_cfg_t
+typedef struct pjsua_app_cfg_t
 {
     /**
@@ -56 +56 @@
      * cleanup procedure.
      */
-    pj_bool_t (*on_stopped)(pj_bool_t restart, int argc, char** argv);
+    void (*on_stopped)(pj_bool_t restart, int argc, char** argv);
 
     /**
@@ -63 +63 @@
      */
     void (*on_config_init)(pjsua_app_config *cfg);
-} app_cfg_t;
+} pjsua_app_cfg_t;
 
 /**
@@ -69 +69 @@
  * the provided configuration.
  */
-PJ_DECL(pj_status_t) app_init(const app_cfg_t *app_cfg);
+pj_status_t pjsua_app_init(const pjsua_app_cfg_t *app_cfg);
 
 /**
@@ -77 +77 @@
  * should define this param as PJ_FALSE.
  */
-PJ_DECL(pj_status_t) app_run(pj_bool_t wait_telnet_cli);
+pj_status_t pjsua_app_run(pj_bool_t wait_telnet_cli);
 
 /**
  * This will destroy/cleanup the application library.
  */
-PJ_DECL(pj_status_t) app_destroy();
+pj_status_t pjsua_app_destroy();
 
 PJ_END_DECL