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
27188 commits 1 branch 12 tags 205 MiB
Commit graph

288 commits

Author SHA1 Message Date
mazmazz
8493d0bfcc Volume fixes 2018-08-24 17:56:14 -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
052f9f8a7c Checkpoint: Revised fading routines for new load/play pattern 
* Perform fade-out/fade-in using callbacks
* Move queued music from interface to s_sound
 2018-08-24 13:11:38 -04:00
mazmazz
1f5e62197e Merge branch 'music-cleanup' into musicplus-core 
Pending rewrite of fade music changing

# Conflicts:
#	src/android/i_sound.c
#	src/djgppdos/i_sound.c
#	src/i_sound.h
#	src/s_sound.c
#	src/s_sound.h
#	src/sdl/mixer_sound.c
#	src/sdl/sdl_sound.c
#	src/win32/win_snd.c
 2018-08-23 21:07:39 -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
mazmazz
623a5ae525 Position fixes with looppoint 2018-08-21 11:58:38 -04:00
mazmazz
2594909e70 I_FadeSongFromLevel -> I_FadeSongFromVolume refactor 
* S_MusicName->GetMusicName refactor
* S_ChangeMusicWithFade->ChangeMusicAdvanced refactor
 2018-08-21 08:53:51 -04:00
mazmazz
fd757b4e74 Interface name refactor: Music -> Song 
* Music refers to the music system, song refers to the entity being played.
* s_sound doesn't follow this, everything is music
 2018-08-21 06:22:35 -04:00
mazmazz
bded9c546e Debug messages 2018-08-20 08:47:41 -04:00
mazmazz
d61857c768 Midimode safeties for song queueing/fading 2018-08-20 01:14:29 -04:00
mazmazz
cba02eadbf Allow queueing music at end of song, not just fading 2018-08-20 00:12:23 -04:00
mazmazz
1701b81079 * Allow S_ChangeMusic to queue the same track for fading 
* StopDigSong upon running queue so that GME works for queueing
 2018-08-19 23:20:40 -04:00
mazmazz
87df31a685 I_FadeOutStopMusic, I_FadeInStartDigSong, S_ChangeMusicWithFade implementation 
* First attempt, a little messy but works fine
 2018-08-19 22:05:42 -04:00
mazmazz
88d2ac8d4e Make S_FadeMusicFromLevel accept mandatory source_volume 
* Make S_FadeMusic a legitimate function to grab current internal volume
 2018-08-19 17:02:13 -04:00
mazmazz
3c5406ee04 Checkpoint 2018-08-19 16:25:12 -04:00
mazmazz
df1463b378 S_FadeMusic[FromLevel] and S_StopFadingMusic implementation 2018-08-19 16:19:48 -04:00
mazmazz
9e4d60e7ce I_SetInternalMusicVolume implementation 2018-08-19 09:38:57 -04:00
mazmazz
0df729f630 Framework for internal_volume; more fade code 2018-08-19 09:16:52 -04:00
mazmazz
ba523a5300 Merge branch 'musicplus-core' into musicplus-fade-sdltimer 2018-08-19 08:35:56 -04:00
mazmazz
33ac960cf9 Enable midi_volume, it actually works 2018-08-19 08:34:03 -04:00
mazmazz
67c8b6661e Fade checkpoint 2018-08-19 08:32:12 -04:00
mazmazz
4c730138f3 Add LIBGME ifdefs 2018-08-19 06:43:57 -04:00
mazmazz
68cc439347 Minor cleanup 2018-08-18 23:26:58 -04:00
mazmazz
c29d3ec3d7 Merge branch 'musicplus-core' into musicplus-fade-sdltimer 
# Conflicts:
#	src/sdl/mixer_sound.c
 2018-08-18 23:12:58 -04:00
mazmazz
2f7bdd4aa3 Fixed loop point counter bug 2018-08-18 21:29:18 -04:00
mazmazz
0a0537d486 Fix S_SetMusicLoopPoint wrong method; trigger only on is_looping 2018-08-18 20:54:56 -04:00
mazmazz
1869c21b6d Consolidate variable cleanup in mixer_sound 
* Fix I_SetSongTrack MOD tracking returns the expected result
* Make music_loop hook stop digital song properly if not looping
 2018-08-18 20:44:32 -04:00
mazmazz
6c2fd14b85 Loop point modulo by length 2018-08-18 20:29:19 -04:00
mazmazz
1629a8cfd0 I_GetMusicLoopPoint and I_SetMusicLoopPoint implementation 
* Stub pause for MIDI
* Fix MP3 tag wide char search
* Reset songpaused bool where appropriate
 2018-08-18 20:19:44 -04:00
mazmazz
22b2ef44b9 Remove I_MIDIPlaying 2018-08-18 17:45:57 -04:00
mazmazz
c9c1b24ad6 S_MusicType implementation; MOD support for Get/SetMusicPosition and MusicLength 
* Misc MOD fixes
 2018-08-18 17:17:53 -04:00
mazmazz
7080c93576 Added GME for GetMusicLength, SetMusicPosition, GetMusicPosition 
* Misc fixes
 2018-08-18 16:21:28 -04:00
mazmazz
8db0d04cb8 Support wide chars when searching for music tags (MP3) 2018-08-18 15:26:31 -04:00
mazmazz
e7a4f6d78f I_GetMusicLength implementation 2018-08-18 14:18:29 -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
mazmazz
10f8337347 Checkpoint: Basic functions 2018-08-15 12:07:08 -04:00
mazmazz
da5fd51feb Fix merge errors 2018-08-15 02:42:50 -04:00