shithub: choc

Info  •  Files  •  Log  •  Branches

midiproc now compiles with no /W4 warnings

--- a/midiproc/main.c

+++ b/midiproc/main.c

@@ -143,12 +143,14 @@

     RegisterSong(filename);

+    // FIXME: We should probably have a function for writing Int16's into

+    //        buffers, as opposed to simply winging it.

     unsigned int i = NET_MIDIPIPE_PACKET_TYPE_REGISTER_SONG_ACK;

     CHAR buffer[2];

     buffer[0] = (i >> 8) & 0xff;

     buffer[1] = i & 0xff;

-    BOOL ok = WriteFile(midi_process_out, buffer, sizeof(buffer),

+    WriteFile(midi_process_out, buffer, sizeof(buffer),

         NULL, NULL);

     return true;

@@ -157,7 +159,7 @@

 boolean MidiPipe_SetVolume(buffer_reader_t *reader)

 {

     int vol;

-    boolean ok = Reader_ReadInt32(reader, &vol);

+    boolean ok = Reader_ReadInt32(reader, (uint32_t*)&vol);

     if (!ok)

     {

         return false;

@@ -171,7 +173,7 @@

 boolean MidiPipe_PlaySong(buffer_reader_t *reader)

 {

     int loops;

-    boolean ok = Reader_ReadInt32(reader, &loops);

+    boolean ok = Reader_ReadInt32(reader, (uint32_t*)&loops);

     if (!ok)

     {

         return false;

@@ -215,7 +217,7 @@

     case NET_MIDIPIPE_PACKET_TYPE_STOP_SONG:

         return MidiPipe_StopSong();

     case NET_MIDIPIPE_PACKET_TYPE_SHUTDOWN:

-        return MidiPipe_Shutdown(reader);

+        return MidiPipe_Shutdown();

     default:

         return false;

     }

@@ -272,7 +274,7 @@

             &pipe_buffer_read, NULL);

         if (!wok)

         {

-            return false;

+            break;

         }

         else if (pipe_buffer_read == 0)

         {

@@ -285,13 +287,13 @@

             &pipe_buffer_read, NULL);

         if (!wok)

         {

-            return false;

+            break;

         }

         ok = Buffer_Push(buffer, pipe_buffer, pipe_buffer_read);

         if (!ok)

         {

-            return false;

+            break;

         }

         do