From 50c72d592e8c5a37a7b3605ae06d363060a0ed9c Mon Sep 17 00:00:00 2001
From: Roman Fomin <rfomin@gmail.com>
Date: Wed, 13 Jul 2022 19:17:51 +0700
Subject: [PATCH] update to SDL_Mixer 2.6.1

---
 CHANGELOG.md   | 2 +-
 CMakeLists.txt | 6 +++---
 src/i_sound.c  | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index be30e7f1..c64ea0d4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,7 +7,7 @@
 * Optimization for drawing huge amount of drawsegs from PrBoom+. Improve FPS on planisf2.wad and Eviternity.wad MAP26 and others (@JNechaevsky).
 
 **Bug Fixes**
-* Update to SDL_Mixer 2.6.0, which fixes loop points in .mod, .ogg, .flac, .mp3 music files.
+* Update to SDL_Mixer 2.6.1, which fixes loop points in .mod, .ogg, .flac, .mp3 music files.
 * UMAPINFO: fix `exitpic` and `enterpic` fields.
 * Ask for confirmation on window close with Alt-F4 (@joanbm).
 * Fix Boom weapon autoswitch (from DSDA-Doom).
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d0e7351b..d68c50f2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -100,12 +100,12 @@ find_package(SDL2 2.0.7)
 if(NOT SDL2_MIXER_DIR)
     if(WIN32 AND NOT MSYS)
         message(STATUS "Downloading SDL2_mixer Development Library...")
-        set(pkgver "2.6.0")
+        set(pkgver "2.6.1")
         if(MSVC)
             file(DOWNLOAD
                 "https://github.com/libsdl-org/SDL_mixer/releases/download/release-${pkgver}/SDL2_mixer-devel-${pkgver}-VC.zip"
                 "${CMAKE_CURRENT_BINARY_DIR}/SDL2_mixer-VC.zip"
-                EXPECTED_HASH SHA256=b8862b95340b8990177fdb3fb1f22fe5fd089d8b2ad0a30bf7d84e0f4a6138ae)
+                EXPECTED_HASH SHA256=f68990563ef4720cbb663b188f7f3081e3134243363a5d04b0f6463b3dc73cc4)
             execute_process(COMMAND "${CMAKE_COMMAND}" -E tar xf
                 "${CMAKE_CURRENT_BINARY_DIR}/SDL2_mixer-VC.zip"
                 WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}")
@@ -113,7 +113,7 @@ if(NOT SDL2_MIXER_DIR)
             file(DOWNLOAD
                 "https://github.com/libsdl-org/SDL_mixer/releases/download/release-${pkgver}/SDL2_mixer-devel-${pkgver}-mingw.tar.gz"
                 "${CMAKE_CURRENT_BINARY_DIR}/SDL2_mixer-mingw.tar.gz"
-                EXPECTED_HASH SHA256=58ed726bf963092d810f64731f3cefbd71b80d28427491a4d80aacc41513d97b)
+                EXPECTED_HASH SHA256=479fe5d61ef390c1b26adb69636b12b8a6f706e841516b02e33922483b2d6463)
             execute_process(COMMAND "${CMAKE_COMMAND}" -E tar xf
                 "${CMAKE_CURRENT_BINARY_DIR}/SDL2_mixer-mingw.tar.gz"
                 WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}")
diff --git a/src/i_sound.c b/src/i_sound.c
index 8e570b0d..eb52bd66 100644
--- a/src/i_sound.c
+++ b/src/i_sound.c
@@ -552,7 +552,7 @@ int I_StartSound(sfxinfo_t *sound, int cnum, int vol, int sep, int pitch, int pr
    if(addsfx(sound, handle, pitch))
    {
       channelinfo[handle].idnum = id++; // give the sound a unique id
-      Mix_PlayChannel(handle, &channelinfo[handle].chunk, 0);
+      Mix_PlayChannelTimed(handle, &channelinfo[handle].chunk, 0, -1);
       updateSoundParams(handle, vol, sep, pitch);
    }
    else