Add some casting to keep MSVC happy

[ardour.git] / libs / evoral / src / libsmf / smf.c

diff --git a/libs/evoral/src/libsmf/smf.c b/libs/evoral/src/libsmf/smf.c
index b79d7543b639d52cf845972bc50ceb977c65b9da..67cc7b889e7b8c48a4c67d892b2615ea7315c098 100644 (file)
--- a/libs/evoral/src/libsmf/smf.c
+++ b/libs/evoral/src/libsmf/smf.c
@@ -39,7 +39,11 @@
 #include <assert.h>
 #include <math.h>
 #include <errno.h>
+#ifdef PLATFORM_WINDOWS
+#include <winsock2.h>
+#else
 #include <arpa/inet.h>
+#endif
 #include "smf.h"
 #include "smf_private.h"
 
@@ -52,7 +56,7 @@ smf_new(void)
 {
        int cantfail;
 
-       smf_t *smf = malloc(sizeof(smf_t));
+       smf_t *smf = (smf_t*)malloc(sizeof(smf_t));
        if (smf == NULL) {
                g_critical("Cannot allocate smf_t structure: %s", strerror(errno));
                return (NULL);
@@ -85,7 +89,7 @@ smf_delete(smf_t *smf)
 {
        /* Remove all the tracks, from last to first. */
        while (smf->tracks_array->len > 0)
-               smf_track_delete(g_ptr_array_index(smf->tracks_array, smf->tracks_array->len - 1));
+               smf_track_delete((smf_track_t*)g_ptr_array_index(smf->tracks_array, smf->tracks_array->len - 1));
 
        smf_fini_tempo(smf);
 
@@ -105,7 +109,7 @@ smf_delete(smf_t *smf)
 smf_track_t *
 smf_track_new(void)
 {
-       smf_track_t *track = malloc(sizeof(smf_track_t));
+       smf_track_t *track = (smf_track_t*)malloc(sizeof(smf_track_t));
        if (track == NULL) {
                g_critical("Cannot allocate smf_track_t structure: %s", strerror(errno));
                return (NULL);
@@ -129,15 +133,21 @@ smf_track_delete(smf_track_t *track)
        assert(track);
        assert(track->events_array);
 
-       /* Remove all the events, from last to first. */
-       while (track->events_array->len > 0)
-               smf_event_delete(g_ptr_array_index(track->events_array, track->events_array->len - 1));
+       /* Remove all the events */
+       unsigned int i;
+       for (i = 0; i < track->events_array->len; ++i) {
+               smf_event_t* ev = (smf_event_t*)g_ptr_array_index(track->events_array, i);
+               free (ev->midi_buffer);
+               free (ev);
+       }
+
+       g_ptr_array_remove_range(track->events_array, 0, track->events_array->len);
+       track->number_of_events = 0;
 
        if (track->smf)
                smf_track_remove_from_smf(track);
 
        assert(track->events_array->len == 0);
-       assert(track->number_of_events == 0);
        g_ptr_array_free(track->events_array, TRUE);
 
        memset(track, 0, sizeof(smf_track_t));
@@ -151,7 +161,9 @@ smf_track_delete(smf_track_t *track)
 void
 smf_add_track(smf_t *smf, smf_track_t *track)
 {
+#ifndef NDEBUG
        int cantfail;
+#endif
 
        assert(track->smf == NULL);
 
@@ -162,8 +174,13 @@ smf_add_track(smf_t *smf, smf_track_t *track)
        track->track_number = smf->number_of_tracks;
 
        if (smf->number_of_tracks > 1) {
+#ifndef NDEBUG
                cantfail = smf_set_format(smf, 1);
                assert(!cantfail);
+#else
+               smf_set_format(smf, 1);
+#endif
+               
        }
 }
 
@@ -213,7 +230,7 @@ smf_track_remove_from_smf(smf_track_t *track)
 smf_event_t *
 smf_event_new(void)
 {
-       smf_event_t *event = malloc(sizeof(smf_event_t));
+       smf_event_t *event = (smf_event_t*)malloc(sizeof(smf_event_t));
        if (event == NULL) {
                g_critical("Cannot allocate smf_event_t structure: %s", strerror(errno));
                return (NULL);
@@ -246,7 +263,7 @@ smf_event_new_from_pointer(const void *midi_data, size_t len)
                return (NULL);
 
        event->midi_buffer_length = len;
-       event->midi_buffer = malloc(event->midi_buffer_length);
+       event->midi_buffer = (uint8_t*)malloc(event->midi_buffer_length);
        if (event->midi_buffer == NULL) {
                g_critical("Cannot allocate MIDI buffer structure: %s", strerror(errno));
                smf_event_delete(event);
@@ -336,7 +353,7 @@ smf_event_new_from_bytes(int first_byte, int second_byte, int third_byte)
        }
 
        event->midi_buffer_length = len;
-       event->midi_buffer = malloc(event->midi_buffer_length);
+       event->midi_buffer = (uint8_t*)malloc(event->midi_buffer_length);
        if (event->midi_buffer == NULL) {
                g_critical("Cannot allocate MIDI buffer structure: %s", strerror(errno));
                smf_event_delete(event);
@@ -773,7 +790,7 @@ smf_track_get_event_by_number(const smf_track_t *track, size_t event_number)
        if (event_number > track->number_of_events)
                return (NULL);
 
-       event = g_ptr_array_index(track->events_array, event_number - 1);
+       event = (smf_event_t*)g_ptr_array_index(track->events_array, event_number - 1);
 
        assert(event);
 
@@ -860,9 +877,8 @@ smf_get_next_event(smf_t *smf)
 void
 smf_skip_next_event(smf_t *smf)
 {
-       void *notused;
-
-       notused = smf_get_next_event(smf);
+       smf_event_t *ignored = smf_get_next_event(smf);
+       (void) ignored;
 }
 
 /**