Changeset 2018 for pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app.c

Timestamp:

Jun 13, 2008 5:01:46 PM (16 years ago)

Author:

nanang

Message:

Ticket #540: Added pjsua-lib feature auto-close sound device on idle and new pjsua option --snd-auto-close=N

File:

• pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app.c (modified) (6 diffs)

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

@@ -202 +202 @@
     puts  ("  --capture-lat=N     Audio capture latency, in ms (default=10)");
     puts  ("  --playback-lat=N    Audio playback latency, in ms (default=100)");
+    puts  ("  --snd-auto-close=N  Auto close audio device when it is idle for N seconds.");
+    puts  ("                      Specify N=-1 (default) to disable this feature.");
+    puts  ("                      Specify N=0 for instant close when unused.");
 
     puts  ("");
@@ -401 +404 @@
     int option_index;
     enum { OPT_CONFIG_FILE=127, OPT_LOG_FILE, OPT_LOG_LEVEL, OPT_APP_LOG_LEVEL, 
-           OPT_HELP, OPT_VERSION, OPT_NULL_AUDIO, 
+           OPT_HELP, OPT_VERSION, OPT_NULL_AUDIO, OPT_SND_AUTO_CLOSE,
            OPT_LOCAL_PORT, OPT_IP_ADDR, OPT_PROXY, OPT_OUTBOUND_PROXY, 
            OPT_REGISTRAR, OPT_REG_TIMEOUT, OPT_PUBLISH, OPT_ID, OPT_CONTACT,
@@ -515 +518 @@
         { "stdout-refresh", 1, 0, OPT_STDOUT_REFRESH},
         { "stdout-refresh-text", 1, 0, OPT_STDOUT_REFRESH_TEXT},
+        { "snd-auto-close", 1, 0, OPT_SND_AUTO_CLOSE},
         { NULL, 0, 0, 0}
     };
@@ -1107 +1111 @@
         case OPT_PLAYBACK_LAT:
             cfg->playback_lat = atoi(pj_optarg);
+            break;
+
+        case OPT_SND_AUTO_CLOSE:
+            cfg->media_cfg.snd_auto_close_time = atoi(pj_optarg);
             break;
 
@@ -1503 +1511 @@
     if (config->playback_dev != PJSUA_INVALID_ID) {
         pj_ansi_sprintf(line, "--playback-dev %d\n", config->playback_dev);
+        pj_strcat2(&cfg, line);
+    }
+    if (config->media_cfg.snd_auto_close_time != -1) {
+        pj_ansi_sprintf(line, "--snd-auto-close %d\n", 
+                        config->media_cfg.snd_auto_close_time);
         pj_strcat2(&cfg, line);
     }
@@ -3787 +3800 @@
 #endif
 
-    if (app_config.capture_dev != PJSUA_INVALID_ID
-        || app_config.playback_dev != PJSUA_INVALID_ID) {
-        status
-          = pjsua_set_snd_dev(app_config.capture_dev, app_config.playback_dev);
+    if (app_config.capture_dev  != PJSUA_INVALID_ID ||
+        app_config.playback_dev != PJSUA_INVALID_ID) 
+    {
+        status = pjsua_set_snd_dev(app_config.capture_dev, 
+                                   app_config.playback_dev);
         if (status != PJ_SUCCESS)
             goto on_error;