diff options
author | Nanang Izzuddin <nanang@teluu.com> | 2014-01-21 10:59:25 +0000 |
---|---|---|
committer | Nanang Izzuddin <nanang@teluu.com> | 2014-01-21 10:59:25 +0000 |
commit | 8c5296fba455adc138bce1d8c643659db575c7b1 (patch) | |
tree | 09c96130d5afa86746f4582f69e873b510ecfdc3 /pjsip-apps/src | |
parent | 0703ebd85dd35f119bc5ca2554b1e98da1ab1dad (diff) |
Re #1519 [into SVN trunk]: AudioMedia objects must not be destroyed before unregistered from conf bridge.
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@4708 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjsip-apps/src')
-rw-r--r-- | pjsip-apps/src/samples/pjsua2_demo.cpp | 41 |
1 files changed, 37 insertions, 4 deletions
diff --git a/pjsip-apps/src/samples/pjsua2_demo.cpp b/pjsip-apps/src/samples/pjsua2_demo.cpp index 65a6a45f..7e9ea34a 100644 --- a/pjsip-apps/src/samples/pjsua2_demo.cpp +++ b/pjsip-apps/src/samples/pjsua2_demo.cpp @@ -91,6 +91,8 @@ public: void MyCall::onCallState(OnCallStateParam &prm) { + PJ_UNUSED_ARG(prm); + CallInfo ci = getInfo(); std::cout << "*** Call: " << ci.remoteUri << " [" << ci.stateText << "]" << std::endl; @@ -204,6 +206,40 @@ void mainProg2() throw(Error) ep.libDestroy(); } + +void mainProg3() throw(Error) +{ + Endpoint ep; + + // Create library + ep.libCreate(); + + // Init library + EpConfig ep_cfg; + ep.libInit( ep_cfg ); + + // Start library + ep.libStart(); + std::cout << "*** PJSUA2 STARTED ***" << std::endl; + + // Create player and recorder + { + AudioMediaPlayer amp; + amp.createPlayer("../../tests/pjsua/wavs/input.16.wav"); + + AudioMediaRecorder amr; + amr.createRecorder("recorder_test_output.wav"); + + amp.startTransmit(ep.audDevManager().getPlaybackDevMedia()); + amp.startTransmit(amr); + + pj_thread_sleep(5000); + } + + ep.libDestroy(); +} + + void mainProg() throw(Error) { Endpoint ep; @@ -271,13 +307,10 @@ int main() */ { Endpoint ep; - ep.natDetectType(); - { - } } try { - mainProg1(); + mainProg3(); std::cout << "Success" << std::endl; } catch (Error & err) { std::cout << "Exception: " << err.info() << std::endl; |