Changeset 2468 for pjproject/branches/projects/aps-direct/pjmedia/src/pjmedia/conf_switch.c

Timestamp:

Feb 21, 2009 2:21:59 PM (15 years ago)

Author:

bennylp

Message:

Updated libraries and applications to use the new Audio Device API

File:

• pjproject/branches/projects/aps-direct/pjmedia/src/pjmedia/conf_switch.c (modified) (5 diffs)

pjproject/branches/projects/aps-direct/pjmedia/src/pjmedia/conf_switch.c

@@ -114 +114 @@
     unsigned              port_cnt;     /**< Current number of ports.       */
     unsigned              connect_cnt;  /**< Total number of connections    */
-    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.      */
@@ -188 +187 @@
     pj_status_t status;
 
-
     status = create_conf_port(pool, conf, conf->master_port, &name, &conf_port);
     if (status != PJ_SUCCESS)
         return status;
-
-
-    /* Create sound device port: */
-
-    if ((conf->options & PJMEDIA_CONF_NO_DEVICE) == 0) {
-        pjmedia_snd_stream *strm;
-        pjmedia_snd_stream_info si;
-        pjmedia_port_info *master_port_info = (pjmedia_port_info*)
-                                              &conf->master_port->info;
-
-        /*
-         * If capture is disabled then create player only port.
-         * Otherwise create bidirectional sound device port.
-         */
-        if (conf->options & PJMEDIA_CONF_NO_MIC)  {
-            status = pjmedia_snd_port_create_player(
-                                        pool, -1, 
-                                        master_port_info->clock_rate,
-                                        master_port_info->channel_count,
-                                        master_port_info->samples_per_frame,
-                                        master_port_info->bits_per_sample, 
-                                        0,      /* options */
-                                        &conf->snd_dev_port);
-
-        } else {
-            status = pjmedia_snd_port_create( 
-                                        pool, -1, -1, 
-                                        master_port_info->clock_rate, 
-                                        master_port_info->channel_count, 
-                                        master_port_info->samples_per_frame,
-                                        master_port_info->bits_per_sample,
-                                        0,    /* Options */
-                                        &conf->snd_dev_port);
-        }
-
-        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);
-        }
-    }
-
 
      /* Add the port to the bridge */
@@ -247 +195 @@
     conf->ports[0] = conf_port;
     conf->port_cnt++;
-
 
     PJ_LOG(5,(THIS_FILE, "Sound device successfully created for port 0"));
@@ -312 +259 @@
         return status;
 
-    /* If sound device was created, connect sound device to the
-     * master port.
-     */
-    if (conf->snd_dev_port) {
-        status = pjmedia_snd_port_connect( conf->snd_dev_port, 
-                                           conf->master_port );
-        if (status != PJ_SUCCESS) {
-            pjmedia_conf_destroy(conf);
-            return status;
-        }
-    }
-
     /* Done */
 
@@ -359 +294 @@
 {
     PJ_ASSERT_RETURN(conf != NULL, PJ_EINVAL);
-
-    /* Destroy sound device port. */
-    if (conf->snd_dev_port) {
-        pjmedia_snd_port_destroy(conf->snd_dev_port);
-        conf->snd_dev_port = NULL;
-    }
 
     /* Destroy mutex */