Changeset 2468 for pjproject/branches/projects/aps-direct/pjmedia/src/pjmedia-audiodev/pa_dev.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-audiodev/pa_dev.c (modified) (12 diffs)

pjproject/branches/projects/aps-direct/pjmedia/src/pjmedia-audiodev/pa_dev.c

@@ -106 +106 @@
 static pj_status_t  pa_default_param(pjmedia_aud_dev_factory *f,
                                      unsigned index,
-                                     pjmedia_aud_dev_param *param);
+                                     pjmedia_aud_param *param);
 static pj_status_t  pa_create_stream(pjmedia_aud_dev_factory *f,
-                                     const pjmedia_aud_dev_param *param,
+                                     const pjmedia_aud_param *param,
                                      pjmedia_aud_rec_cb rec_cb,
                                      pjmedia_aud_play_cb play_cb,
@@ -116 +116 @@
 /* Stream prototypes */
 static pj_status_t strm_get_param(pjmedia_aud_stream *strm,
-                                  pjmedia_aud_dev_param *param);
+                                  pjmedia_aud_param *param);
 static pj_status_t strm_get_cap(pjmedia_aud_stream *strm,
                                 pjmedia_aud_dev_cap cap,
@@ -515 +515 @@
 static pj_status_t  pa_default_param(pjmedia_aud_dev_factory *f,
                                      unsigned index,
-                                     pjmedia_aud_dev_param *param)
+                                     pjmedia_aud_param *param)
 {
     pjmedia_aud_dev_info adi;
@@ -534 +534 @@
         param->dir = PJMEDIA_DIR_CAPTURE;
         param->rec_id = index;
-        param->play_id = PJMEDIA_AUD_DEV_DEFAULT_ID;
+        param->play_id = PJMEDIA_AUD_DEV_DEFAULT;
     } else if (adi.output_count) {
         param->dir = PJMEDIA_DIR_PLAYBACK;
         param->play_id = index;
-        param->rec_id = PJMEDIA_AUD_DEV_DEFAULT_ID;
+        param->rec_id = PJMEDIA_AUD_DEV_DEFAULT;
     } else {
         return PJMEDIA_EAUD_INVDEV;
@@ -670 +670 @@
 /* Internal: create capture/recorder stream */
 static pj_status_t create_rec_stream( struct pa_aud_factory *pa,
-                                      const pjmedia_aud_dev_param *param,
+                                      const pjmedia_aud_param *param,
                                       pjmedia_aud_rec_cb rec_cb,
                                       void *user_data,
@@ -676 +676 @@
 {
     pj_pool_t *pool;
-    pjmedia_aud_dev_id rec_id;
+    pjmedia_aud_dev_index rec_id;
     struct pa_aud_stream *stream;
     PaStreamParameters inputParam;
@@ -775 +775 @@
 /* Internal: create playback stream */
 static pj_status_t create_play_stream(struct pa_aud_factory *pa,
-                                      const pjmedia_aud_dev_param *param,
+                                      const pjmedia_aud_param *param,
                                       pjmedia_aud_play_cb play_cb,
                                       void *user_data,
@@ -781 +781 @@
 {
     pj_pool_t *pool;
-    pjmedia_aud_dev_id play_id;
+    pjmedia_aud_dev_index play_id;
     struct pa_aud_stream *stream;
     PaStreamParameters outputParam;
@@ -882 +882 @@
 /* Internal: Create both player and recorder stream */
 static pj_status_t create_bidir_stream(struct pa_aud_factory *pa,
-                                       const pjmedia_aud_dev_param *param,
+                                       const pjmedia_aud_param *param,
                                        pjmedia_aud_rec_cb rec_cb,
                                        pjmedia_aud_play_cb play_cb,
@@ -889 +889 @@
 {
     pj_pool_t *pool;
-    pjmedia_aud_dev_id rec_id, play_id;
+    pjmedia_aud_dev_index rec_id, play_id;
     struct pa_aud_stream *stream;
     PaStream *paStream = NULL;
@@ -1061 +1061 @@
 /* API: create stream */
 static pj_status_t  pa_create_stream(pjmedia_aud_dev_factory *f,
-                                     const pjmedia_aud_dev_param *param,
+                                     const pjmedia_aud_param *param,
                                      pjmedia_aud_rec_cb rec_cb,
                                      pjmedia_aud_play_cb play_cb,
@@ -1092 +1092 @@
 /* API: Get stream parameters */
 static pj_status_t strm_get_param(pjmedia_aud_stream *s,
-                                  pjmedia_aud_dev_param *pi)
+                                  pjmedia_aud_param *pi)
 {
     struct pa_aud_stream *strm = (struct pa_aud_stream*)s;