Changeset 4492 for pjproject/trunk/pjsip-apps/src/pjsua/symbian

Timestamp:

Apr 23, 2013 10:59:52 AM (11 years ago)

Author:

nanang

Message:

Re #1655: Fixes on WM and Symbian due to latest pjsua framework changes.

Location:

pjproject/trunk/pjsip-apps/src/pjsua/symbian

Files:

• group/pjsua.mmp (modified) (1 diff)
• src/pjsuaAppUi.cpp (modified) (9 diffs)

pjproject/trunk/pjsip-apps/src/pjsua/symbian/group/pjsua.mmp

@@ -102 +102 @@
 SOURCEPATH              ..\..
 
-SOURCE                  pjsua_cli.c pjsua_legacy.c
-SOURCE                  pjsua_app.c pjsua_common.c pjsua_config.c
+SOURCE                  pjsua_app_cli.c pjsua_app_legacy.c
+SOURCE                  pjsua_app.c pjsua_app_common.c pjsua_app_config.c

pjproject/trunk/pjsip-apps/src/pjsua/symbian/src/pjsuaAppUi.cpp

@@ -24 +24 @@
 
 #include "../../pjsua_app.h"
+#include "../../pjsua_app_config.h"
 
 /* Global vars */
 static CpjsuaAppUi *appui = NULL;
 static pj_ioqueue_t *app_ioqueue = NULL;
-static int restart_argc = 0;
-static char **restart_argv = NULL;
+static int start_argc = 0;
+static char **start_argv = NULL;
+
+static pj_status_t InitSymbSocket();
+static void DestroySymbSocket();
 
 /* Helper funtions to init/restart/destroy the pjsua */
-static void LibInitL();
-static void LibDestroyL();
-static void LibRestartL();
+static void PjsuaInitL();
+static void PjsuaDestroyL();
 
 /* pjsua app callbacks */
-static void lib_on_started(pj_status_t status, const char* title);
-static pj_bool_t lib_on_stopped(pj_bool_t restart, int argc, char** argv);
-static void lib_on_config_init(pjsua_app_config *cfg);
+static void PjsuaOnStarted(pj_status_t status, const char* title);
+static void PjsuaOnStopped(pj_bool_t restart, int argc, char** argv);
+static void PjsuaOnConfig(pjsua_app_config *cfg);
 
 /* Helper class to schedule function execution */
@@ -209 +212 @@
         Cba()->MakeVisible(EFalse);
 
-        // Schedule Lib Init
-        MyTimer::NewL(100, &LibInitL);
+        if (InitSymbSocket() != PJ_SUCCESS) {
+            PutMsg("Failed to initialize Symbian network param.");
+        } else {        
+            start_argc = pjsua_app_def_argc;
+            start_argv = (char**)pjsua_app_def_argv;
+
+            // Schedule Lib Init
+            MyTimer::NewL(100, &PjsuaInitL);
+        }
+        
         }
 
@@ -216 +227 @@
 void CpjsuaAppUi::PrepareToExit()
 {
-    TRAPD(result, LibDestroyL());
+    TRAPD(result, PjsuaDestroyL());
+    DestroySymbSocket();
+    CloseSTDLIB();
     CAknViewAppUi::PrepareToExit();
 }
@@ -232 +245 @@
 
 /* Called when pjsua is started */
-void lib_on_started(pj_status_t status, const char* title)
-{
+void PjsuaOnStarted(pj_status_t status, const char* title)
+{
+    char err_msg[128];
+
+    if (status != PJ_SUCCESS || title == NULL) {
+        char err_str[PJ_ERR_MSG_SIZE];
+        pj_strerror(status, err_str, sizeof(err_str));
+        pj_ansi_snprintf(err_msg, sizeof(err_msg), "%s: %s",
+                         (title?title:"App start error"), err_str);
+        title = err_msg;
+    }
+
     appui->PutMsg(title);
 }
 
 /* Called when pjsua is stopped */
-pj_bool_t lib_on_stopped(pj_bool_t restart, int argc, char** argv)
+void PjsuaOnStopped(pj_bool_t restart, int argc, char** argv)
 {
     if (restart) {
-        restart_argc = argc;
-        restart_argv = argv;
+        start_argc = argc;
+        start_argv = argv;
 
         // Schedule Lib Init
-        MyTimer::NewL(100, &LibRestartL);
+        MyTimer::NewL(100, &PjsuaInitL);
     } else {
         /* Destroy & quit GUI, e.g: clean up window, resources  */
         appui->Exit();
     }
-
-    return PJ_FALSE;
 }
 
@@ -257 +278 @@
  * We need to override some settings here.
  */
-void lib_on_config_init(pjsua_app_config *cfg)
+void PjsuaOnConfig(pjsua_app_config *cfg)
 {
     /* Disable threading */
@@ -272 +293 @@
 }
 
-void LibInitL()
+// Set Symbian OS parameters in pjlib.
+// This must be done before pj_init() is called.
+pj_status_t InitSymbSocket()
 {
     pj_symbianos_params sym_params;
-    char* argv[] = {
-        "",
-        "--use-cli",
-        "--cli-telnet-port=0",
-        "--no-cli-console"
-    };
-    app_cfg_t app_cfg;
-    pj_status_t status;
     TInt err;
-
+    
     // Initialize RSocketServ
     if ((err=aSocketServer.Connect(32)) != KErrNone) {
-        status = PJ_STATUS_FROM_OS(err);
-        goto on_return;
+        return PJ_STATUS_FROM_OS(err);
     }
     
@@ -294 +308 @@
     if ((err=aConn.Open(aSocketServer)) != KErrNone) {
         aSocketServer.Close();
-        status = PJ_STATUS_FROM_OS(err);
-        goto on_return;
+        return PJ_STATUS_FROM_OS(err);
     }
     if ((err=aConn.Start()) != KErrNone) {
         aConn.Close();
-        aSocketServer.Close();
-        status = PJ_STATUS_FROM_OS(err);
-        goto on_return;
-    }
-    
-    // Set Symbian OS parameters in pjlib.
-    // This must be done before pj_init() is called.
+        aSocketServer.Close();
+        return PJ_STATUS_FROM_OS(err);
+    }
+    
     pj_bzero(&sym_params, sizeof(sym_params));
     sym_params.rsocketserv = &aSocketServer;
     sym_params.rconnection = &aConn;
     pj_symbianos_set_params(&sym_params);
-
+    
+    return PJ_SUCCESS;
+}
+
+
+void DestroySymbSocket()
+{
+    aConn.Close();
+    aSocketServer.Close();
+}
+
+
+void PjsuaInitL()
+{
+    pjsua_app_cfg_t app_cfg;
+    pj_status_t status;
+    
+    PjsuaDestroyL();
+    
     pj_bzero(&app_cfg, sizeof(app_cfg));
-    app_cfg.argc = PJ_ARRAY_SIZE(argv);
-    app_cfg.argv = argv;
-    app_cfg.on_started = &lib_on_started;
-    app_cfg.on_stopped = &lib_on_stopped;
-    app_cfg.on_config_init = &lib_on_config_init;
+    app_cfg.argc = start_argc;
+    app_cfg.argv = start_argv;
+    app_cfg.on_started = &PjsuaOnStarted;
+    app_cfg.on_stopped = &PjsuaOnStopped;
+    app_cfg.on_config_init = &PjsuaOnConfig;
 
     appui->PutMsg("Initializing..");
-    status = app_init(&app_cfg);
+    status = pjsua_app_init(&app_cfg);
     if (status != PJ_SUCCESS)
         goto on_return;
     
     appui->PutMsg("Starting..");
-    status = app_run(PJ_FALSE);
+    status = pjsua_app_run(PJ_FALSE);
     if (status != PJ_SUCCESS)
         goto on_return;
@@ -333 +361 @@
 }
 
-void LibDestroyL()
+void PjsuaDestroyL()
 {
     if (app_ioqueue) {
@@ -339 +367 @@
         app_ioqueue = NULL;
     }
-    app_destroy();
-    CloseSTDLIB();
-}
-
-void LibRestartL()
-{
-    app_cfg_t app_cfg;
-    pj_status_t status;
-    
-    /* Destroy pjsua app first */
-
-    if (app_ioqueue) {
-        pj_ioqueue_destroy(app_ioqueue);
-        app_ioqueue = NULL;
-    }
-    app_destroy();
-
-    /* Reinit pjsua app */
-    
-    pj_bzero(&app_cfg, sizeof(app_cfg));
-    app_cfg.argc = restart_argc;
-    app_cfg.argv = restart_argv;
-    app_cfg.on_started = &lib_on_started;
-    app_cfg.on_stopped = &lib_on_stopped;
-    app_cfg.on_config_init = &lib_on_config_init;
-
-    status = app_init(&app_cfg);
-    if (status != PJ_SUCCESS) {
-        appui->PutMsg("app_init() failed");
-        return;
-    }
-        
-    /* Run pjsua app */
-
-    status = app_run(PJ_FALSE);
-    if (status != PJ_SUCCESS) {
-        appui->PutMsg("app_run() failed");
-        return;
-    }
-}
+    pjsua_app_destroy();
+}