Avoid use of global mutable state in mono_time on win32.

This uses a trick to get read-write access to `this` from a `const`
member function, similar to C++ `mutable`, but uglier.

5 files changed, 10 insertions, 10 deletions

diff --git a/toxav/audio.c b/toxav/audio.c
index 5da41570..de007424 100644
--- a/toxav/audio.c
+++ b/toxav/audio.c
@@ -44,7 +44,7 @@ static bool reconfigure_audio_decoder(ACSession *ac, int32_t sampling_rate, int8
 
 
 
-ACSession *ac_new(const Mono_Time *mono_time, const Logger *log, ToxAV *av, uint32_t friend_number,
+ACSession *ac_new(Mono_Time *mono_time, const Logger *log, ToxAV *av, uint32_t friend_number,
                   toxav_audio_receive_frame_cb *cb, void *cb_data)
 {
     ACSession *ac = (ACSession *)calloc(sizeof(ACSession), 1);
@@ -216,7 +216,7 @@ void ac_iterate(ACSession *ac)
     pthread_mutex_unlock(ac->queue_mutex);
 }
 
-int ac_queue_message(const Mono_Time *mono_time, void *acp, struct RTPMessage *msg)
+int ac_queue_message(Mono_Time *mono_time, void *acp, struct RTPMessage *msg)
 {
     if (!acp || !msg) {
         return -1;
diff --git a/toxav/audio.h b/toxav/audio.h
index 1a33a2ae..a323a08e 100644
--- a/toxav/audio.h
+++ b/toxav/audio.h
@@ -50,7 +50,7 @@
 #define AUDIO_MAX_BUFFER_SIZE_BYTES (AUDIO_MAX_BUFFER_SIZE_PCM16 * 2)
 
 typedef struct ACSession_s {
-    const Mono_Time *mono_time;
+    Mono_Time *mono_time;
     const Logger *log;
 
     /* encoding */
@@ -78,11 +78,11 @@ typedef struct ACSession_s {
     void *acb_user_data;
 } ACSession;
 
-ACSession *ac_new(const Mono_Time *mono_time, const Logger *log, ToxAV *av, uint32_t friend_number,
+ACSession *ac_new(Mono_Time *mono_time, const Logger *log, ToxAV *av, uint32_t friend_number,
                   toxav_audio_receive_frame_cb *cb, void *cb_data);
 void ac_kill(ACSession *ac);
 void ac_iterate(ACSession *ac);
-int ac_queue_message(const Mono_Time *mono_time, void *acp, struct RTPMessage *msg);
+int ac_queue_message(Mono_Time *mono_time, void *acp, struct RTPMessage *msg);
 int ac_reconfigure_encoder(ACSession *ac, int32_t bit_rate, int32_t sampling_rate, uint8_t channels);
 
 #endif /* AUDIO_H */
diff --git a/toxav/rtp.h b/toxav/rtp.h
index 42997594..e068f6ac 100644
--- a/toxav/rtp.h
+++ b/toxav/rtp.h
@@ -159,7 +159,7 @@ struct RTPWorkBufferList {
 
 #define DISMISS_FIRST_LOST_VIDEO_PACKET_COUNT 10
 
-typedef int rtp_m_cb(const Mono_Time *mono_time, void *cs, struct RTPMessage *msg);
+typedef int rtp_m_cb(Mono_Time *mono_time, void *cs, struct RTPMessage *msg);
 
 /**
  * RTP control session.
diff --git a/toxav/video.c b/toxav/video.c
index 3f4d96e1..ab47ae97 100644
--- a/toxav/video.c
+++ b/toxav/video.c
@@ -159,7 +159,7 @@ static void vc_init_encoder_cfg(const Logger *log, vpx_codec_enc_cfg_t *cfg, int
 #endif
 }
 
-VCSession *vc_new(const Mono_Time *mono_time, const Logger *log, ToxAV *av, uint32_t friend_number,
+VCSession *vc_new(Mono_Time *mono_time, const Logger *log, ToxAV *av, uint32_t friend_number,
                   toxav_video_receive_frame_cb *cb, void *cb_data)
 {
     VCSession *vc = (VCSession *)calloc(sizeof(VCSession), 1);
@@ -357,7 +357,7 @@ void vc_iterate(VCSession *vc)
     }
 }
 
-int vc_queue_message(const Mono_Time *mono_time, void *vcp, struct RTPMessage *msg)
+int vc_queue_message(Mono_Time *mono_time, void *vcp, struct RTPMessage *msg)
 {
     /* This function is called with complete messages
      * they have already been assembled.
diff --git a/toxav/video.h b/toxav/video.h
index 2eee1c05..16f4658b 100644
--- a/toxav/video.h
+++ b/toxav/video.h
@@ -60,11 +60,11 @@ typedef struct VCSession_s {
     pthread_mutex_t queue_mutex[1];
 } VCSession;
 
-VCSession *vc_new(const Mono_Time *mono_time, const Logger *log, ToxAV *av, uint32_t friend_number,
+VCSession *vc_new(Mono_Time *mono_time, const 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);
-int vc_queue_message(const Mono_Time *mono_time, void *vcp, struct RTPMessage *msg);
+int vc_queue_message(Mono_Time *mono_time, void *vcp, struct RTPMessage *msg);
 int vc_reconfigure_encoder(VCSession *vc, uint32_t bit_rate, uint16_t width, uint16_t height, int16_t kf_max_dist);
 
 #endif /* VIDEO_H */