From 1dc71c6e57798719813f432c4986a41b53c1fcb3 Mon Sep 17 00:00:00 2001 From: Scott Duensing Date: Wed, 8 Nov 2023 21:12:26 -0600 Subject: [PATCH] Fixed libxmp preventing mod.h from being committed. --- .../SDL2_mixer/external/libxmp/.gitignore | 2 +- .../external/libxmp/src/loaders/mod.h | 59 +++++++++++++++++++ 2 files changed, 60 insertions(+), 1 deletion(-) create mode 100644 thirdparty/SDL2_mixer/external/libxmp/src/loaders/mod.h diff --git a/thirdparty/SDL2_mixer/external/libxmp/.gitignore b/thirdparty/SDL2_mixer/external/libxmp/.gitignore index e03f506bc..e4a67653e 100644 --- a/thirdparty/SDL2_mixer/external/libxmp/.gitignore +++ b/thirdparty/SDL2_mixer/external/libxmp/.gitignore @@ -45,7 +45,7 @@ Makefile.vc.tmp *.amf *.umx *.gtk -mod.* +# mod.* AS.* *.xz diff --git a/thirdparty/SDL2_mixer/external/libxmp/src/loaders/mod.h b/thirdparty/SDL2_mixer/external/libxmp/src/loaders/mod.h new file mode 100644 index 000000000..682aef022 --- /dev/null +++ b/thirdparty/SDL2_mixer/external/libxmp/src/loaders/mod.h @@ -0,0 +1,59 @@ +/* Extended Module Player + * Copyright (C) 1996-2021 Claudio Matsuoka and Hipolito Carraro Jr + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +#ifndef LIBXMP_LOADERS_MOD_H +#define LIBXMP_LOADERS_MOD_H + +struct mod_instrument { + uint8 name[22]; /* Instrument name */ + uint16 size; /* Sample length in 16-bit words */ + int8 finetune; /* Finetune (signed nibble) */ + int8 volume; /* Linear playback volume */ + uint16 loop_start; /* Loop start in 16-bit words */ + uint16 loop_size; /* Loop length in 16-bit words */ +}; + +struct mod_header { + uint8 name[20]; + struct mod_instrument ins[31]; + uint8 len; + uint8 restart; /* Number of patterns in Soundtracker, + * Restart in Noisetracker/Startrekker, + * 0x7F in Protracker + */ + uint8 order[128]; + uint8 magic[4]; +}; + +#ifndef LIBXMP_CORE_PLAYER +/* Soundtracker 15-instrument module header */ + +struct st_header { + uint8 name[20]; + struct mod_instrument ins[15]; + uint8 len; + uint8 restart; + uint8 order[128]; +}; +#endif + +#endif /* LIBXMP_LOADERS_MOD_H */