Changeset 2506 for pjproject/trunk/pjmedia/src/pjmedia/conference.c

Timestamp:

Mar 12, 2009 6:11:37 PM (14 years ago)

Author:

bennylp

Message:

(Major) Task #737 and #738: integration of APS-Direct and Audiodev from aps-direct branch to trunk.

Location:

pjproject/trunk

Files:

• . (modified) (1 prop)
• pjmedia/src/pjmedia/conference.c (modified) (6 diffs)

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

@@ -34 +34 @@
 #include <pj/string.h>
 
+#if !defined(PJMEDIA_CONF_USE_SWITCH_BOARD) || PJMEDIA_CONF_USE_SWITCH_BOARD==0
 
 /* CONF_DEBUG enables detailed operation of the conference bridge.
@@ -64 +65 @@
 #define BYTES_PER_SAMPLE    2
 
-#define SIGNATURE           PJMEDIA_PORT_SIGNATURE('C', 'O', 'N', 'F')
+#define SIGNATURE           PJMEDIA_CONF_BRIDGE_SIGNATURE
 #define SIGNATURE_PORT      PJMEDIA_PORT_SIGNATURE('C', 'O', 'N', 'P')
 /* Normal level is hardcodec to 128 in all over places */
@@ -465 +466 @@
 
     if ((conf->options & PJMEDIA_CONF_NO_DEVICE) == 0) {
-        pjmedia_snd_stream *strm;
-        pjmedia_snd_stream_info si;
+        pjmedia_aud_stream *strm;
+        pjmedia_aud_param param;
 
         /*
@@ -494 +495 @@
 
         strm = pjmedia_snd_port_get_snd_stream(conf->snd_dev_port);
-        status = pjmedia_snd_stream_get_info(strm, &si);
+        status = pjmedia_aud_stream_get_param(strm, &param);
         if (status == PJ_SUCCESS) {
-            const pjmedia_snd_dev_info *snd_dev_info;
+            pjmedia_aud_dev_info snd_dev_info;
             if (conf->options & PJMEDIA_CONF_NO_MIC)
-                snd_dev_info = pjmedia_snd_get_dev_info(si.play_id);
+                pjmedia_aud_dev_get_info(param.play_id, &snd_dev_info);
             else
-                snd_dev_info = pjmedia_snd_get_dev_info(si.rec_id);
-            pj_strdup2_with_null(pool, &conf_port->name, snd_dev_info->name);
+                pjmedia_aud_dev_get_info(param.rec_id, &snd_dev_info);
+            pj_strdup2_with_null(pool, &conf_port->name, snd_dev_info.name);
         }
     }
@@ -1171 +1172 @@
     info->listener_cnt = conf_port->listener_cnt;
     info->listener_slots = conf_port->listener_slots;
+    info->transmitter_cnt = conf_port->transmitter_cnt;
     info->clock_rate = conf_port->clock_rate;
     info->channel_count = conf_port->channel_count;
@@ -1988 +1990 @@
 }
 
+#endif