Changeset 320 for pjproject/trunk/pjmedia/src/pjmedia/nullsound.c

Timestamp:

Mar 16, 2006 2:24:26 PM (18 years ago)

Author:

bennylp

Message:

Added misc flags and modify Makefiles to allow exclusion of PortAudio? and specific codec during compilation

File:

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

pjproject/trunk/pjmedia/src/pjmedia/nullsound.c

@@ -19 +19 @@
 #include <pjmedia/sound.h>
 #include <pj/assert.h>
+
+#if defined(PJMEDIA_HAS_NULL_SOUND) && PJMEDIA_HAS_NULL_SOUND!=0
 
 static pj_snd_dev_info null_info = 
@@ -46 +48 @@
 }
 
-PJ_DEF(pj_snd_stream*) pj_snd_open_recorder( int index,
-                                             const pj_snd_stream_info *param,
-                                             pj_snd_rec_cb rec_cb,
-                                             void *user_data)
+PJ_DEF(pj_status_t) pj_snd_open_recorder( int index,
+                                          unsigned clock_rate,
+                                          unsigned channel_count,
+                                          unsigned samples_per_frame,
+                                          unsigned bits_per_sample,
+                                          pj_snd_rec_cb rec_cb,
+                                          void *user_data,
+                                          pj_snd_stream **p_snd_strm)
 {
     PJ_UNUSED_ARG(index);
-    PJ_UNUSED_ARG(param);
+    PJ_UNUSED_ARG(clock_rate);
+    PJ_UNUSED_ARG(channel_count);
+    PJ_UNUSED_ARG(samples_per_frame);
+    PJ_UNUSED_ARG(bits_per_sample);
     PJ_UNUSED_ARG(rec_cb);
     PJ_UNUSED_ARG(user_data);
-    return (void*)1;
+
+    *p_snd_strm = (void*)1;
+
+    return PJ_SUCCESS;
 }
 
-PJ_DEF(pj_snd_stream*) pj_snd_open_player( int index,
-                                           const pj_snd_stream_info *param,
-                                           pj_snd_play_cb play_cb,
-                                           void *user_data)
+PJ_DEF(pj_status_t) pj_snd_open_player( int index,
+                                        unsigned clock_rate,
+                                        unsigned channel_count,
+                                        unsigned samples_per_frame,
+                                        unsigned bits_per_sample,
+                                        pj_snd_play_cb play_cb,
+                                        void *user_data,
+                                        pj_snd_stream **p_snd_strm )
 {
     PJ_UNUSED_ARG(index);
-    PJ_UNUSED_ARG(param);
+    PJ_UNUSED_ARG(clock_rate);
+    PJ_UNUSED_ARG(channel_count);
+    PJ_UNUSED_ARG(samples_per_frame);
+    PJ_UNUSED_ARG(bits_per_sample);
     PJ_UNUSED_ARG(play_cb);
     PJ_UNUSED_ARG(user_data);
-    return (void*)1;
+
+    *p_snd_strm = (void*)1;
+
+    return PJ_SUCCESS;
 }
 
@@ -92 +114 @@
     return PJ_SUCCESS;
 }
+
+
+#endif  /* PJMEDIA_HAS_NULL_SOUND */