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

Timestamp:

Mar 15, 2006 8:56:04 PM (18 years ago)

Author:

bennylp

Message:

Tidying up sound device, register PortAudio? error codes, and initial support for stereo sound device (untested)

File:

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

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

@@ -140 +140 @@
     unsigned              samples_per_frame;    /**< Samples per frame.     */
     unsigned              bits_per_sample;      /**< Bits per sample.       */
-    pj_snd_stream_info    snd_info;     /**< Sound device parameter.        */
 };
 
@@ -287 +286 @@
 
 
-    /* Init default sound device parameters. */
-    pj_memset(&conf->snd_info, 0, sizeof(conf->snd_info));
-    conf->snd_info.samples_per_sec = conf->clock_rate;
-    conf->snd_info.bits_per_sample = conf->bits_per_sample;
-    conf->snd_info.samples_per_frame = conf->samples_per_frame;
-    conf->snd_info.bytes_per_frame = conf->samples_per_frame * 
-                               conf->bits_per_sample / 8;
-    conf->snd_info.frames_per_packet = 1;
-    
 
     /* Create port */
@@ -389 +379 @@
 static pj_status_t create_sound( pjmedia_conf *conf )
 {
+    pj_status_t status;
+
     /* 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;
+        status = pj_snd_open_recorder(-1, conf->clock_rate, 1, 
+                                      conf->samples_per_frame,
+                                      conf->bits_per_sample,
+                                      &rec_cb, conf, &conf->snd_rec);
+        if (status != PJ_SUCCESS) {
+            conf->snd_rec = NULL;
+            return status;
         }
     }
 
     /* Open player */
-    conf->snd_player = pj_snd_open_player(-1, &conf->snd_info, &play_cb, conf);
-    if (conf->snd_player == NULL) {
+    status = pj_snd_open_player(-1, conf->clock_rate, 1,
+                                conf->samples_per_frame,
+                                conf->bits_per_sample, 
+                                &play_cb, conf, &conf->snd_player);
+    if (status != PJ_SUCCESS) {
         if (conf->snd_rec) {
             pj_snd_stream_close(conf->snd_rec);
+            conf->snd_rec = NULL;
         }
-        return -1;
+        conf->snd_player = NULL;
+        return status;
     }