Changeset 1043 for pjproject

Timestamp:

Mar 6, 2007 6:09:11 PM (18 years ago)

Author:

bennylp

Message:

Ticket #158: allow sound device selection in pjsua (thanks Michael Smith)

File:

• pjproject/branches/pjproject-0.5-stable/pjsip-apps/src/pjsua/pjsua_app.c (modified) (8 diffs)

pjproject/branches/pjproject-0.5-stable/pjsip-apps/src/pjsua/pjsua_app.c

@@ -84 +84 @@
                             speaker_level;
 
+    int                     capture_dev, playback_dev;
 } app_config;
 
@@ -181 +182 @@
     puts  ("  --rx-drop-pct=PCT   Drop PCT percent of RX RTP (for pkt lost sim, default: 0)");
     puts  ("  --tx-drop-pct=PCT   Drop PCT percent of TX RTP (for pkt lost sim, default: 0)");
+    puts  ("  --capture-dev=id    Audio capture device ID (default=-1)");
+    puts  ("  --playback-dev=id   Audio playback device ID (default=-1)");
 
 
@@ -224 +227 @@
     cfg->rec_port = PJSUA_INVALID_ID;
     cfg->mic_level = cfg->speaker_level = 1.0;
+    cfg->capture_dev = PJSUA_INVALID_ID;
+    cfg->playback_dev = PJSUA_INVALID_ID;
 
     for (i=0; i<PJ_ARRAY_SIZE(cfg->acc_cfg); ++i)
@@ -335 +340 @@
            OPT_TLS_PASSWORD, OPT_TLS_VERIFY_SERVER, OPT_TLS_VERIFY_CLIENT,
            OPT_TLS_NEG_TIMEOUT,
+           OPT_CAPTURE_DEV, OPT_PLAYBACK_DEV,
     };
     struct pj_getopt_option long_options[] = {
@@ -398 +404 @@
         { "tls-verify-client", 0, 0, OPT_TLS_VERIFY_CLIENT},
         { "tls-neg-timeout", 1, 0, OPT_TLS_NEG_TIMEOUT},
+        { "capture-dev",    1, 0, OPT_CAPTURE_DEV},
+        { "playback-dev",   1, 0, OPT_PLAYBACK_DEV},
         { NULL, 0, 0, 0}
     };
@@ -886 +894 @@
             break;
 
+        case OPT_CAPTURE_DEV:
+            cfg->capture_dev = atoi(pj_optarg);
+            break;
+
+        case OPT_PLAYBACK_DEV:
+            cfg->playback_dev = atoi(pj_optarg);
+            break;
+
         default:
             PJ_LOG(1,(THIS_FILE, 
@@ -1185 +1201 @@
     if (config->auto_rec)
         pj_strcat2(&cfg, "--auto-rec\n");
-
+    if (config->capture_dev != PJSUA_INVALID_ID) {
+        pj_ansi_sprintf(line, "--capture-dev %d\n", config->capture_dev);
+        pj_strcat2(&cfg, line);
+    }
+    if (config->playback_dev != PJSUA_INVALID_ID) {
+        pj_ansi_sprintf(line, "--playback-dev %d\n", config->playback_dev);
+        pj_strcat2(&cfg, line);
+    }
 
     /* Media clock rate. */
@@ -3131 +3154 @@
 #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 (status != PJ_SUCCESS)
+            goto on_error;
+    }
+
     return PJ_SUCCESS;