summaryrefslogtreecommitdiff
path: root/pjsip
diff options
context:
space:
mode:
authorBenny Prijono <bennylp@teluu.com>2006-06-22 18:51:50 +0000
committerBenny Prijono <bennylp@teluu.com>2006-06-22 18:51:50 +0000
commit9dd1960aeccc73a2a6f52cc52fd38ee6b2830a32 (patch)
treef284be8d66b29680c4d5e78e064549513801a7b5 /pjsip
parent84697f0def74bfc01e0a0e6d0f904adc2db58276 (diff)
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
Diffstat (limited to 'pjsip')
-rw-r--r--pjsip/include/pjsua-lib/pjsua.h5
-rw-r--r--pjsip/src/pjsua-lib/pjsua_media.c6
2 files changed, 2 insertions, 9 deletions
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);