commit d57e99cf20ccd8cf736c6bcc0f88fbf95a6aa7ce
Merge: d0d9c197 949c81d7
Author: tpoppins <tpoppins@juno.com>
AuthorDate: Sun Dec 26 03:47:09 2021 -0500
Commit: GitHub <noreply@github.com>
CommitDate: Sun Dec 26 03:47:09 2021 -0500
Merge branch 'chocolate-doom:master' into sdl2-alttab-fix
.github/workflows/main.yml | 21 +-
CMakeLists.txt | 2 +-
Makefile.am | 2 +-
configure.ac | 8 +-
midiproc/.gitignore | 6 -
midiproc/CMakeLists.txt | 6 -
midiproc/Makefile.am | 13 -
midiproc/buffer.c | 254 -----------------
midiproc/buffer.h | 54 ----
midiproc/main.c | 463 ------------------------------
pkg/win32/GNUmakefile | 3 -
src/CMakeLists.txt | 5 +-
src/Makefile.am | 2 +-
src/i_midipipe.c | 505 --------------------------------
src/i_midipipe.h | 49 ----
src/i_musicpack.c | 1 -
src/i_sdlmusic.c | 65 +++--
src/i_winmusic.c | 539 +++++++++++++++++++++++++++++++++++
midiproc/proto.h => src/i_winmusic.h | 67 ++---
src/midifile.c | 15 +
src/midifile.h | 4 +
src/setup/sound.c | 1 +
22 files changed, 667 insertions(+), 1418 deletions(-)