Changeset 4457


Ignore:
Timestamp:
Apr 3, 2013 8:21:47 AM (7 years ago)
Author:
bennylp
Message:

Fixed #1653: [incompatible] pjsua_call_update() API should not release hold

Location:
pjproject/trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • pjproject/trunk/pjsip-apps/src/pjsua/pjsua_cli_cmd.c

    r4440 r4457  
    15241524{ 
    15251525    if (current_call != PJSUA_INVALID_ID) { 
     1526        call_opt.flag |= PJSUA_CALL_UNHOLD; 
    15261527        pjsua_call_update2(current_call, &call_opt, NULL); 
    15271528    } else { 
  • pjproject/trunk/pjsip-apps/src/pjsua/pjsua_ui_cmd.c

    r4440 r4457  
    971971static void ui_send_update() 
    972972{ 
    973     if (current_call != -1) {            
     973    if (current_call != -1) { 
     974        call_opt.flag |= PJSUA_CALL_UNHOLD; 
    974975        pjsua_call_update2(current_call, &call_opt, NULL); 
    975976    } else { 
     
    19361937on_exit: 
    19371938    ; 
    1938 } 
     1939}  
     1940 
  • pjproject/trunk/pjsip/src/pjsua-lib/pjsua_call.c

    r4452 r4457  
    24962496 
    24972497    /* Create SDP */ 
    2498     status = pjsua_media_channel_create_sdp(call->index,  
    2499                                             call->inv->pool_prov,  
    2500                                             NULL, &sdp, NULL); 
    2501     if (status != PJ_SUCCESS) { 
    2502         pjsua_perror(THIS_FILE, "Unable to get SDP from media endpoint",  
     2498    if (call->local_hold && (call->opt.flag & PJSUA_CALL_UNHOLD)==0) { 
     2499        status = create_sdp_of_call_hold(call, &sdp); 
     2500    } else { 
     2501        status = pjsua_media_channel_create_sdp(call->index, 
     2502                                                call->inv->pool_prov, 
     2503                                                NULL, &sdp, NULL); 
     2504        call->local_hold = PJ_FALSE; 
     2505    } 
     2506 
     2507    if (status != PJ_SUCCESS) { 
     2508        pjsua_perror(THIS_FILE, "Unable to get SDP from media endpoint", 
    25032509                     status); 
    25042510        goto on_return; 
Note: See TracChangeset for help on using the changeset viewer.