Changeset 833 for pjproject

Timestamp:

Nov 27, 2006 9:54:03 AM (18 years ago)

Author:

bennylp

Message:

Display actual sound device name in conference bridge port zero

Location:

pjproject/trunk

Files:

• pjmedia/include/pjmedia/conference.h (modified) (1 diff)
• pjmedia/src/pjmedia/conference.c (modified) (4 diffs)
• pjsip/src/pjsua-lib/pjsua_media.c (modified) (3 diffs)

pjproject/trunk/pjmedia/include/pjmedia/conference.h

@@ -173 +173 @@
 
 /**
+ * Set master port name.
+ *
+ * @param conf              The conference bridge.
+ * @param name              Name to be assigned.
+ *
+ * @return                  PJ_SUCCESS on success.
+ */
+PJ_DECL(pj_status_t) pjmedia_conf_set_port0_name(pjmedia_conf *conf,
+                                                 const pj_str_t *name);
+
+
+/**
  * Add media port to the conference bridge.
  *

pjproject/trunk/pjmedia/src/pjmedia/conference.c

@@ -182 +182 @@
     pjmedia_snd_port     *snd_dev_port; /**< Sound device port.             */
     pjmedia_port         *master_port;  /**< Port zero's port.              */
+    char                  master_name_buf[80]; /**< Port0 name buffer.      */
     pj_mutex_t           *mutex;        /**< Conference mutex.              */
     struct conf_port    **ports;        /**< Array of ports.                */
@@ -391 +392 @@
 
     if ((conf->options & PJMEDIA_CONF_NO_DEVICE) == 0) {
+        pjmedia_snd_stream *strm;
+        pjmedia_snd_stream_info si;
 
         /*
@@ -415 +418 @@
         if (status != PJ_SUCCESS)
             return status;
+
+        strm = pjmedia_snd_port_get_snd_stream(conf->snd_dev_port);
+        status = pjmedia_snd_stream_get_info(strm, &si);
+        if (status == PJ_SUCCESS) {
+            const pjmedia_snd_dev_info *snd_dev_info;
+            if (conf->options & PJMEDIA_CONF_NO_MIC)
+                snd_dev_info = pjmedia_snd_get_dev_info(si.play_id);
+            else
+                snd_dev_info = pjmedia_snd_get_dev_info(si.rec_id);
+            pj_strdup2_with_null(pool, &conf_port->name, snd_dev_info->name);
+        }
     }
 
@@ -582 +596 @@
 }
 
+
+/*
+ * Set master port name.
+ */
+PJ_DEF(pj_status_t) pjmedia_conf_set_port0_name(pjmedia_conf *conf,
+                                                const pj_str_t *name)
+{
+    int len;
+
+    /* Sanity check. */
+    PJ_ASSERT_RETURN(conf != NULL && name != NULL, PJ_EINVAL);
+
+    len = name->slen;
+    if (len > sizeof(conf->master_name_buf))
+        len = sizeof(conf->master_name_buf);
+    
+    if (len > 0) pj_memcpy(conf->master_name_buf, name->ptr, len);
+
+    conf->ports[0]->name.ptr = conf->master_name_buf;
+    conf->ports[0]->name.slen = len;
+
+    if (conf->master_port)
+        conf->master_port->info.name = conf->ports[0]->name;
+
+    return PJ_SUCCESS;
+}
 
 /*

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_media.c

@@ -1013 +1013 @@
     unsigned selected_clock_rate = 0;
     unsigned i;
+    pjmedia_snd_stream *strm;
+    pjmedia_snd_stream_info si;
+    pj_str_t tmp;
     pj_status_t status = -1;
 
@@ -1018 +1021 @@
     close_snd_dev();
 
-
-    cap_info = pjmedia_snd_get_dev_info(capture_dev);
-    play_info = pjmedia_snd_get_dev_info(playback_dev);
 
     /* Set default clock rate */
@@ -1095 +1095 @@
     pjsua_var.play_dev = playback_dev;
 
+    /* Update sound device name. */
+    strm = pjmedia_snd_port_get_snd_stream(pjsua_var.snd_port);
+    pjmedia_snd_stream_get_info(strm, &si);
+    play_info = pjmedia_snd_get_dev_info(si.rec_id);
+
+    pjmedia_conf_set_port0_name(pjsua_var.mconf, 
+                                pj_cstr(&tmp, play_info->name));
+
     return PJ_SUCCESS;
 }