Fixed minor compliation warning in transport_udp.c, also corrected misleading comments, and added memory based capture/playback to the Makefile

git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@558 74dad513-b988-da41-8d7b-12977e46ad98

3 files changed, 19 insertions, 17 deletions

diff --git a/pjmedia/build/Makefile b/pjmedia/build/Makefile
index 2375aa35..0e5e0618 100644
--- a/pjmedia/build/Makefile
+++ b/pjmedia/build/Makefile
@@ -65,12 +65,12 @@ export _LDFLAGS := $(subst /,$(HOST_PSEP),$(PJMEDIA_LIB)) \
 export PJMEDIA_SRCDIR = ../src/pjmedia
 export PJMEDIA_OBJS += $(OS_OBJS) $(M_OBJS) $(CC_OBJS) $(HOST_OBJS) \
 			clock_thread.o codec.o conference.o endpoint.o errno.o \
-			wav_player.o wav_writer.o g711.o jbuf.o \
-			master_port.o null_port.o plc_common.o plc_g711.o \
+			g711.o jbuf.o master_port.o mem_capture.o mem_player.o \
+			null_port.o plc_common.o plc_g711.o \
 			port.o resample.o \
 			resample_port.o rtcp.o rtp.o sdp.o sdp_cmp.o sdp_neg.o \
 			session.o silencedet.o sound_port.o stream.o \
-			transport_udp.o wave.o \
+			transport_udp.o wav_player.o wav_writer.o wave.o \
 			$(SOUND_OBJS) $(NULLSOUND_OBJS)
 
 export PJMEDIA_CFLAGS += $(_CFLAGS)
diff --git a/pjmedia/include/pjmedia.h b/pjmedia/include/pjmedia.h
index 3df67340..a6c0e49b 100644
--- a/pjmedia/include/pjmedia.h
+++ b/pjmedia/include/pjmedia.h
@@ -33,6 +33,7 @@
 #include <pjmedia/g711.h>
 #include <pjmedia/jbuf.h>
 #include <pjmedia/master_port.h>
+#include <pjmedia/mem_port.h>
 #include <pjmedia/null_port.h>
 #include <pjmedia/plc.h>
 #include <pjmedia/port.h>
@@ -41,12 +42,13 @@
 #include <pjmedia/rtp.h>
 #include <pjmedia/sdp.h>
 #include <pjmedia/sdp_neg.h>
-#include <pjmedia/silencedet.h>
 #include <pjmedia/session.h>
-#include <pjmedia/transport.h>
-#include <pjmedia/transport_udp.h>
+#include <pjmedia/silencedet.h>
 #include <pjmedia/sound.h>
 #include <pjmedia/sound_port.h>
+#include <pjmedia/splitcomb.h>
+#include <pjmedia/transport.h>
+#include <pjmedia/transport_udp.h>
 #include <pjmedia/wav_port.h>
 #include <pjmedia/wave.h>
 
diff --git a/pjmedia/src/pjmedia/transport_udp.c b/pjmedia/src/pjmedia/transport_udp.c
index 31501e4e..b6b2e4f2 100644
--- a/pjmedia/src/pjmedia/transport_udp.c
+++ b/pjmedia/src/pjmedia/transport_udp.c
@@ -51,10 +51,10 @@ struct transport_udp
     pj_bool_t		attached;	/**< Has attachment?		    */
     pj_sockaddr_in	rem_rtp_addr;	/**< Remote RTP address		    */
     pj_sockaddr_in	rem_rtcp_addr;	/**< Remote RTCP address	    */
-    void  (*rtp_cb)(	pjmedia_stream*,/**< To report incoming RTP.	    */
+    void  (*rtp_cb)(	void*,		/**< To report incoming RTP.	    */
 			const void*,
 			pj_ssize_t);
-    void  (*rtcp_cb)(	pjmedia_stream*,/**< To report incoming RTCP.	    */
+    void  (*rtcp_cb)(	void*,		/**< To report incoming RTCP.	    */
 			const void*,
 			pj_ssize_t);
 
@@ -321,7 +321,7 @@ PJ_DEF(pj_status_t) pjmedia_transport_udp_close(pjmedia_transport *tp)
     /* Sanity check */
     PJ_ASSERT_RETURN(tp, PJ_EINVAL);
 
-    /* Must not close while stream is using this */
+    /* Must not close while application is using this */
     PJ_ASSERT_RETURN(!udp->attached, PJ_EINVALIDOP);
     
 
@@ -448,7 +448,7 @@ static void on_rx_rtcp(pj_ioqueue_key_t *key,
 }
 
 
-/* Called by stream to initialize the transport */
+/* Called by application to initialize the transport */
 static pj_status_t transport_attach(   pjmedia_transport *tp,
 				       void *user_data,
 				       const pj_sockaddr_t *rem_addr,
@@ -465,10 +465,10 @@ static pj_status_t transport_attach(   pjmedia_transport *tp,
     /* Validate arguments */
     PJ_ASSERT_RETURN(tp && rem_addr && addr_len, PJ_EINVAL);
 
-    /* Must not be "attached" to existing stream */
+    /* Must not be "attached" to existing application */
     PJ_ASSERT_RETURN(!udp->attached, PJ_EINVALIDOP);
 
-    /* "Attach" the stream: */
+    /* "Attach" the application: */
 
     /* Copy remote RTP address */
     pj_memcpy(&udp->rem_rtp_addr, rem_addr, sizeof(pj_sockaddr_in));
@@ -490,7 +490,7 @@ static pj_status_t transport_attach(   pjmedia_transport *tp,
 }
 
 
-/* Called by stream when it no longer needs the transport */
+/* Called by application when it no longer needs the transport */
 static void transport_detach( pjmedia_transport *tp,
 			      void *user_data)
 {
@@ -504,17 +504,17 @@ static void transport_detach( pjmedia_transport *tp,
     /* As additional checking, check if the same user data is specified */
     pj_assert(user_data == udp->user_data);
 
-    /* First, mark stream as unattached */
+    /* First, mark transport as unattached */
     udp->attached = PJ_FALSE;
 
-    /* Clear up stream infos from transport */
+    /* Clear up application infos from transport */
     udp->rtp_cb = NULL;
     udp->rtcp_cb = NULL;
     udp->user_data = NULL;
 }
 
 
-/* Called by stream to send RTP packet */
+/* Called by application to send RTP packet */
 static pj_status_t transport_send_rtp( pjmedia_transport *tp,
 				       const void *pkt,
 				       pj_size_t size)
@@ -556,7 +556,7 @@ static pj_status_t transport_send_rtp( pjmedia_transport *tp,
     return status;
 }
 
-/* Called by stream to send RTCP packet */
+/* Called by application to send RTCP packet */
 static pj_status_t transport_send_rtcp(pjmedia_transport *tp,
 				       const void *pkt,
 				       pj_size_t size)