Changeset 4638 for pjproject/branches/projects/pjsua2/pjsip-apps/src/samples/pjsua2_demo.cpp

Timestamp:

Oct 25, 2013 10:34:38 AM (10 years ago)

Author:

bennylp

Message:

Re #1519: Implementation of Account API, with inheritance approach:

• With small demo app (samples/pjsua2_demo.cpp)
• Endpoint changed to use inheritance approach too
• Simple account registration demo and callback works
• Further tests will be done in high level app (Python GUI?)
• Temporary build setting fixes (Makefile) to allow linking with pjsua2 and libstdc++
• Temporary hacks in Makefile to ignore other build targets to speed up build. This should be fixed during integration.

Issues:

• incomplete Endpoint::on_incoming_subscribe() implementation. There is no Account::presNotify() yet.
• incomplete Endpoint::on_pager2(), on_pager_status2(), to handle call's pager rather than account's pager
• some SWIGTYPE (unknown type by Swig) still unresolved

File:

• pjproject/branches/projects/pjsua2/pjsip-apps/src/samples/pjsua2_demo.cpp (modified) (6 diffs)

pjproject/branches/projects/pjsua2/pjsip-apps/src/samples/pjsua2_demo.cpp

@@ -23 +23 @@
 using namespace pj;
 
-class MyAccountCallback : public AccountCallback
+class MyAccount : public Account
 {
 public:
-    MyAccountCallback()
-    : AccountCallback()
+    MyAccount()
     {}
 
     virtual void onRegState(OnRegStateParam &prm)
     {
-        AccountInfo ai = account()->getInfo();
+        AccountInfo ai = getInfo();
         std::cout << (ai.regIsActive? "*** Register: code=" : "*** Unregister: code=")
                   << prm.code << std::endl;
@@ -40 +39 @@
 static void mainProg() throw(Error)
 {
-    Endpoint & ep = Endpoint::instance();
+    Endpoint ep;
 
     // Create library
@@ -46 +45 @@
 
     // Init library
-    ep.libInit( EpConfig() );
+    EpConfig ep_cfg;
+    ep_cfg.logConfig.level = 4;
+    ep.libInit( ep_cfg );
 
     // Transport
@@ -63 +64 @@
     acc_cfg.sipConfig.authCreds.push_back( AuthCredInfo("digest", "*",
                                                         "test1", 0, "test1") );
-    std::auto_ptr<Account> acc(new Account(new MyAccountCallback, NULL));
+    std::auto_ptr<Account> acc(new MyAccount);
     acc->create(acc_cfg);
 
@@ -70 +71 @@
     // Destroy library
     std::cout << "*** PJSUA2 SHUTTING DOWN ***" << std::endl;
-    ep.libDestroy();
 }
 
@@ -84 +84 @@
     }
 
-    Endpoint::instance().libDestroy();
-
     return ret;
 }