Merge branch 'remove-unused-music-types' into 'next'

Remove unused music type enums

See merge request STJr/SRB2!1253
This commit is contained in:
James R 2020-11-22 17:16:35 -05:00
commit eb28532244
2 changed files with 0 additions and 4 deletions

View file

@ -10135,7 +10135,6 @@ struct {
// music types
{"MU_NONE", MU_NONE},
{"MU_CMD", MU_CMD},
{"MU_WAV", MU_WAV},
{"MU_MOD", MU_MOD},
{"MU_MID", MU_MID},

View file

@ -21,15 +21,12 @@
// copied from SDL mixer, plus GME
typedef enum {
MU_NONE,
MU_CMD,
MU_WAV,
MU_MOD,
MU_MID,
MU_OGG,
MU_MP3,
MU_MP3_MAD_UNUSED, // use MU_MP3 instead
MU_FLAC,
MU_MODPLUG_UNUSED, // use MU_MOD instead
MU_GME,
MU_MOD_EX, // libopenmpt
MU_MID_EX // Non-native MIDI