summaryrefslogtreecommitdiff
path: root/toxav/toxav.c
diff options
context:
space:
mode:
Diffstat (limited to 'toxav/toxav.c')
-rw-r--r--toxav/toxav.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/toxav/toxav.c b/toxav/toxav.c
index e0ddc731..977415dc 100644
--- a/toxav/toxav.c
+++ b/toxav/toxav.c
@@ -75,14 +75,13 @@ typedef struct _ToxAv {
75 * it will result in undefined behaviour. 75 * it will result in undefined behaviour.
76 * 76 *
77 * @param messenger The messenger handle. 77 * @param messenger The messenger handle.
78 * @param useragent The agent handling A/V session (i.e. phone). 78 * @param userdata The agent handling A/V session (i.e. phone).
79 * @param ua_name Useragent name.
80 * @param video_width Width of video frame. 79 * @param video_width Width of video frame.
81 * @param video_height Height of video frame. 80 * @param video_height Height of video frame.
82 * @return ToxAv* 81 * @return ToxAv*
83 * @retval NULL On error. 82 * @retval NULL On error.
84 */ 83 */
85ToxAv *toxav_new( Tox *messenger, void *useragent, const char *ua_name , uint16_t video_width, uint16_t video_height) 84ToxAv *toxav_new( Tox *messenger, void *userdata, uint16_t video_width, uint16_t video_height)
86{ 85{
87 ToxAv *av = calloc ( sizeof(ToxAv), 1); 86 ToxAv *av = calloc ( sizeof(ToxAv), 1);
88 87
@@ -91,7 +90,7 @@ ToxAv *toxav_new( Tox *messenger, void *useragent, const char *ua_name , uint16_
91 90
92 av->messenger = (Messenger *)messenger; 91 av->messenger = (Messenger *)messenger;
93 92
94 av->msi_session = msi_init_session(av->messenger, (const unsigned char *) ua_name ); 93 av->msi_session = msi_init_session(av->messenger);
95 av->msi_session->agent_handler = av; 94 av->msi_session->agent_handler = av;
96 95
97 av->rtp_sessions[0] = av->rtp_sessions [1] = NULL; 96 av->rtp_sessions[0] = av->rtp_sessions [1] = NULL;
@@ -102,7 +101,7 @@ ToxAv *toxav_new( Tox *messenger, void *useragent, const char *ua_name , uint16_
102 av->cs = codec_init_session(AUDIO_BITRATE, AUDIO_FRAME_DURATION, AUDIO_SAMPLE_RATE, AUDIO_CHANNELS, video_width, 101 av->cs = codec_init_session(AUDIO_BITRATE, AUDIO_FRAME_DURATION, AUDIO_SAMPLE_RATE, AUDIO_CHANNELS, video_width,
103 video_height, VIDEO_BITRATE); 102 video_height, VIDEO_BITRATE);
104 103
105 av->agent_handler = useragent; 104 av->agent_handler = userdata;
106 105
107 return av; 106 return av;
108} 107}