Changeset 837

Timestamp:

Nov 29, 2006 11:12:26 PM (17 years ago)

Author:

bennylp

Message:

Fixed sndtest bug (ticket #32): it doesn't display the correct device being tested when default device is used.

File:

• pjproject/trunk/pjsip-apps/src/samples/sndtest.c (modified) (6 diffs)

pjproject/trunk/pjsip-apps/src/samples/sndtest.c

@@ -131 +131 @@
 
 
-static const char *get_dev_name(int dev_id)
-{
-    const pjmedia_snd_dev_info *info;
-
-    if (dev_id == -1)
-        dev_id = 0;
-
-    info = pjmedia_snd_get_dev_info(dev_id);
-    if (info == NULL)
-        return "????";
-
-    return info->name;
-}
-
-
 static pj_status_t play_cb(void *user_data, pj_uint32_t timestamp,
                            void *output, unsigned size)
@@ -369 +354 @@
 
 
-static int perform_test(const char *title, int dev_id, pjmedia_dir dir,
+static int perform_test(int dev_id, pjmedia_dir dir,
                         unsigned clock_rate, unsigned samples_per_frame, 
                         unsigned nchannel, int verbose)
@@ -376 +361 @@
     pjmedia_snd_stream *strm;
     struct test_data test_data;
+    pjmedia_snd_stream_info si;
 
 
@@ -390 +376 @@
      * Open device.
      */
-    PJ_LOG(3,(THIS_FILE, "Testing %s", title));
-
     if (dir == PJMEDIA_DIR_CAPTURE) {
         status = pjmedia_snd_open_rec( dev_id, clock_rate, nchannel,
@@ -409 +393 @@
         app_perror("Unable to open device for capture", status);
         return status;
+    }
+
+    pjmedia_snd_stream_get_info(strm, &si);
+    if (si.play_id >= 0) {
+        PJ_LOG(3,(THIS_FILE, "Testing playback device %s", 
+                  pjmedia_snd_get_dev_info(si.play_id)->name));
+    }
+    if (si.rec_id >= 0) {
+        PJ_LOG(3,(THIS_FILE, "Testing capture device %s", 
+                  pjmedia_snd_get_dev_info(si.rec_id)->name));
     }
 
@@ -595 +589 @@
 
 
-    status = perform_test(get_dev_name(id), id, PJMEDIA_DIR_CAPTURE_PLAYBACK, 
+    status = perform_test(id, PJMEDIA_DIR_CAPTURE_PLAYBACK, 
                           clock_rate, frame, channel, verbose);
     if (status != 0)