zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-01-11 18:50:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

- added remaining music files to project

Browse source
This commit is contained in:
Christoph Oelckers 2019-11-11 00:31:36 +01:00
parent 5e95ef5322
commit ae06d19008
3 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
source/CMakeLists.txt
View file

@ -838,9 +838,14 @@ set (PCH_SOURCES
common/textures/formats/tgatexture.cpp common/textures/formats/tgatexture.cpp
common/textures/formats/stbtexture.cpp common/textures/formats/stbtexture.cpp
common/textures/formats/arttexture.cpp common/textures/formats/arttexture.cpp
common/music/music.cpp common/music/music.cpp
common/music/i_music.cpp
common/music/i_soundfont.cpp
common/music/music_config.cpp
common/music/music_midi_base.cpp
) )
if( MSVC ) if( MSVC )

14
source/common/music/i_music.cpp
View file

@ -40,22 +40,20 @@
#include <zlib.h> #include <zlib.h>
#include "m_argv.h" #include "m_argv.h"
#include "w_wad.h" #include "filesystrem.h"
#include "c_dispatch.h" #include "c_dispatch.h"
#include "templates.h" #include "templates.h"
#include "stats.h" #include "stats.h"
#include "c_cvars.h" #include "c_cvars.h"
#include "c_console.h" #include "c_console.h"
#include "vm.h"
#include "v_text.h" #include "v_text.h"
#include "i_sound.h"
#include "i_soundfont.h" #include "i_soundfont.h"
#include "s_music.h" #include "s_music.h"
#include "doomstat.h" #include "printf.h"
#include "zmusic/zmusic.h" #include "zmusic/zmusic.h"
#include "streamsources/streamsource.h" #include "streamsources/streamsource.h"
#include "filereadermusicinterface.h" #include "filereadermusicinterface.h"
#include "../libraries/zmusic/midisources/midisource.h" #include "midisources/midisource.h"
@ -119,11 +117,13 @@ CUSTOM_CVARD(Int, mus_volume, 255, CVAR_ARCHIVE|CVAR_GLOBALCONFIG, "controls mus
else else
{ {
// Set general music volume. // Set general music volume.
ChangeMusicSetting(ZMusic::mus_volume, nullptr, self / 255.f); ChangeMusicSetting(ZMusic::snd_musicvolume, nullptr, self / 255.f);
/* todo: Alter the active music stream's volume
if (GSnd != nullptr) if (GSnd != nullptr)
{ {
GSnd->SetMusicVolume(clamp<float>(self * relative_volume * snd_mastervolume, 0, 1)); GSnd->SetMusicVolume(clamp<float>(self * relative_volume, 0, 1));
} }
*/
// For music not implemented through the digital sound system, // For music not implemented through the digital sound system,
// let them know about the change. // let them know about the change.
if (mus_playing.handle != nullptr) if (mus_playing.handle != nullptr)

1
source/common/music/i_soundfont.cpp
View file

@ -36,7 +36,6 @@
#include <assert.h> #include <assert.h>
#include "i_soundfont.h" #include "i_soundfont.h"
#include "cmdlib.h" #include "cmdlib.h"
#include "i_system.h"
#include "gameconfigfile.h" #include "gameconfigfile.h"
#include "filereadermusicinterface.h" #include "filereadermusicinterface.h"
#include "zmusic/zmusic.h" #include "zmusic/zmusic.h"