Make toxcore code C++ compatible.

It is still C code, so still compatible with C compilers as well. This
change lets us see more clearly where implicit conversions occur by
making them explicit.

1 files changed, 11 insertions, 10 deletions

diff --git a/toxav/video.c b/toxav/video.c
index de028c7c..5bb3b8ae 100644
--- a/toxav/video.c
+++ b/toxav/video.c
@@ -39,7 +39,8 @@
 
 VCSession *vc_new(Logger *log, ToxAV *av, uint32_t friend_number, toxav_video_receive_frame_cb *cb, void *cb_data)
 {
-    VCSession *vc = calloc(sizeof(VCSession), 1);
+    VCSession *vc = (VCSession *)calloc(sizeof(VCSession), 1);
+    vpx_codec_err_t rc;
 
     if (!vc) {
         LOGGER_WARNING(log, "Allocation failed! Application might misbehave!");
@@ -56,7 +57,7 @@ VCSession *vc_new(Logger *log, ToxAV *av, uint32_t friend_number, toxav_video_re
         goto BASE_CLEANUP;
     }
 
-    int rc = vpx_codec_dec_init(vc->decoder, VIDEO_CODEC_DECODER_INTERFACE, NULL, 0);
+    rc = vpx_codec_dec_init(vc->decoder, VIDEO_CODEC_DECODER_INTERFACE, NULL, 0);
 
     if (rc != VPX_CODEC_OK) {
         LOGGER_ERROR(log, "Init video_decoder failed: %s", vpx_codec_err_to_string(rc));
@@ -116,7 +117,7 @@ BASE_CLEANUP_1:
     vpx_codec_destroy(vc->decoder);
 BASE_CLEANUP:
     pthread_mutex_destroy(vc->queue_mutex);
-    rb_kill(vc->vbuf_raw);
+    rb_kill((RingBuffer *)vc->vbuf_raw);
     free(vc);
     return NULL;
 }
@@ -131,11 +132,11 @@ void vc_kill(VCSession *vc)
 
     void *p;
 
-    while (rb_read(vc->vbuf_raw, &p)) {
+    while (rb_read((RingBuffer *)vc->vbuf_raw, &p)) {
         free(p);
     }
 
-    rb_kill(vc->vbuf_raw);
+    rb_kill((RingBuffer *)vc->vbuf_raw);
 
     pthread_mutex_destroy(vc->queue_mutex);
 
@@ -150,11 +151,11 @@ void vc_iterate(VCSession *vc)
 
     struct RTPMessage *p;
 
-    int rc;
+    vpx_codec_err_t rc;
 
     pthread_mutex_lock(vc->queue_mutex);
 
-    if (rb_read(vc->vbuf_raw, (void **)&p)) {
+    if (rb_read((RingBuffer *)vc->vbuf_raw, (void **)&p)) {
         pthread_mutex_unlock(vc->queue_mutex);
 
         rc = vpx_codec_decode(vc->decoder, p->data, p->len, NULL, MAX_DECODE_TIME_US);
@@ -192,7 +193,7 @@ int vc_queue_message(void *vcp, struct RTPMessage *msg)
         return -1;
     }
 
-    VCSession *vc = vcp;
+    VCSession *vc = (VCSession *)vcp;
 
     if (msg->header.pt == (rtp_TypeVideo + 2) % 128) {
         LOGGER_WARNING(vc->log, "Got dummy!");
@@ -207,7 +208,7 @@ int vc_queue_message(void *vcp, struct RTPMessage *msg)
     }
 
     pthread_mutex_lock(vc->queue_mutex);
-    free(rb_write(vc->vbuf_raw, msg));
+    free(rb_write((RingBuffer *)vc->vbuf_raw, msg));
     {
         /* Calculate time took for peer to send us this frame */
         uint32_t t_lcfd = current_time_monotonic() - vc->linfts;
@@ -225,7 +226,7 @@ int vc_reconfigure_encoder(VCSession *vc, uint32_t bit_rate, uint16_t width, uin
     }
 
     vpx_codec_enc_cfg_t cfg = *vc->encoder->config.enc;
-    int rc;
+    vpx_codec_err_t rc;
 
     if (cfg.rc_target_bitrate == bit_rate && cfg.g_w == width && cfg.g_h == height) {
         return 0; /* Nothing changed */