Changeset 4491 for pjproject/trunk/pjsip-apps/src/pjsua/bb10

Timestamp:

Apr 23, 2013 8:31:30 AM (12 years ago)

Author:

bennylp

Message:

Re #1655, #1657: fixes due to latest pjsua framework changes

Location:

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

Files:

• PjsuaBB.pro (modified) (1 diff)
• src/applicationui.cpp (modified) (11 diffs)
• src/applicationui.h (modified) (1 diff)

pjproject/trunk/pjsip-apps/src/pjsua/bb10/PjsuaBB.pro

@@ -6 +6 @@
 
 SOURCES +=  ../../pjsua_app.c \
-            ../../pjsua_cli.c \
-            ../../pjsua_common.c \
-            ../../pjsua_config.c \
-            ../../pjsua_legacy.c
+            ../../pjsua_app_cli.c \
+            ../../pjsua_app_common.c \
+            ../../pjsua_app_config.c \
+            ../../pjsua_app_legacy.c
 
 device {

pjproject/trunk/pjsip-apps/src/pjsua/bb10/src/applicationui.cpp

@@ -41 +41 @@
 
 
-pj_bool_t ApplicationUI::pjsuaOnStoppedCb(pj_bool_t restart,
-                                          int argc, char** argv)
+void ApplicationUI::pjsuaOnStoppedCb(pj_bool_t restart,
+                                     int argc, char** argv)
 {
     PJ_LOG(3,("ipjsua", "CLI %s request", (restart? "restart" : "shutdown")));
@@ -57 +57 @@
         app->quit();
     }
-
-    return PJ_TRUE;
 }
 
@@ -66 +64 @@
     PJ_UNUSED_ARG(cfg);
 }
+
 
 void ApplicationUI::extRestartRequest(int argc, char **argv)
@@ -75 +74 @@
 }
 
+
 void ApplicationUI::pjsuaStart()
 {
@@ -80 +80 @@
     const char **argv = pjsua_app_def_argv;
     int argc = PJ_ARRAY_SIZE(pjsua_app_def_argv) -1;
-    app_cfg_t app_cfg;
+    pjsua_app_cfg_t app_cfg;
     pj_status_t status;
 
@@ -98 +98 @@
     app_cfg.on_config_init = &pjsuaOnAppConfigCb;
 
-    status = app_init(&app_cfg);
+    status = pjsua_app_init(&app_cfg);
     if (status != PJ_SUCCESS) {
         char errmsg[PJ_ERR_MSG_SIZE];
         pj_strerror(status, errmsg, sizeof(errmsg));
         displayMsg(QString("Init error:") + errmsg);
-        app_destroy();
+        pjsua_app_destroy();
         return;
     }
 
-    status = app_run(PJ_FALSE);
+    status = pjsua_app_run(PJ_FALSE);
     if (status != PJ_SUCCESS) {
         char errmsg[PJ_ERR_MSG_SIZE];
         pj_strerror(status, errmsg, sizeof(errmsg));
         displayMsg(QString("Error:") + errmsg);
-        app_destroy();
+        pjsua_app_destroy();
     }
 
@@ -121 +121 @@
 void ApplicationUI::pjsuaDestroy()
 {
-    app_destroy();
+    pjsua_app_destroy();
 }
+
 
 ApplicationUI::ApplicationUI(bb::cascades::Application *app)
@@ -139 +140 @@
 }
 
+
 ApplicationUI::~ApplicationUI()
 {
@@ -144 +146 @@
 }
 
+
 ApplicationUI* ApplicationUI::instance()
 {
     return instance_;
 }
+
 
 void ApplicationUI::aboutToQuit()
@@ -158 +162 @@
 }
 
+
 void ApplicationUI::displayMsg(const QString &msg)
 {
@@ -167 +172 @@
 }
 
+
 void ApplicationUI::restartPjsua()
 {

pjproject/trunk/pjsip-apps/src/pjsua/bb10/src/applicationui.h

@@ -46 +46 @@
 
     /* pjsua app callbacks */
-    static void         pjsuaOnStartedCb(pj_status_t status, const char* msg);
-    static pj_bool_t    pjsuaOnStoppedCb(pj_bool_t restart, int argc, char** argv);
-    static void         pjsuaOnAppConfigCb(pjsua_app_config *cfg);
+    static void pjsuaOnStartedCb(pj_status_t status, const char* msg);
+    static void pjsuaOnStoppedCb(pj_bool_t restart, int argc, char** argv);
+    static void pjsuaOnAppConfigCb(pjsua_app_config *cfg);
 };