Modify all applications because of changed in WAV port API (removed user_data from argument)

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

10 files changed, 8 insertions, 18 deletions

diff --git a/pjsip-apps/src/pjsua/pjsua_app.c b/pjsip-apps/src/pjsua/pjsua_app.c
index ded37e2e..b2413adf 100644
--- a/pjsip-apps/src/pjsua/pjsua_app.c
+++ b/pjsip-apps/src/pjsua/pjsua_app.c
@@ -2076,7 +2076,7 @@ pj_status_t app_init(int argc, char *argv[])
 
     /* Optionally registers WAV file */
     if (app_config.wav_file.slen) {
-	status = pjsua_player_create(&app_config.wav_file, 0, NULL,
+	status = pjsua_player_create(&app_config.wav_file, 0, 
 				     &app_config.wav_id);
 	if (status != PJ_SUCCESS)
 	    goto on_error;
diff --git a/pjsip-apps/src/samples/confsample.c b/pjsip-apps/src/samples/confsample.c
index d87a916a..c37db4a7 100644
--- a/pjsip-apps/src/samples/confsample.c
+++ b/pjsip-apps/src/samples/confsample.c
@@ -199,7 +199,7 @@ int main(int argc, char *argv[])
     status = pjmedia_wav_writer_port_create(  pool, "confrecord.wav",
 					      clock_rate, channel_count,
 					      samples_per_frame, 
-					      bits_per_sample, 0, 0, NULL,
+					      bits_per_sample, 0, 0, 
 					      &rec_port);
     if (status != PJ_SUCCESS) {
 	app_perror(THIS_FILE, "Unable to create WAV writer", status);
@@ -222,7 +222,6 @@ int main(int argc, char *argv[])
 			0,		    /* use default ptime */
 			0,		    /* flags	    */
 			0,		    /* buf size	    */
-			NULL,		    /* user data    */
 			&file_port[i]	    /* result	    */
 			);
 	if (status != PJ_SUCCESS) {
diff --git a/pjsip-apps/src/samples/debug.c b/pjsip-apps/src/samples/debug.c
index 2574c188..259a7def 100644
--- a/pjsip-apps/src/samples/debug.c
+++ b/pjsip-apps/src/samples/debug.c
@@ -27,5 +27,5 @@
  * E.g.:
  *  #include "playfile.c"
  */
-#include "sndtest.c"
+#include "siprtp.c"
 
diff --git a/pjsip-apps/src/samples/level.c b/pjsip-apps/src/samples/level.c
index dcf6499d..278ad7a1 100644
--- a/pjsip-apps/src/samples/level.c
+++ b/pjsip-apps/src/samples/level.c
@@ -116,7 +116,6 @@ int main(int argc, char *argv[])
 					      0,	/* use default ptime*/
 					      0,	/* flags	    */
 					      0,	/* default buffer   */
-					      NULL,	/* user data	    */
 					      &file_port/* returned port    */
 					      );
     if (status != PJ_SUCCESS) {
diff --git a/pjsip-apps/src/samples/playfile.c b/pjsip-apps/src/samples/playfile.c
index 754304b3..387f0776 100644
--- a/pjsip-apps/src/samples/playfile.c
+++ b/pjsip-apps/src/samples/playfile.c
@@ -127,7 +127,6 @@ int main(int argc, char *argv[])
 					      20,	/* ptime.	    */
 					      0,	/* flags	    */
 					      0,	/* default buffer   */
-					      NULL,	/* user data	    */
 					      &file_port/* returned port    */
 					      );
     if (status != PJ_SUCCESS) {
diff --git a/pjsip-apps/src/samples/recfile.c b/pjsip-apps/src/samples/recfile.c
index 29aa8324..6c197f35 100644
--- a/pjsip-apps/src/samples/recfile.c
+++ b/pjsip-apps/src/samples/recfile.c
@@ -122,7 +122,7 @@ int main(int argc, char *argv[])
 					      NCHANNELS,
 					      SAMPLES_PER_FRAME,
 					      BITS_PER_SAMPLE,
-					      0, 0, NULL,
+					      0, 0, 
 					      &file_port);
     if (status != PJ_SUCCESS) {
 	app_perror(THIS_FILE, "Unable to open WAV file for writing", status);
diff --git a/pjsip-apps/src/samples/resampleplay.c b/pjsip-apps/src/samples/resampleplay.c
index 9c7b2f1f..e8d7aa26 100644
--- a/pjsip-apps/src/samples/resampleplay.c
+++ b/pjsip-apps/src/samples/resampleplay.c
@@ -121,7 +121,7 @@ int main(int argc, char *argv[])
 
     /* Create the file port. */
     status = pjmedia_wav_player_port_create( pool, argv[pj_optind], 0, 0,
-					     0, 0, &file_port);
+					     0, &file_port);
     if (status != PJ_SUCCESS) {
 	app_perror(THIS_FILE, "Unable to open file", status);
 	return 1;
diff --git a/pjsip-apps/src/samples/streamutil.c b/pjsip-apps/src/samples/streamutil.c
index 4609df0b..ca19fb60 100644
--- a/pjsip-apps/src/samples/streamutil.c
+++ b/pjsip-apps/src/samples/streamutil.c
@@ -374,7 +374,7 @@ int main(int argc, char *argv[])
 	wav_ptime = stream_port->info.samples_per_frame * 1000 /
 		    stream_port->info.clock_rate;
 	status = pjmedia_wav_player_port_create(pool, play_file, wav_ptime,
-						0, -1, NULL, &play_file_port);
+						0, -1, &play_file_port);
 	if (status != PJ_SUCCESS) {
 	    app_perror(THIS_FILE, "Unable to use file", status);
 	    goto on_exit;
diff --git a/pjsip/include/pjsua-lib/pjsua.h b/pjsip/include/pjsua-lib/pjsua.h
index 466c3196..b950be81 100644
--- a/pjsip/include/pjsua-lib/pjsua.h
+++ b/pjsip/include/pjsua-lib/pjsua.h
@@ -2235,14 +2235,12 @@ PJ_DECL(pj_status_t) pjsua_conf_disconnect(pjsua_conf_port_id source,
  *			formatted as 16bit PCM mono/single channel (any
  *			clock rate is supported).
  * @param options	Options (currently zero).
- * @param user_data	Arbitrary user data to be associated with the player.
  * @param p_id		Pointer to receive player ID.
  *
  * @return		PJ_SUCCESS on success, or the appropriate error code.
  */
 PJ_DECL(pj_status_t) pjsua_player_create(const pj_str_t *filename,
 					 unsigned options,
-					 void *user_data,
 					 pjsua_player_id *p_id);
 
 
@@ -2297,8 +2295,6 @@ PJ_DECL(pj_status_t) pjsua_player_destroy(pjsua_player_id id);
  * @param max_size	Maximum file size. Specify -1 to remove size
  *			limitation.
  * @param options	Optional options.
- * @param user_data	Arbitrary user data which will be given in the 
- *			callback once the recording complete.
  * @param p_id		Pointer to receive the recorder instance.
  *
  * @return		PJ_SUCCESS on success, or the appropriate error code.
@@ -2308,7 +2304,6 @@ PJ_DECL(pj_status_t) pjsua_recorder_create(const pj_str_t *filename,
 					   const pj_str_t *encoding,
 					   pj_ssize_t max_size,
 					   unsigned options,
-					   void *user_data,
 					   pjsua_recorder_id *p_id);
 
 
diff --git a/pjsip/src/pjsua-lib/pjsua_media.c b/pjsip/src/pjsua-lib/pjsua_media.c
index 730e3d89..5a462eb2 100644
--- a/pjsip/src/pjsua-lib/pjsua_media.c
+++ b/pjsip/src/pjsua-lib/pjsua_media.c
@@ -600,7 +600,6 @@ PJ_DEF(pj_status_t) pjsua_conf_disconnect( pjsua_conf_port_id source,
  */
 PJ_DEF(pj_status_t) pjsua_player_create( const pj_str_t *filename,
 					 unsigned options,
-					 void *user_data,
 					 pjsua_player_id *p_id)
 {
     unsigned slot, file_id;
@@ -630,7 +629,7 @@ PJ_DEF(pj_status_t) pjsua_player_create( const pj_str_t *filename,
     status = pjmedia_wav_player_port_create(pjsua_var.pool, path,
 					    pjsua_var.mconf_cfg.samples_per_frame *
 					      1000 / pjsua_var.media_cfg.clock_rate, 
-					    0, 0, user_data, &port);
+					    0, 0, &port);
     if (status != PJ_SUCCESS) {
 	PJSUA_UNLOCK();
 	pjsua_perror(THIS_FILE, "Unable to open file for playback", status);
@@ -721,7 +720,6 @@ PJ_DEF(pj_status_t) pjsua_recorder_create( const pj_str_t *filename,
 					   const pj_str_t *encoding,
 					   pj_ssize_t max_size,
 					   unsigned options,
-					   void *user_data,
 					   pjsua_recorder_id *p_id)
 {
     unsigned slot, file_id;
@@ -753,7 +751,7 @@ PJ_DEF(pj_status_t) pjsua_recorder_create( const pj_str_t *filename,
 					    pjsua_var.mconf_cfg.channel_count,
 					    pjsua_var.mconf_cfg.samples_per_frame,
 					    pjsua_var.mconf_cfg.bits_per_sample, 
-					    0, 0, user_data, &port);
+					    0, 0, &port);
     if (status != PJ_SUCCESS) {
 	PJSUA_UNLOCK();
 	pjsua_perror(THIS_FILE, "Unable to open file for recording", status);