mazmazz
193735bc5f
Merge branch 'music-sdlmixerx' into musicplus-sdlmixerx
2018-08-27 05:59:55 -04:00
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
toaster
41b7625fa7
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2.git into sonicitems
...
# Conflicts:
# src/g_game.c
# src/v_video.c
2018-08-26 12:42:55 +01:00
mazmazz
db410cb236
Update functions for other targets
2018-08-24 18:20:53 -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
350dbf639c
I_SongPlaying detect GME properly
2018-08-24 18:00:39 -04:00
mazmazz
95c41dd822
Detect GME more simply
2018-08-24 17:58:56 -04:00
mazmazz
5e48d50178
Stub I_UnloadSong because we already unload in I_StopMusic
...
* Stop-gap for now. Ideally the logic would be in the respective places.
2018-08-24 17:56:22 -04:00
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
2b9cadd477
Refactoring and reordering other targets
2018-08-23 17:54:40 -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
971b5c6727
nodigimusic nomusic nosound refactor other targets
2018-08-23 12:43:38 -04:00
mazmazz
8830943906
I_MusicPlaying, I_MusicPaused other targets
2018-08-23 12:31:01 -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
d79f38871e
Consolidate I_SetDigMusicVolume and I_SetMIDIMusicVolume other targets
2018-08-23 11:54:58 -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
70d3315ac4
Added I_GetMusicType and removed midimode variable: other targets
2018-08-23 10:19:04 -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
a7df3be449
Loose ends other targets
2018-08-23 09:37:02 -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
b4b4285666
Revert "Nix'd midimusicvolume other targets"
...
This reverts commit 31fd0f0cf5
2018-08-23 09:09:12 -04:00
mazmazz
8be165db5b
Playback routines other targets
2018-08-23 09:06:31 -04:00
mazmazz
69bee086bf
Revert "Nix'd midimusicvolume", don't know what I want to do with this yet
...
This reverts commit 5a2663704e
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
31fd0f0cf5
Nix'd midimusicvolume other targets
2018-08-23 07:39:45 -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
Monster Iestyn
3cce0b8a33
Merge branch 'public_next'
...
# Conflicts:
# src/sdl12/i_cdmus.c
# src/win32ce/win_cd.c
2018-08-21 15:40:54 +01:00
Monster Iestyn
eb5b5300ab
Merge branch 'XPMupdate' into 'master'
...
update XPM icon
See merge request STJr/SRB2!267
2018-08-21 10:31:25 -04:00
mazmazz
9d1f509972
I_FadeSongFromLevel -> I_FadeSongFromVolume refactor other targets
2018-08-21 08:54:04 -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
086d7fc73b
Interface name refactor: Music -> Song other targets
2018-08-21 06:22:42 -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
