Steel Titanium
cf01e820c4
Take the command line params into account
...
Really I'm just making it return early if either of the parms are used.
2018-11-25 22:39:11 -05:00
Steel Titanium
7d4c9dda91
Add newline to end of file
2018-11-25 14:24:50 -05:00
Steel Titanium
981a1192fb
Save sound toggles to config
2018-11-25 14:22:52 -05:00
mazmazz
ea7162a76a
Update source copyrights to 2018
2018-11-25 07:35:38 -05:00
mazmazz
f2bfed7892
Merge branch 'musicplus-core' into musicplus-sdlmixerx
2018-11-13 14:34:40 -05:00
mazmazz
8f87bf82cd
Merge branch 'master' into musicplus-core
2018-11-13 13:46:30 -05:00
Monster Iestyn
268bde3fdf
Merge branch 'public_next'
...
# Conflicts:
# src/d_netcmd.c
# src/d_netcmd.h
# src/dehacked.c
# src/g_game.h
# src/hardware/hw_draw.c
# src/hardware/hw_main.c
# src/lua_baselib.c
# src/lua_hook.h
# src/lua_hooklib.c
# src/lua_hudlib.c
# src/lua_libs.h
# src/lua_maplib.c
# src/lua_script.c
# src/m_misc.h
# src/p_mobj.c
# src/s_sound.c
# src/sdl12/mixer_sound.c
# src/w_wad.c
2018-11-10 15:41:57 +00:00
Monster Iestyn
b5c4b476a6
Merge branch 'public_next'
...
# Conflicts:
# src/d_main.c
# src/m_menu.c
# src/s_sound.c
# src/sdl/sdl_sound.c
2018-10-20 15:31:48 +01:00
mazmazz
cc0d1db9d8
Merge remote-tracking branch 'steeltitanium/music-clean' into test-public-music-cleanup
2018-10-19 23:56:56 -04:00
mazmazz
a288b95458
Merge remote-tracking branch 'public-gitlab/master' into public-music-cleanup
2018-10-19 22:04:26 -04:00
Monster Iestyn
d4e11762fa
Merge branch 'public_next'
...
# Conflicts:
# src/nds/i_sound.c
# src/r_data.c
# src/sdl12/mixer_sound.c
# src/sdl12/sdl_sound.c
# src/win32ce/win_snd.c
2018-10-19 22:46:19 +01:00
Sryder
6184f91dd3
Add an int to I_PlaySound to tell an interface which channel number SRB2 is using.
...
I've voided this out on other sound interfaces than SDL Mixer ones because I'm both not sure whether they need it, and not sure how to make them work with it if they do.
2018-10-13 23:01:11 +01:00
Steel Titanium
450b536147
Remove the condition in restartaudio command.
...
No longer needed as S_RegisterSoundStuff will return early if in
dedicated mode.
2018-10-11 20:11:37 -04:00
Steel Titanium
b3faed190b
Move commands and console variable into s_sound.c
2018-10-11 16:29:43 -04:00
mazmazz
78c1b99cd4
MP Jingle: Changed music_stacks from fixed array to next/prev chain
2018-09-20 17:13:52 -04:00
mazmazz
6f1a5cbfc9
Merge branch 'musicplus-core' into musicplus-sdlmixerx
2018-09-19 20:06:56 -04:00
mazmazz
7cd1bfb8d7
Merge branch 'public-musicplus-core' into public-musicplus-jingle
2018-09-19 19:56:50 -04:00
mazmazz
a4fade9b25
Merge branch 'public-musicplus-core' into public-musicplus-libopenmpt
2018-09-19 19:56:49 -04:00
mazmazz
af5aecb246
MP Jingle: Better empty_music_stack_entry initialization (buildbots)
2018-09-19 19:51:04 -04:00
mazmazz
7084fc89bd
MP Core s_sound: I_FadeSongFromVolume call fix (buildbots)
2018-09-19 19:47:21 -04:00
mazmazz
2644180b7e
MP Core s_sound: I_FadeSongFromVolume call fix (buildbots)
2018-09-19 19:46:57 -04:00
mazmazz
49c678d2e9
MP Core s_sound: Mixed D+C fix (buildbots)
2018-09-19 19:41:23 -04:00
mazmazz
7cc0b6cf95
Merge branch 'public-musicplus-core' into public-musicplus-libopenmpt
2018-09-19 19:32:49 -04:00
mazmazz
affbc89602
Merge branch 'public-musicplus-core' into public-musicplus-jingle
2018-09-19 19:24:57 -04:00
mazmazz
17c796fe74
MP Jingle: Buildbot fixes
2018-09-19 19:24:35 -04:00
mazmazz
164be3056f
MP Core s_sound: Mixed D+C fix (buildbots)
2018-09-19 19:19:18 -04:00
mazmazz
e08bdec216
MP Jingle: Buildbot fixes
2018-09-19 18:42:35 -04:00
mazmazz
c60d61a493
musicplus-jingle 2.2 -> 2.1 backport
2018-09-18 15:10:00 -04:00
mazmazz
b48b5a29a4
Move cv_modfilter from mixer_sound.c to s_sound.c for other targets
2018-09-18 13:01:34 -04:00
mazmazz
cf7d913f3b
Merge branch 'music-sdlmixerx' into musicplus-sdlmixerx
2018-09-18 12:46:46 -04:00
mazmazz
8583785d72
Merge branch 'musicplus-core' into musicplus-sdlmixerx
2018-09-18 12:46:41 -04:00
mazmazz
4cba996a89
Define cv_midiplayer/soundfontpath/timiditypath in s_sound.c when NOMIXER=1
2018-09-18 12:41:49 -04:00
mazmazz
4d89beb105
musicplus-libopenmpt 2.2 -> 2.1 backport
2018-09-18 12:31:47 -04:00
mazmazz
41964e084d
MusicPlus core: Lua separation fixes
2018-09-18 10:32:38 -04:00
mazmazz
c5ea6b5efe
MusicPlus Core (positioning and fading) 2.2 -> 2.1 backport
2018-09-18 10:22:17 -04:00
mazmazz
34e403afcb
S_ChangeMusic: More specific load/play fail messages
2018-09-18 09:38:41 -04:00
mazmazz
94393e759d
Merge branch 'music-cleanup' into musicplus-core
2018-09-18 08:33:20 -04:00
mazmazz
2b2e179e63
S_ChangeMusic: More specific load/play fail messages
2018-09-18 08:32:34 -04:00
mazmazz
48445c7733
Merge branch 'musicplus-core' into musicplus-sdlmixerx
2018-09-16 23:18:11 -04:00
mazmazz
d7f4c9be84
S_ChangeMusicAdvanced -> S_ChangeMusicEx
2018-09-16 23:10:23 -04:00
mazmazz
001dbcceea
Merge branch 'musicplus-core' into musicplus-sdlmixerx
2018-09-15 01:17:33 -04:00
mazmazz
9eb39fb025
Merge branch 'music-cleanup' into musicplus-core
2018-09-15 00:46:02 -04:00
mazmazz
3c755a85df
Merge branch 'music-cleanup' into music-sdlmixerx
2018-09-15 00:28:38 -04:00
mazmazz
a5948c3629
Separate StopMusic and UnloadMusic
...
(cherry picked from commit e72610a3dc
2018-09-14 13:57:20 -04:00
mazmazz
7f884591a7
Bring back music_data handle, for srb2dd
...
(cherry picked from commit 8e05de17f0
2018-09-14 13:56:14 -04:00
mazmazz
09df2c387a
newmusic -> mmusic typo, S_ChangeMusic
2018-09-14 13:55:07 -04:00
mazmazz
e72610a3dc
Separate StopMusic and UnloadMusic
2018-09-14 12:47:33 -04:00
mazmazz
8e05de17f0
Bring back music_data handle, for srb2dd
2018-09-14 12:29:58 -04:00
mazmazz
4b1bc53db1
Compile fixes
2018-09-14 10:58:41 -04:00
mazmazz
fac7d19637
Case-insensitive music_name comparison
...
(cherry picked from commit a7ae059949
2018-09-14 10:49:44 -04:00
mazmazz
5f22b7d973
Volume fixes
...
# Conflicts:
# src/sdl/mixer_sound.c
(cherry picked from commit d39b7011c5
2018-09-14 10:49:44 -04:00
mazmazz
eacf0ba00b
Refactor I_MusicType MusicPlaying and MusicPaused -> I_SongType ...
...
(cherry picked from commit 4b82de9e54
2018-09-14 10:45:38 -04:00
mazmazz
5bac836d4c
Minor refactoring and reordering
...
* I_GetMusicType() -> I_MusicType()
* Wrap MIDI volume hack in #ifdef _WIN32
(cherry picked from commit a7d51bf810
2018-09-14 10:42:27 -04:00
mazmazz
8c78d86c36
Play the opposite type music (Digital/MIDI) when toggling between them in menu
...
* S_MusicInfo method to retrieve name, flags, and looping
(cherry picked from commit f6ec93198f
2018-09-14 10:38:32 -04:00
mazmazz
7e7899ae83
Toggle Digi/MIDI music in menu accurately; add S_MusicType
...
(cherry picked from commit 4aa100aa57
2018-09-14 10:37:08 -04:00
mazmazz
a414ccf24a
nodigimusic nomusic nosound -> digital_disabled midi_disabled sound_disabled
...
(cherry picked from commit 07738fb0bc
2018-09-14 10:35:51 -04:00
mazmazz
011a043dba
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
(cherry picked from commit f5f0b5e76c
2018-09-14 10:28:29 -04:00
mazmazz
a7ed7b2c90
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
(cherry picked from commit 701cc5a7dd
2018-09-14 10:23:37 -04:00
mazmazz
06b7367941
Added I_GetMusicType and removed midimode variable
...
* Revised S_PlayMusic arguments
* Now music plays again!
(cherry picked from commit 55f3803e4b
2018-09-14 09:42:29 -04:00
mazmazz
1681e6cc00
Merge branch 'music-sdlmixerx' into musicplus-sdlmixerx
2018-09-01 11:38:26 -04:00
mazmazz
7fbe97a3d2
Reset MIDI music properly on settings change
...
* Added reset flag to S_Start (now S_StartEx)
2018-09-01 11:37:53 -04:00
mazmazz
9c35b3dfc5
Merge branch 'musicplus-core' into musicplus-sdlmixerx
2018-08-28 10:27:49 -04:00
mazmazz
0bea5729a7
Revise LUAh_MusicChange hook
2018-08-28 10:10:56 -04:00
mazmazz
b701316505
Merge branch 'music-sdlmixerx' into musicplus-sdlmixerx
2018-08-27 05:59:55 -04:00
mazmazz
28545822ba
Checkpoint: Add FluidSynth and Timidity support
2018-08-26 23:03:38 -04:00
mazmazz
73b4c4c5b4
Fix S_ChangeMusic newmusic -> mmusic, merge error
2018-08-26 14:22:14 -04:00
mazmazz
a7ae059949
Case-insensitive music_name comparison
2018-08-25 22:00:31 -04:00
mazmazz
9f3549e5e1
Remove tolower music_name, because we do case-insensitive matching now
2018-08-25 21:53:22 -04:00
mazmazz
48b6255e93
Case-insensitive music_name comparison
2018-08-25 21:42:39 -04:00
mazmazz
4dd6b733d6
MUSICPOSITION -> MUSICPOS
...
* Added muspos level header var to lua
# Conflicts:
# src/dehacked.c
# src/lua_maplib.c
# src/p_setup.c
2018-08-25 16:23:01 -04:00
mazmazz
578e386e40
Add MUSICPOSITION level header and mapmusposition variable to instantly jump to position
...
* Cutscene support too!
2018-08-25 15:59:20 -04:00
mazmazz
4f388428bc
Add MUSIC_FORCERESET flag
2018-08-25 13:18:14 -04:00
mazmazz
838d47acd3
Add S_MusicName back as a convenience function
...
* Move MUSICRATE to doomdef.h
2018-08-25 08:08:25 -04:00
mazmazz
d39b7011c5
Volume fixes
...
# Conflicts:
# src/sdl/mixer_sound.c
2018-08-24 18:01:57 -04:00
mazmazz
a688de5dc2
Volume fixes
2018-08-24 17:56:14 -04:00
mazmazz
bf61dbb6e2
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
a2d626384a
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
4b82de9e54
Refactor I_MusicType MusicPlaying and MusicPaused -> I_SongType ...
2018-08-23 20:14:46 -04:00
mazmazz
a7d51bf810
Minor refactoring and reordering
...
* I_GetMusicType() -> I_MusicType()
* Wrap MIDI volume hack in #ifdef _WIN32
2018-08-23 17:05:37 -04:00
mazmazz
f6ec93198f
Play the opposite type music (Digital/MIDI) when toggling between them in menu
...
* S_MusicInfo method to retrieve name, flags, and looping
2018-08-23 16:46:40 -04:00
mazmazz
4aa100aa57
Toggle Digi/MIDI music in menu accurately; add S_MusicType
2018-08-23 13:09:20 -04:00
mazmazz
07738fb0bc
nodigimusic nomusic nosound -> digital_disabled midi_disabled sound_disabled
2018-08-23 12:42:57 -04:00
mazmazz
f5f0b5e76c
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
701cc5a7dd
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
55f3803e4b
Added I_GetMusicType and removed midimode variable
...
* Revised S_PlayMusic arguments
* Now music plays again!
2018-08-23 10:18:38 -04:00
mazmazz
e89eccf78e
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
7efab8b314
Revert "Nix'd midimusicvolume", don't know what I want to do with this yet
...
This reverts commit b5c3095820
2018-08-23 09:06:13 -04:00
mazmazz
e42defa299
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
0bc9576eb0
Revert "CHANGED MIND: Nix'd S_MIDIMusic, I_PlaySong, and I_RegisterSong"
...
This reverts commit 8b46bce155
2018-08-23 07:50:02 -04:00
mazmazz
8b46bce155
CHANGED MIND: Nix'd S_MIDIMusic, I_PlaySong, and I_RegisterSong
...
* music_lumpnum, music_data, music_handle are gone
* Relevant interfaces I_PlaySong are transferred to I_StartDigSong
2018-08-23 07:49:09 -04:00
mazmazz
b5c3095820
Nix'd midimusicvolume
2018-08-23 07:39:32 -04:00
Monster Iestyn
87e37e21df
Merge branch 'public_next'
...
# Conflicts:
# src/sdl12/i_cdmus.c
# src/win32ce/win_cd.c
2018-08-21 15:40:54 +01:00
mazmazz
6fac87cab2
S_MusicPlaying safety
2018-08-21 08:56:05 -04:00
mazmazz
5db6df59b5
S_ChangeMusicWithFade fixes
...
* MusicSlot compatibility name fix
2018-08-21 08:55:53 -04:00
mazmazz
2289a3bd79
I_FadeSongFromLevel -> I_FadeSongFromVolume refactor
...
* S_MusicName->GetMusicName refactor
* S_ChangeMusicWithFade->ChangeMusicAdvanced refactor
2018-08-21 08:53:51 -04:00
mazmazz
a1b1391e24
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
17e2c3f5be
Debug messages
2018-08-20 08:47:41 -04:00
mazmazz
18daf255ee
Rename I_QueueDigSongPostFade to I_QueueDigSong
2018-08-20 01:16:52 -04:00
mazmazz
9539c597dd
Midimode safeties for song queueing/fading
2018-08-20 01:14:29 -04:00
mazmazz
6b028049e0
Music lump existence minor fixes
2018-08-20 01:14:01 -04:00
