drfrag
ce31c46d60
Revert "Use signal handler to invoke call_terms() before exit when possible"
...
This reverts commit 457dc8b5a9
.
2020-01-05 19:56:24 +01:00
drfrag
2bf731cfa9
Revert "- Made VMFrameStack GlobalVMStack a non thread_local variable for MinGW since that helps to prevent crashes on exit."
...
This reverts commit 429bd5d843
.
2020-01-05 19:55:15 +01:00
drfrag
b78978fa7b
Revert "- Addressed crash on exit with MinGW. This is a hack and i've reported it as a bug in the MinGW C runtime."
...
This reverts commit 0e25e40deb
.
2020-01-05 19:54:54 +01:00
drfrag
fce7af81af
- Try to fix compilation on POSIX targets, i mean for real compilers thanks again to the broken VS preprocessor.
2020-01-05 19:44:18 +01:00
drfrag
731e11bd88
- Add libdl to ZMusic for linux targets, hope this fixes linking.
2020-01-05 14:44:54 +01:00
alexey.lysiuk
0c86fad217
- fixed build issues with POSIX targets
2020-01-05 14:44:01 +01:00
Christoph Oelckers
44f668c6d9
- added a mapping table from DOS-IBM-437 to Unicode
...
This is for future use, added now so that it won't get lost.
2020-01-05 14:43:59 +01:00
Christoph Oelckers
ed0e671281
- added missing return to the GENMIDI loader.
2020-01-05 14:39:14 +01:00
Braden Obrzut
04ca5946d9
- Document limitation of TArray and silence warnings about non-trivial types being trivially moved
2020-01-05 14:39:12 +01:00
Christoph Oelckers
0888b0b0e7
- fixed the CDDA check to not catch all RIFF files.
2020-01-05 14:39:11 +01:00
Christoph Oelckers
7bd8abc074
- fixed crash with non-looping music ending.
...
In this case it was the song terminating the stream, with the new setup the main music code has to do this itself.
2020-01-05 14:39:09 +01:00
Christoph Oelckers
1616bc93a7
- fixed compilation on Windows.
...
# Conflicts:
# libraries/zmusic/musicformats/win32/i_cd.cpp
# Conflicts:
# libraries/zmusic/musicformats/win32/i_cd.cpp
2020-01-05 14:39:08 +01:00
alexey.lysiuk
0d3e78f748
- disabled code signing in Xcode by default
...
It’s impossible to build GZDoom without valid code signing identity with Xcode 11 using a project
# Conflicts:
# src/CMakeLists.txt
2020-01-05 14:39:06 +01:00
Christoph Oelckers
555b847323
- removed the remains of the FModEx-style stream implementation
...
FMod had MP3/Ogg playback integrated right into itself, and the OpenAL backend tried to replicate this functionality.
This functionality, however, has been removed over two years ago when FMod started breaking things more and more, it was only this backing implementation that was left in.
2020-01-05 14:39:04 +01:00
Christoph Oelckers
ee4bf9670e
- renamed a few functions in the public interface of ZMusic.
2020-01-05 14:39:03 +01:00
Christoph Oelckers
16212e946b
- moved the music loader code to ZMusic.
...
This was the final piece of code reorganization.
What's left is cleaning up the interface.
2020-01-05 14:39:01 +01:00
Christoph Oelckers
09fe55d462
- cleanup of the remaining music code in the main project
...
# Conflicts:
# src/menu/menudef.cpp
# src/scripting/vmthunks.cpp
# Conflicts:
# src/p_acs.cpp
2020-01-05 14:39:00 +01:00
Christoph Oelckers
d7db010217
- moved the CD Audio code to ZMusic, too.
...
This was the last player class.
This code was also cleaned up for non-Windows systems where CD Audio is not implemented.
Instead of providing an empty implementation, all related code is now explicitly deactivated.
# Conflicts:
# src/CMakeLists.txt
2020-01-05 14:38:27 +01:00
Christoph Oelckers
01de5a071b
- moved the main music classes to ZMusic
...
What's left is the CD-Audio playback and some global functions.
# Conflicts:
# src/CMakeLists.txt
2020-01-05 14:02:12 +01:00
Christoph Oelckers
cf16dc510a
- fixed compilation with XCode and silenced several warnings
2020-01-05 13:38:07 +01:00
Christoph Oelckers
768a7bdd18
- hooked up a few more CVARs and other values the music backend needs to know about and moved the MusInfo base class into zmusic.
...
# Conflicts:
# src/sound/musicformats/music_midistream.cpp
2020-01-05 13:37:50 +01:00
Christoph Oelckers
08d2ac0eee
- moved the sound system's sound stream for the music out of the song objects.
...
It is now being handled by the controlling code.
While of no benefit for GZDoom itself, this finally allows to separate the entire music code into a separate, engine independent project that merely provides streamed music data when not playing on a hardware device (WinMM Midi or CD Audio.)
The tight coupling of the music code with the sound backend made this nearly impossible before
2020-01-05 12:56:39 +01:00
Christoph Oelckers
fce866054e
- reordering code a bit to see where the stream must be started.
2020-01-05 12:56:37 +01:00
Christoph Oelckers
e3bb9332d0
- a bit of cleanup - moving internal class declarations into the sources.
...
Now i_musicinterns.h doesn't bleed the entire implementation everywhere anymore.
2020-01-05 12:56:35 +01:00
Christoph Oelckers
0f7886326d
- renamed the configuration file.
2020-01-05 12:56:33 +01:00
Christoph Oelckers
e76f590df8
- moved all configuration code to zmusic project.
...
The CVARs are now just getting forwarded without any own logic.
2020-01-05 12:56:30 +01:00
Christoph Oelckers
5d73f09ebf
- first state of music configuration refactor.
...
# Conflicts:
# src/sound/music/midi_cvars.cpp
2020-01-05 12:56:28 +01:00
Christoph Oelckers
d44d3b353d
- did a bit of reordering on I_RegisterSong.
...
The way CDDA was treated as an afterthought made handling of stream songs somewhat problematic, because the state could be unclear.
CDDA is an easily identifiable format so it should be tested first.
2020-01-05 12:33:51 +01:00
Christoph Oelckers
eccff92420
- moved MIDI format detection and source creation into zmusic project.
2020-01-05 12:33:48 +01:00
Christoph Oelckers
4db555626f
- configuration key enums. Not used yet.
2020-01-05 12:32:50 +01:00
Christoph Oelckers
531a5a8857
- moved the stream sources to zmusic project.
...
# Conflicts:
# src/CMakeLists.txt
2020-01-05 12:32:47 +01:00
Christoph Oelckers
09993ca39b
- removed ZDoom dependencies from music_libsndfile.cpp
...
# Conflicts:
# src/sound/musicformats/music_libsndfile.cpp
2020-01-05 12:32:43 +01:00
Christoph Oelckers
f3f2ec5cb1
- moved the sound decoding code to the zmusic project.
...
Since this gets used by both the sound backend and the music code it needs to be in a place accessible to both.
# Conflicts:
# src/CMakeLists.txt
# Conflicts:
# libraries/zmusic/decoder/mpg123_decoder.cpp
# libraries/zmusic/decoder/sndfile_decoder.cpp
# src/CMakeLists.txt
2020-01-05 12:29:15 +01:00
Christoph Oelckers
fb3b6a0407
- XA, too.
2020-01-05 11:53:06 +01:00
Christoph Oelckers
3837cf8f0f
- ... and the raw OPL format.
2020-01-05 11:53:04 +01:00
Christoph Oelckers
182f48c2c4
- gave music_gme.cpp the treatment.
...
# Conflicts:
# src/sound/musicformats/music_gme.cpp
2020-01-05 11:53:00 +01:00
Christoph Oelckers
e3d9c6a19e
- dependency cleanup in music_dumb.cpp.
...
# Conflicts:
# src/sound/musicformats/music_dumb.cpp
# Conflicts:
# src/sound/musicformats/music_dumb.cpp
2020-01-05 11:50:07 +01:00
Christoph Oelckers
b5ebe264ab
- consolidated the different file access interfaces in the backends into one shared version.
...
This was getting a bit unwieldy. The include path setup is not perfect yet, that's work for later.
(It's about time we're getting C++20 with modules so that this include path madness can be put to an end.)
2020-01-05 11:46:28 +01:00
Christoph Oelckers
c56bf30cc2
- uncoupled the stream sources from the low level implementation. The entire setup had the stream sources depend on the SoundStream class, severely limiting reusability. This was changed that there is one SoundStream class that uses the StreamSources as mere data source that has no knowledge and no connection to the underlying system, similar to how the MIDI system works. With this there are only 3 top level music classes left - MIDIStreamer, StreamSong and CDSong.
...
Also made the decode_vorbis function in DUMB a function pointer so that the library does not depend on high level code and can just ignore the vorbis case if no supported.
2020-01-05 11:46:24 +01:00
Christoph Oelckers
5743a56ef4
- created a new zmusic library which will eventually contain all the music playback code.
...
Currently all it contains are the MIDI sources and the MIDI devices, the rest needs to be reworked first.
# Conflicts:
# libraries/zmusic/i_module.cpp
# libraries/zmusic/i_module.h
# src/CMakeLists.txt
# src/i_module.cpp
# src/i_module.h
# src/sound/music/midi_cvars.cpp
# src/utility/i_module.cpp
# src/utility/i_module.h
# Conflicts:
# src/CMakeLists.txt
# src/sound/musicformats/music_opl.cpp
2020-01-05 11:46:20 +01:00
Christoph Oelckers
c52b516c6f
- more dependency removal, this time from the MIDI devices.
...
# Conflicts:
# src/sound/mididevices/music_win_mididevice.cpp
# Conflicts:
# src/sound/mididevices/music_softsynth_mididevice.cpp
# src/sound/mididevices/music_timidity_mididevice.cpp
# src/sound/mididevices/music_timiditypp_mididevice.cpp
# src/sound/mididevices/music_wavewriter_mididevice.cpp
2020-01-05 02:43:50 +01:00
Christoph Oelckers
d3bfffbdab
- removed all dependencies on ZDoom code from the MIDI sources (including TArray and FileReader.)
2020-01-05 02:36:35 +01:00
Christoph Oelckers
4068febc5e
- fixed typo.
2020-01-05 02:36:32 +01:00
Christoph Oelckers
5460c72ee9
- moved the stream handling out of the MIDI device into the MIDIStreamer class.
...
This isn't the final location but this means that the device is merely a data provider, with the sole exception of the Win32 MIDI device whose unwieldy usage requirements unfortunately dictate much of the needed interface here.
2020-01-05 02:36:30 +01:00
Christoph Oelckers
f15be8b270
- split out the MIDIDevice implementation into its own source file.
2020-01-05 02:36:27 +01:00
Christoph Oelckers
447290aa4f
- WildMidi also done.
2020-01-05 02:31:56 +01:00
Christoph Oelckers
30f23738b3
- Timidity++ done.
2020-01-05 02:31:53 +01:00
Christoph Oelckers
67b25d88cf
- moved the last static variable - def_inst_name into the Instruments class.
...
With this the GUS device should be fully reentrant.
2020-01-05 02:31:50 +01:00
Christoph Oelckers
e75da52448
- fixed the GUS MIDI device.
...
The sound font reader may not be deleted because its ownership is transferred to the instrument set.
The gus_patchdir variable was not transferred to the config struct.
2020-01-05 02:31:47 +01:00
Christoph Oelckers
19742b5bc7
- took make_release_only off those subprojects which contain code that still need debugging on occasion.
...
For these performance on debug builds doesn't really matter anyway.
2020-01-05 02:31:44 +01:00