commit 398275d2b5b8a97e3630c7d11340a163871d31d1
Author:     Simon Howard <fraggle@soulsphere.org>
AuthorDate: Sat Aug 3 16:42:47 2019 -0400
Commit:     Simon Howard <fraggle@soulsphere.org>
CommitDate: Sat Aug 3 16:42:47 2019 -0400

    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.
---
 midiproc/proto.h | 2 +-
 src/i_midipipe.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/midiproc/proto.h b/midiproc/proto.h
index 790c9df5..dfba7d8c 100755
--- 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,
diff --git a/src/i_midipipe.c b/src/i_midipipe.c
index 1df04429..8076a8e3 100644
--- a/src/i_midipipe.c
+++ b/src/i_midipipe.c
@@ -221,7 +221,7 @@ static boolean BlockForAck(void)
     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);