0ee0034beb
- apply the ZMusic mutex a bit more finely grained.
...
It should only guard the critical parts, like calling Stop() but can let Update and IsPlaying method work unhindered otherwise.
2019-10-20 16:16:40 +02:00
230da2e2b9
- fixed SPC music looping after update to GME 0.6.2
...
Why was the default player setup changed at all?
https://forum.zdoom.org/viewtopic.php?t=65863
2019-10-18 10:25:24 +03:00
4d8f0fc014
- fixed: ZMusic_Close may not lock the mutex because it will delete it.
...
Here the calling code must ensure that the music object won't be accessible anymore before it gets deleted.
2019-10-15 01:16:02 +02:00
6854a509e9
- Moved all music related synchronization to the top level
...
Most of the synchronization was too deep in the implementation so that it did not guard everything it needed.
Now each song has precisely one mutex which must be locked for all access to its internals - this is done in the public ZMusic interface
2019-10-15 00:49:40 +02:00
dc32c2148a
- ZMusic interface refactoring.
...
Use global functions instead of the class interface which exposed too many implementation details.
2019-10-15 00:23:03 +02:00
5851de9e0c
- added dynamic loading of FluidSynth 2.x
2019-10-13 10:09:51 +03:00
09dcb247cf
- return null instead of throwing exception if CD playback isn't supported
...
The game should switching to MIDI music on platforms without CD playback support
It was impossible to start Hexen on platforms other than Windows
2019-10-12 09:57:58 +03:00
53949e05f3
- handled differences of values returned by fluid_settings_...() functions
...
FluidSynth 1.x: these functions return 1 on success and 0 otherwise
FluidSynth 2.x: these functions return FLUID_OK (0) on success and FLUID_FAILED (-1) otherwise
2019-10-07 12:32:40 +03:00
59f649700f
- fixed setting of FluidSynth reverb and chorus
2019-10-07 12:20:56 +03:00
d7289f6469
- fixed compilation with old versions of Xcode
...
libraries/zmusic/mididevices/music_fluidsynth_mididevice.cpp:628:3: error: use of undeclared identifier 'free'
2019-10-06 14:28:49 +03:00
b02ef69d49
- cleaned POSIX compiler arguments for libraries
...
Removed omission of frame pointers as it makes crash reports much less useful
Modified warning flags to hide annoying reports for external code
2019-10-05 15:02:10 +03:00
46270326be
- implemented str(n)icmp function definitions via CMake macro
2019-10-05 14:47:36 +03:00
c09f196141
- applied fast math flags to C and C++ files
...
Avoid copy-paste using CMake macro
2019-10-05 14:41:21 +03:00
ace677b8a3
- fixed: soundfont selection for FluidSynth was ignored
2019-10-05 11:23:46 +03:00
1d9b5cb239
- restored ability to link with thirdparty sound libraries explicitly
...
DYN_SNDFILE=NO and DYN_MPG123=NO were ignored while DYN_FLUIDSYNTH=NO broke compilation
These options should be applied to ZMusic target instead of the main executable
As a bonus, it's now possible to build GZDoom without FluidSynth
2019-10-03 12:22:46 +03:00
d2c156224b
- cleanup of the sound init/exit code.
...
Now there is only one single entry point for both, instead of previously 2 entry and 4 exit points.
This also eliminates the explicit shutdown of ZMusic. Timidity++'s two buffers have been put in containers that self-destruct on shutdown and calling dumb_exit is not necessary because the only feature requiring it is not used by any code in the music library.
2019-10-01 20:04:46 +02:00
8ff51ca129
- fixed build issues with POSIX targets
2019-10-01 12:06:24 +03:00
9bb8da2533
- fixed the CDDA check to not catch all RIFF files.
2019-09-30 19:57:47 +02:00
a76cdd0946
- 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.
2019-09-30 19:41:03 +02:00
83e8e5535d
- fixed compilation on Windows.
2019-09-30 18:21:34 +02:00
2bc72f38cc
- renamed a few functions in the public interface of ZMusic.
2019-09-30 02:40:22 +02:00
02507effe8
- moved the music loader code to ZMusic.
...
This was the final piece of code reorganization.
What's left is cleaning up the interface.
2019-09-30 02:35:47 +02:00
c42deda6e6
- cleanup of the remaining music code in the main project
2019-09-30 02:31:12 +02:00
d0cf21654e
- 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.
2019-09-30 02:22:53 +02:00
352365189f
- moved the main music classes to ZMusic
...
What's left is the CD-Audio playback and some global functions.
2019-09-30 02:10:00 +02:00
6bfa1bf692
- fixed compilation with XCode and silenced several warnings
2019-09-30 01:51:53 +02:00
2c33e47988
- hooked up a few more CVARs and other values the music backend needs to know about and moved the MusInfo base class into zmusic.
2019-09-30 01:34:16 +02:00
7c27cd0c57
- 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
2019-09-30 00:02:31 +02:00
44a6b6e87c
- moved all configuration code to zmusic project.
...
The CVARs are now just getting forwarded without any own logic.
2019-09-29 22:01:19 +02:00
b7b57b904d
- first state of music configuration refactor.
2019-09-29 20:01:57 +02:00
6d7b6fb9fd
- moved MIDI format detection and source creation into zmusic project.
2019-09-29 14:47:10 +02:00
54b994e863
- configuration key enums. Not used yet.
2019-09-29 14:13:01 +02:00
859028b35a
- moved the stream sources to zmusic project.
2019-09-29 13:33:09 +02:00
247346e821
- removed ZDoom dependencies from music_libsndfile.cpp
2019-09-29 13:06:40 +02:00
cdf2a17c5a
- 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.
2019-09-29 12:48:12 +02:00
dbabc3c0f6
- ... and the raw OPL format.
2019-09-29 01:31:42 +02:00
5eed3dab59
- dependency cleanup in music_dumb.cpp.
2019-09-29 00:41:13 +02:00
7468c0f36d
- 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.)
2019-09-28 23:17:16 +02:00
d94b63b486
- 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.
2019-09-28 21:04:41 +02:00
cfe89ef6e6
- 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.
2019-09-28 18:32:25 +02:00
Christoph Oelckers
alexey.lysiuk