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

Timestamp:

Mar 8, 2006 12:37:22 PM (18 years ago)

Author:

bennylp

Message:

Added options to disable microphone device, usefull for streaming server (some systems only have sound player)

File:

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

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

@@ -128 +128 @@
 struct pjmedia_conf
 {
+    unsigned              options;      /**< Bitmask options.               */
     unsigned              max_ports;    /**< Maximum ports.                 */
     unsigned              port_cnt;     /**< Current number of ports.       */
@@ -334 +335 @@
                                          unsigned samples_per_frame,
                                          unsigned bits_per_sample,
+                                         unsigned options,
                                          pjmedia_conf **p_conf )
 {
@@ -352 +354 @@
     PJ_ASSERT_RETURN(conf->ports, PJ_ENOMEM);
 
+    conf->options = options;
     conf->max_ports = max_ports;
     conf->clock_rate = clock_rate;
@@ -386 +389 @@
 static pj_status_t create_sound( pjmedia_conf *conf )
 {
-    /* Open recorder. */
-    conf->snd_rec = pj_snd_open_recorder(-1 ,&conf->snd_info, &rec_cb, conf);
-    if (conf->snd_rec == NULL) {
-        return -1;
+    /* Open recorder only if mic is not disabled. */
+    if ((conf->options & PJMEDIA_CONF_NO_MIC) == 0) {
+        conf->snd_rec = pj_snd_open_recorder(-1 ,&conf->snd_info, 
+                                             &rec_cb, conf);
+        if (conf->snd_rec == NULL) {
+            return -1;
+        }
     }
 
@@ -395 +401 @@
     conf->snd_player = pj_snd_open_player(-1, &conf->snd_info, &play_cb, conf);
     if (conf->snd_player == NULL) {
-        pj_snd_stream_close(conf->snd_rec);
+        if (conf->snd_rec) {
+            pj_snd_stream_close(conf->snd_rec);
+        }
         return -1;
     }
@@ -426 +434 @@
     pj_status_t status;
 
-    if (conf->snd_rec == NULL) {
+    if (conf->snd_player == NULL) {
         status = create_sound(conf);
         if (status != PJ_SUCCESS)