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

Timestamp:

Mar 16, 2006 6:52:55 PM (18 years ago)

Author:

bennylp

Message:

Added sound port (sound_port.h/c), and changed sound and RTCP names from pj_* to pjmedia_*

File:

• pjproject/trunk/pjmedia/src/pjmedia/conference.c (modified) (7 diffs)

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

@@ -132 +132 @@
     unsigned              port_cnt;     /**< Current number of ports.       */
     unsigned              connect_cnt;  /**< Total number of connections    */
-    pj_snd_stream        *snd_rec;      /**< Sound recorder stream.         */
-    pj_snd_stream        *snd_player;   /**< Sound player stream.           */
+    pjmedia_snd_stream   *snd_rec;      /**< Sound recorder stream.         */
+    pjmedia_snd_stream   *snd_player;   /**< Sound player stream.           */
     pj_mutex_t           *mutex;        /**< Conference mutex.              */
     struct conf_port    **ports;        /**< Array of ports.                */
@@ -383 +383 @@
     /* Open recorder only if mic is not disabled. */
     if ((conf->options & PJMEDIA_CONF_NO_MIC) == 0) {
-        status = pj_snd_open_recorder(-1, conf->clock_rate, 1, 
+        status = pjmedia_snd_open_recorder(-1, conf->clock_rate, 1, 
                                       conf->samples_per_frame,
                                       conf->bits_per_sample,
@@ -394 +394 @@
 
     /* Open player */
-    status = pj_snd_open_player(-1, conf->clock_rate, 1,
+    status = pjmedia_snd_open_player(-1, conf->clock_rate, 1,
                                 conf->samples_per_frame,
                                 conf->bits_per_sample, 
@@ -400 +400 @@
     if (status != PJ_SUCCESS) {
         if (conf->snd_rec) {
-            pj_snd_stream_close(conf->snd_rec);
+            pjmedia_snd_stream_close(conf->snd_rec);
             conf->snd_rec = NULL;
         }
@@ -416 +416 @@
 {
     if (conf->snd_rec) {
-        pj_snd_stream_close(conf->snd_rec);
+        pjmedia_snd_stream_close(conf->snd_rec);
         conf->snd_rec = NULL;
     }
     if (conf->snd_player) {
-        pj_snd_stream_close(conf->snd_player);
+        pjmedia_snd_stream_close(conf->snd_player);
         conf->snd_player = NULL;
     }
@@ -442 +442 @@
     /* Start recorder. */
     if (conf->snd_rec) {
-        status = pj_snd_stream_start(conf->snd_rec);
+        status = pjmedia_snd_stream_start(conf->snd_rec);
         if (status != PJ_SUCCESS)
             goto on_error;
@@ -449 +449 @@
     /* Start player. */
     if (conf->snd_player) {
-        status = pj_snd_stream_start(conf->snd_player);
+        status = pjmedia_snd_stream_start(conf->snd_player);
         if (status != PJ_SUCCESS)
             goto on_error;