Commit graph

288 commits

Author SHA1 Message Date
Monster Iestyn
12752e0a43 Merge branch 'zlib-split' into 'master'
Makefile: Split zlib and libpng

See merge request STJr/SRB2!285
2018-10-08 07:20:27 -04:00
Steel Titanium
4d883e740d Change order of the ifdef 2018-10-07 14:52:25 -04:00
Steel Titanium
fa1377d540 Move the ifdef 2018-10-07 14:45:03 -04:00
Sryder
d9d98ec1a9 Fix the crashing bug hopefully
A value of 1 in freesrc for Mix_LoadWAV_RW and Mix_LoadMus_RW calls SDL_RWclose on the RWops anyway.
For Mix_LoadWAV_RW the RWops is freed right after the data is loaded (because it makes a copy of the data in memory)
For Mix_LoadMUS_RW the RWops is freed when Mix_FreeMusic is called (because the data is not a copy)
So setting 1 on freesrc doesn't actually free the RWops immediately on Mix_LoadMus_RW *unless* it failed to load any music.
2018-10-07 10:37:45 +01:00
Sryder
00c36a9d9e Fix compiler warnings. 2018-10-07 09:26:18 +01:00
Sryder
d7f373a42d I think that should be NULL, not 0 actually. 2018-10-07 00:22:23 +01:00
Sryder
224b228089 Mix_QuickLoad_RAW sets a flag in the Mix_Chunk so that Mix_FreeChunk doesn't actually Free the sound.
Checks for the flag when freeing, and if it's 0, we free the data manually after Mix_FreeChunk.
I went back to Z_Malloc and Z_Free for this because they still work after this.
2018-10-07 00:15:42 +01:00
Sryder
052df3265e Call SDL_RWclose after an SDL_RWFromMem call to close the RWops. 2018-10-07 00:15:11 +01:00
Steel Titanium
1656b77bc0 Restore deleted endif 2018-10-04 22:38:59 -04:00
Steel Titanium
2eb9bebcd9 Split zlib and libpng 2018-10-04 19:47:19 -04:00
mazmazz
fa5532b386 MP Jingle: Add fade timing hack after ending a non-looping song 2018-09-20 18:30:21 -04:00
mazmazz
3ec85a69ff MP Mixer X: Fix double->UINT32 cast (buildbots) 2018-09-20 08:30:31 -04:00
mazmazz
65314be0ec MP Libopenmpt: Fix UINT32->double cast (buildbots) 2018-09-20 07:42:35 -04:00
mazmazz
28b456c05d MP Libopenmpt: Separate loading into sdl/load_libraries.c 2018-09-19 23:18:06 -04:00
mazmazz
000873cf50 Merge branch 'musicplus-core' into musicplus-sdlmixerx 2018-09-19 20:06:56 -04:00
mazmazz
6884a229f0 MP Core Mixer: Old-style function dec fixes (buildbots) 2018-09-19 19:41:38 -04:00
mazmazz
7a5cfe2514 MP Core Mixer fade: Use fixed instead of double calc (fixes buildbots) 2018-09-19 19:40:24 -04:00
mazmazz
494f172597 Merge branch 'public-musicplus-core' into public-musicplus-libopenmpt 2018-09-19 19:32:49 -04:00
mazmazz
43f6038d98 MP Core Mixer fade: Use fixed instead of double calc (fixes buildbots) 2018-09-19 19:18:35 -04:00
mazmazz
8eb2171fcd MP Core Mixer: Old-style function dec fixes (buildbots) 2018-09-19 19:06:24 -04:00
mazmazz
a45d4e31be Merge branch 'public-musicplus-core' into public-musicplus-libopenmpt 2018-09-19 18:54:58 -04:00
mazmazz
fa22f65610 Merge branch 'musicplus-core' into musicplus-sdlmixerx 2018-09-19 18:53:41 -04:00
mazmazz
3d4228b8de MP Core Mixer: Unused param fixes (buildbots) 2018-09-19 18:26:59 -04:00
mazmazz
fae377b896 MP Core Mixer: Unused param fixes (buildbots) 2018-09-19 18:26:33 -04:00
mazmazz
15dc28144b Merge branch 'public-musicplus-core' into public-musicplus-libopenmpt 2018-09-18 22:24:44 -04:00
mazmazz
9d40bf57fe Mixer: Add back var_cleanup in I_LoadSong
Because musicplus-libopenmpt deleted it, I added a cautionary note to ALWAYS clean up your vars!
2018-09-18 22:24:07 -04:00
mazmazz
27cde189de Mixer: Add back var_cleanup in I_LoadSong
Because musicplus-libopenmpt deleted it, I added a cautionary note to ALWAYS clean up your vars!
2018-09-18 22:15:53 -04:00
mazmazz
cd0dbac3db Move cv_modfilter from mixer_sound.c to s_sound.c for other targets 2018-09-18 13:01:34 -04:00
mazmazz
bd4a612fa3 Merge branch 'public-musicplus-core' into public-musicplus-libopenmpt 2018-09-18 12:59:53 -04:00
mazmazz
80ce366b3f Mixer I_StopSong: StopFadingSong and var_cleanup call fix 2018-09-18 12:55:19 -04:00
mazmazz
88c7d45b22 Merge branch 'musicplus-core' into musicplus-sdlmixerx 2018-09-18 12:51:55 -04:00
mazmazz
0e8ec47727 Mixer I_StopSong: StopFadingSong and var_cleanup call fix 2018-09-18 12:51:42 -04:00
mazmazz
320cb89af9 Merge branch 'music-sdlmixerx' into musicplus-sdlmixerx 2018-09-18 12:46:46 -04:00
mazmazz
633c20debb Define cv_midiplayer/soundfontpath/timiditypath in s_sound.c when NOMIXER=1 2018-09-18 12:41:49 -04:00
mazmazz
85c6715188 musicplus-libopenmpt 2.2 -> 2.1 backport 2018-09-18 12:31:47 -04:00
mazmazz
32c48af258 MusicPlus Core (positioning and fading) 2.2 -> 2.1 backport 2018-09-18 10:22:17 -04:00
mazmazz
d21467eeaa Improve MIDI console parameters
* Allow multiple SF2 for midisoundfont
* Correctly branch when toggling midiplayer or midisoundfont
2018-09-16 16:02:26 -04:00
mazmazz
e58cfe9ced Improve MIDI console parameters
* Allow multiple SF2 for midisoundfont
* Correctly branch when toggling midiplayer or midisoundfont
2018-09-16 11:51:39 -04:00
mazmazz
707d649d67 Merge branch 'musicplus-core' into musicplus-sdlmixerx 2018-09-15 01:17:33 -04:00
mazmazz
a8c4912810 Mixer: Add missing tag declarations in I_LoadSong 2018-09-15 01:14:24 -04:00
mazmazz
b2e3352c5a Merge branch 'music-cleanup' into musicplus-core 2018-09-15 00:46:02 -04:00
mazmazz
134387b249 Merge branch 'music-cleanup' into music-sdlmixerx 2018-09-15 00:36:16 -04:00
mazmazz
76e3b7a7cd Mixer: HAVE_LIBGME ifdef in I_LoadSong 2018-09-15 00:35:24 -04:00
mazmazz
fab6316954 Mixer: HAVE_LIBGME ifdef in I_LoadSong 2018-09-15 00:34:55 -04:00
mazmazz
7bb2accb40 Merge branch 'music-cleanup' into music-sdlmixerx 2018-09-15 00:28:38 -04:00
mazmazz
b6894de26a Fix Windows buildbot for MP3_MAD/MODPLUG define (the header we use is 2.0.2)
(cherry picked from commit 89a26f28bd)
2018-09-14 17:48:12 -04:00
mazmazz
89a26f28bd Fix Windows buildbot for MP3_MAD/MODPLUG define (the header we use is 2.0.2) 2018-09-14 17:47:04 -04:00
mazmazz
ead04aeeeb Mixer: Better MODPLUG/MP3_MAD defines
(cherry picked from commit 5b724e18b5268b0492b3f8b8980aadd2dd41e235)
2018-09-14 17:27:31 -04:00
mazmazz
aac7857d16 Mixer: Better MODPLUG/MP3_MAD defines 2018-09-14 17:27:00 -04:00
mazmazz
c4305c5963 Fix compile errors on buildbots
* Check SDL Mixer 2.0.3 for MUS_MODPLUG_UNUSED, MUS_MP3_MAD_UNUSED
* Mixed D+C in I_LoadSong

(cherry picked from commit a2dd03bff6)
2018-09-14 17:09:21 -04:00