Changeset 5899 for pjproject/trunk/pjsip-apps/src/samples/pjsua2_demo.cpp

Timestamp:

Oct 17, 2018 4:38:39 AM (6 years ago)

Author:

nanang

Message:

Close #2158:

• Added OnCallTransferRequestParam?.newCall to allow application to instantiate a new Call for the new outgoing call in transfer scenario.
• Also added OnCallReplacedParam?.newCall mainly for informational purpose (that app should instantiate new Call for replace scenario).

File:

• pjproject/trunk/pjsip-apps/src/samples/pjsua2_demo.cpp (modified) (5 diffs)

pjproject/trunk/pjsip-apps/src/samples/pjsua2_demo.cpp

@@ -40 +40 @@
     
     virtual void onCallState(OnCallStateParam &prm);
+    virtual void onCallTransferRequest(OnCallTransferRequestParam &prm);
+    virtual void onCallReplaced(OnCallReplacedParam &prm);
 };
 
@@ -55 +57 @@
         std::cout << "*** Account is being deleted: No of calls="
                   << calls.size() << std::endl;
+
+        for (std::vector<Call *>::iterator it = calls.begin();
+             it != calls.end(); )
+        {
+            delete (*it);
+            it = calls.erase(it);
+        }
     }
     
@@ -100 +109 @@
     
     if (ci.state == PJSIP_INV_STATE_DISCONNECTED) {
-        myAcc->removeCall(this);
+        //myAcc->removeCall(this);
         /* Delete the call */
-        delete this;
-    }
-}
+        //delete this;
+    }
+}
+
+void MyCall::onCallTransferRequest(OnCallTransferRequestParam &prm)
+{
+    /* Create new Call for call transfer */
+    prm.newCall = new MyCall(*myAcc);
+}
+
+void MyCall::onCallReplaced(OnCallReplacedParam &prm)
+{
+    /* Create new Call for call replace */
+    prm.newCall = new MyCall(*myAcc, prm.newCallId);
+}
+
 
 static void mainProg1(Endpoint &ep) throw(Error)
@@ -148 +170 @@
     // Destroy library
     std::cout << "*** PJSUA2 SHUTTING DOWN ***" << std::endl;
-    delete call;
-    delete acc;
+    delete acc; /* Will delete all calls too */
 }
 
@@ -347 +368 @@
         ep.libCreate();
 
-        mainProg3(ep);
+        mainProg1(ep);
         ret = PJ_SUCCESS;
     } catch (Error & err) {