thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
4043 commits 1 branch 12 tags 205 MiB
Commit graph

48 commits

Author SHA1 Message Date
mazmazz
1042f2bf84 Remove unused methods (for now?) 2018-08-27 05:53:43 -04:00
mazmazz
4285ce99af Load Fluidsynth soundfont upon cvar change 2018-08-27 05:52:01 -04:00
mazmazz
fa8112c5be Lazy midi reload support on menu 2018-08-27 00:43:25 -04:00
mazmazz
cedf656451 Checkpoint: Add FluidSynth and Timidity support 2018-08-26 23:03:38 -04:00
mazmazz
8f5aeb49ff HAVE_MIXERX and NOMIXERX compile flags (win32 only) 2018-08-26 15:12:00 -04:00
mazmazz
0939cabd57 Make SDL Mixer X win32-exclusive 2018-08-26 14:20:41 -04:00
mazmazz
ed6ec14797 Merge branch 'music-cleanup' into music-sdlmixerx 2018-08-26 14:04:54 -04:00
mazmazz
512a5f0e1b I_SongPlaying detect GME properly 2018-08-24 18:03:50 -04:00
mazmazz
c05be4e0b5 Stub I_UnloadSong because we already unload in I_StopMusic 
* Stop-gap for now. Ideally the logic would be in the respective places.

# Conflicts:
#	src/sdl/mixer_sound.c
 2018-08-24 18:02:46 -04:00
mazmazz
07cfc1a29a Volume fixes 
# Conflicts:
#	src/sdl/mixer_sound.c
 2018-08-24 18:01:57 -04:00
mazmazz
2961d32e4a A word 2018-08-24 13:41:26 -04:00
mazmazz
76ab06cdb2 Merge branch 'music-cleanup' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into music-cleanup 2018-08-24 13:36:07 -04:00
mazmazz
4962a2b9aa GME fix: play song in I_PlaySong, not I_LoadSong 2018-08-24 13:35:41 -04:00
mazmazz
5972ff3e90 Refactor I_MusicType MusicPlaying and MusicPaused other targets 2018-08-23 20:23:16 -04:00
mazmazz
8533e08ded Refactor I_MusicType MusicPlaying and MusicPaused -> I_SongType ... 2018-08-23 20:14:46 -04:00
mazmazz
13dfbb0fdb Minor refactoring and reordering 
* I_GetMusicType() -> I_MusicType()
* Wrap MIDI volume hack in #ifdef _WIN32
 2018-08-23 17:05:37 -04:00
mazmazz
ff26baa6a1 Refactoring, music statues 
* S_Init -> S_InitSfxChannels because it did mostly SFX anyway
* S_MusicPlaying, S_MusicPaused, S_MusicName, S_MusicExists new status methods
* I_MusicPlaying, I_MusicPaused
 2018-08-23 12:30:47 -04:00
mazmazz
a672d38bba Consolidate I_SetDigMusicVolume and I_SetMIDIMusicVolume into one method 
* In s_sound, they are merged to one method as well, but there are still two separate digvolume and seqvolume variables
* Simplified Dig/MidiMusicDisabled in s_sound
* Method reordering
 2018-08-23 11:54:36 -04:00
mazmazz
f2c4396299 Added I_GetMusicType and removed midimode variable 
* Revised S_PlayMusic arguments
* Now music plays again!
 2018-08-23 10:18:38 -04:00
mazmazz
ad7bfb49fa Loose ends from previous work 
* Pause/ResumeSong remove handle argument
* LoadSong declare char *data argument
* Variable weirdness
 2018-08-23 09:36:51 -04:00
mazmazz
69bee086bf Revert "Nix'd midimusicvolume", don't know what I want to do with this yet 
This reverts commit 5a2663704e.

# Conflicts:
#	src/i_sound.h
#	src/s_sound.c
#	src/s_sound.h
#	src/sdl/mixer_sound.c
 2018-08-23 09:06:13 -04:00
mazmazz
e8815df145 Playback routines: Load, Play, Pause, Stop, Unload 
* Re-purpose I_LoadSong for digital music loading
* I_StartDigSong logic split between I_LoadSong and I_PlaySong
* Pause, Stop, and Unload routines are combined from Digi and MIDI
* music_lumpnum, music_data, music_handle from s_sound.c are gone
 2018-08-23 09:02:14 -04:00
mazmazz
5a2663704e Nix'd midimusicvolume 2018-08-23 07:39:32 -04:00
mazmazz
43e908e7c4 SDL Mixer X compile on Windows x86 2018-08-22 00:17:25 -04:00
mazmazz
593176c664 Initial work on SDL Mixer X 2018-08-21 14:57:53 -04:00
Monster Iestyn
6797976531 Merge branch 'sdl_mixer_fixes' into 'master' 
SDL Mixer fixes

Closes #31

See merge request STJr/SRB2!260
 2018-08-16 16:57:14 -04:00
Monster Iestyn
e4f38995e7 Merge branch 'gme-lowvolume-fix' into 'master' 
GME low volume fix

See merge request STJr/SRB2!248
 2018-07-31 14:35:32 -04:00
Steel Titanium
d649700abf Re-did this fix. 2018-07-28 01:58:25 -04:00
Monster Iestyn
594eb92bed Use plain malloc instead of Z_Malloc to allocate sound buffers in mixer_sound.c's I_GetSfx. 
This should prevent I_FreeSfx making a mess of things later, hopefully.
 2018-07-14 18:15:59 +01:00
Steel Titanium
61d8033d5e Fix pausing on gme 2018-06-03 18:15:20 -04:00
Steel Titanium
884f10d8d2 Removed CONS_Printf line. That wasn't meant to be commited. 2018-05-29 22:12:36 -04:00
Steel Titanium
5f72975466 Some small change 
Really this is just to prevent the music end up being disorted at max
volume
 2018-05-29 20:31:28 -04:00
Steel Titanium
528cb48d5d GME low volume fix 2018-05-24 16:24:09 -04:00
Monster Iestyn
a33bb70a0c Removed all support for Dreamcast, XBox, PSP, PS3, GP2X, Wii, and WinCE from files in the sdl/ folder. If you wanted these ports, use the SDL 1.2 code in sdl12 
Also removed GP2X setup from sdl/MakeNIX.cfg, use sdl12 for that too
 2017-09-16 20:26:04 +01:00
ilag11111
c977d17416 Prevent truncation when resampling sounds with non-multiples of 11250. 2016-09-11 09:41:18 -07:00
Alam Ed Arias
4d6a3e3398 FUNCMATH fun 2016-06-12 16:08:48 -04:00
Alam Ed Arias
f45feb77fc MSVC: kill level 3 warnings 2016-05-22 00:44:12 -04:00
Inuyasha
e91cfa7110 Fixed frustrating MIDI stuff 
Until we use something besides Native MIDI to play
back MIDI music, MIDI volume changing is disabled
since it causes way too much of a damn headache.
(It's not even our fault, it's fucking MS.)
 2016-04-06 08:16:13 -07:00
Alam Ed Arias
2b12e5ff20 Merge branch 'next' into backport_unslot-music 2016-02-26 02:11:29 -05:00
Inuyasha
6dda71bef7 I guess this is becoming the "try to make SDL_mixer work" branch 
Move InitSubSystem calls into proper places,
don't use AUDIO_S16LSB (bad according to SDL_mixer docs)
Add error checking
 2016-02-22 23:08:35 -08:00
Inuyasha
8c17dac589 The concept of "music slots" doesn't exist anymore. 
Use whatever names you want for your music. So long as you prefix the lumps with O_ or D_, it doesn't matter anymore.
DISCLAIMER: Linedef type 413 (change music) and Lua scripting is not tested.

(cherry picked from commit 025ca413a2)

# Conflicts:
#	src/p_user.c
 2016-02-09 02:48:33 -08:00
Ronald Kinard
8eef7239b2 Change mixer panning to make sense 
This makes positional audio in sdl work correctly (things to the left
play sounds in the left speaker)
 2014-08-04 02:48:18 -05:00
Ronald Kinard
03fe3bdad2 Replace sdl with sdl2 
SDL1.2 is dead, long live SDL
 2014-07-26 02:06:00 -05:00
Alam Ed Arias
f03e591f64 change SDL into HAVE_SDL 2014-07-25 19:10:24 -04:00
ilag11111
b21d5c55c9 Uses fixed-point math to properly calculate the exact amount of space needed. 2014-04-25 13:17:05 -07:00
ilag11111
f7bbf8c6d0 Improved fix by changing the formula for how memory is allocated to arbitrary sample rate conversion. 2014-04-25 12:42:43 -07:00
ilag11111
60a115b0a7 Fix (Linux) 64-bit crash in CEZ3 (playback of sfx_litng3). 2014-04-25 00:37:13 -07:00
Alam Ed Arias
b93cb1b65a SRB2 2.1 release 2014-03-15 13:11:35 -04:00