kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-07-04 14:38:35 +00:00
Code Issues Projects Releases Wiki Activity

fix cpp bridge

Browse Source 
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@9298 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Brian West 2008-08-14 18:19:41 +00:00
parent 12f01067c5
commit 88ae78906d
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/switch_cpp.cpp
View File

@ -1070,12 +1070,10 @@ SWITCH_DECLARE(void) bridge(CoreSession &session_a, CoreSession &session_b)
if (switch_channel_ready(channel_a) && switch_channel_ready(channel_b)) { if (switch_channel_ready(channel_a) && switch_channel_ready(channel_b)) {
session_a.begin_allow_threads(); session_a.begin_allow_threads();
if (!switch_channel_test_flag(channel_a, CF_ANSWERED)) { if (!switch_channel_media_ready(channel_a)) {
switch_channel_answer(channel_a); switch_channel_pre_answer(channel_a);
}
if (!switch_channel_test_flag(channel_b, CF_ANSWERED)) {
switch_channel_answer(channel_b);
} }
if (switch_channel_ready(channel_a) && switch_channel_ready(channel_b)) { if (switch_channel_ready(channel_a) && switch_channel_ready(channel_b)) {
args = session_a.get_cb_args(); // get the cb_args data structure for session a args = session_a.get_cb_args(); // get the cb_args data structure for session a
dtmf_func = args.input_callback; // get the call back function dtmf_func = args.input_callback; // get the call back function