Changeset 4522 for pjproject/trunk

Timestamp:

May 23, 2013 3:48:31 AM (12 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:

• main.c (modified) (2 diffs)
• pjsua_app_cli.c (modified) (2 diffs)
• pjsua_app_config.c (modified) (1 diff)

pjproject/trunk/pjsip-apps/src/pjsua/main.c

@@ -35 +35 @@
 void on_app_stopped(pj_bool_t restart, int argc, char** argv)
 {
-    cfg.argc = argc;
-    cfg.argv = argv;
+    if (argv) {
+        cfg.argc = argc;
+        cfg.argv = argv;
+    }
 
     running = restart;
@@ -108 +110 @@
             status = pjsua_app_run(PJ_TRUE);
         } else {
-            pj_perror(3, THIS_FILE, status, "Failed init");
             running = PJ_FALSE;
         }

pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app_cli.c

@@ -2898 +2898 @@
         "    </CMD>"
         "  </CMD>"
-        "  <CMD name='call' id='6004' sc='cl' " 
+        "  <CMD name='call' id='6004' sc='vcl' "
         "   desc='Video call commands/settings'>"
-        "    <CMD name='rx' id='60041' sc='rx' "
+        "    <CMD name='rx' id='60041' "
         "     desc='Enable/disable video RX for stream in curr call'>"
         "      <ARG name='enable_option' type='choice' "
@@ -2937 +2937 @@
         "    </CMD>"
         "  </CMD>"
-        "  <CMD name='device' id='6005' sc='v' desc='Video device commands'>"
+        "  <CMD name='device' id='6005' sc='vv' desc='Video device commands'>"
         "    <CMD name='list' id='60051' desc='Show all video devices'/>"
         "    <CMD name='refresh' id='60052' desc='Refresh video device list'/>"

pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app_config.c

@@ -1456 +1456 @@
         pjsua_buddy_config_default(&cfg->buddy_cfg[i]);
 
+    cfg->buddy_cnt = 0;
     cfg->vid.vcapture_dev = PJMEDIA_VID_DEFAULT_CAPTURE_DEV;
     cfg->vid.vrender_dev = PJMEDIA_VID_DEFAULT_RENDER_DEV;