Changeset 4522


Ignore:
Timestamp:
May 23, 2013 3:48:31 AM (6 years ago)
Author:
riza
Message:

Re #1643:

  • Fix duplicate shortcut for video commands
  • Fix restart command bug on legacy mode
  • Fix restart bug when using add-buddy options
Location:
pjproject/trunk/pjsip-apps/src/pjsua
Files:
3 edited

Legend:

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

    r4489 r4522  
    3535void on_app_stopped(pj_bool_t restart, int argc, char** argv) 
    3636{ 
    37     cfg.argc = argc; 
    38     cfg.argv = argv; 
     37    if (argv) { 
     38        cfg.argc = argc; 
     39        cfg.argv = argv; 
     40    } 
    3941 
    4042    running = restart; 
     
    108110            status = pjsua_app_run(PJ_TRUE); 
    109111        } else { 
    110             pj_perror(3, THIS_FILE, status, "Failed init"); 
    111112            running = PJ_FALSE; 
    112113        } 
  • pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app_cli.c

    r4513 r4522  
    28982898        "    </CMD>" 
    28992899        "  </CMD>" 
    2900         "  <CMD name='call' id='6004' sc='cl' "  
     2900        "  <CMD name='call' id='6004' sc='vcl' " 
    29012901        "   desc='Video call commands/settings'>" 
    2902         "    <CMD name='rx' id='60041' sc='rx' " 
     2902        "    <CMD name='rx' id='60041' " 
    29032903        "     desc='Enable/disable video RX for stream in curr call'>" 
    29042904        "      <ARG name='enable_option' type='choice' " 
     
    29372937        "    </CMD>" 
    29382938        "  </CMD>" 
    2939         "  <CMD name='device' id='6005' sc='v' desc='Video device commands'>" 
     2939        "  <CMD name='device' id='6005' sc='vv' desc='Video device commands'>" 
    29402940        "    <CMD name='list' id='60051' desc='Show all video devices'/>" 
    29412941        "    <CMD name='refresh' id='60052' desc='Refresh video device list'/>" 
  • pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app_config.c

    r4513 r4522  
    14561456        pjsua_buddy_config_default(&cfg->buddy_cfg[i]); 
    14571457 
     1458    cfg->buddy_cnt = 0; 
    14581459    cfg->vid.vcapture_dev = PJMEDIA_VID_DEFAULT_CAPTURE_DEV; 
    14591460    cfg->vid.vrender_dev = PJMEDIA_VID_DEFAULT_RENDER_DEV; 
Note: See TracChangeset for help on using the changeset viewer.