From 51d18236c8effffb14ffe6c5e3f738c1ceb1ae25 Mon Sep 17 00:00:00 2001 From: iphydf Date: Mon, 19 Sep 2016 21:49:04 +0100 Subject: Revert "Make ToxAV stateless" This reverts commit 21f8db12c45bd56293262cd4abfb73cd9abec821. It is currently broken. Incoming call callbacks are not invoked, and instead the client goes offline immediately. --- toxav/video.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'toxav/video.h') diff --git a/toxav/video.h b/toxav/video.h index e24d98c9..335240c7 100644 --- a/toxav/video.h +++ b/toxav/video.h @@ -56,14 +56,14 @@ typedef struct VCSession_s { ToxAV *av; uint32_t friend_number; - toxav_video_receive_frame_cb *on_video_frame; /* Video frame receive callback */ + PAIR(toxav_video_receive_frame_cb *, void *) vcb; /* Video frame receive callback */ pthread_mutex_t queue_mutex[1]; } VCSession; -VCSession *vc_new(Logger *log, ToxAV *av, uint32_t friend_number, toxav_video_receive_frame_cb *cb); +VCSession *vc_new(Logger *log, ToxAV *av, uint32_t friend_number, toxav_video_receive_frame_cb *cb, void *cb_data); void vc_kill(VCSession *vc); -void vc_iterate(VCSession *vc, void *userdata); +void vc_iterate(VCSession *vc); int vc_queue_message(void *vcp, struct RTPMessage *msg); int vc_reconfigure_encoder(VCSession *vc, uint32_t bit_rate, uint16_t width, uint16_t height); -- cgit v1.2.3