Christoph Oelckers
9bb8da2533
- fixed the CDDA check to not catch all RIFF files.
2019-09-30 19:57:47 +02:00
Christoph Oelckers
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
Christoph Oelckers
83e8e5535d
- fixed compilation on Windows.
2019-09-30 18:21:34 +02:00
Christoph Oelckers
2bc72f38cc
- renamed a few functions in the public interface of ZMusic.
2019-09-30 02:40:22 +02:00
Christoph Oelckers
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
Christoph Oelckers
c42deda6e6
- cleanup of the remaining music code in the main project
2019-09-30 02:31:12 +02:00
Christoph Oelckers
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
Christoph Oelckers
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
Christoph Oelckers
6bfa1bf692
- fixed compilation with XCode and silenced several warnings
2019-09-30 01:51:53 +02:00
Christoph Oelckers
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
Christoph Oelckers
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
Christoph Oelckers
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
Christoph Oelckers
b7b57b904d
- first state of music configuration refactor.
2019-09-29 20:01:57 +02:00
Christoph Oelckers
6d7b6fb9fd
- moved MIDI format detection and source creation into zmusic project.
2019-09-29 14:47:10 +02:00
Christoph Oelckers
54b994e863
- configuration key enums. Not used yet.
2019-09-29 14:13:01 +02:00
Christoph Oelckers
859028b35a
- moved the stream sources to zmusic project.
2019-09-29 13:33:09 +02:00
Christoph Oelckers
247346e821
- removed ZDoom dependencies from music_libsndfile.cpp
2019-09-29 13:06:40 +02:00
Christoph Oelckers
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
Christoph Oelckers
dbabc3c0f6
- ... and the raw OPL format.
2019-09-29 01:31:42 +02:00
Christoph Oelckers
5eed3dab59
- dependency cleanup in music_dumb.cpp.
2019-09-29 00:41:13 +02:00
Christoph Oelckers
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
Christoph Oelckers
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
Christoph Oelckers
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