shithub: choc

Info  •  Files  •  Log  •  Branches

midiproc: Stop using REGISTER_SONG_ACK messages.

We use MIDIPIPE_PACKET_TYPE_ACK for everything now, so this is
redundant. Fixes problem encountered in testing #1186; to be
completely sure, rename the old message type entirely so that nothing
can depend on it any more.

--- a/midiproc/proto.h

+++ b/midiproc/proto.h

@@ -20,7 +20,7 @@

 typedef enum {

     MIDIPIPE_PACKET_TYPE_REGISTER_SONG,

-    MIDIPIPE_PACKET_TYPE_REGISTER_SONG_ACK,

+    MIDIPIPE_PACKET_TYPE__DEPRECATED_1,

     MIDIPIPE_PACKET_TYPE_SET_VOLUME,

     MIDIPIPE_PACKET_TYPE_PLAY_SONG,

     MIDIPIPE_PACKET_TYPE_STOP_SONG,

--- a/src/i_midipipe.c

+++ b/src/i_midipipe.c

@@ -221,7 +221,7 @@

     net_packet_t *packet;

     packet = NET_NewPacket(2);

-    NET_WriteInt16(packet, MIDIPIPE_PACKET_TYPE_REGISTER_SONG_ACK);

+    NET_WriteInt16(packet, MIDIPIPE_PACKET_TYPE_ACK);

     ok = ExpectPipe(packet);

     NET_FreePacket(packet);