zdoom
/
raze-gles
mirror of https://github.com/ZDoom/raze-gles.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- removed leftpver music calls as well. 

The code should now be free of the old audio backend.
This commit is contained in:
Christoph Oelckers 2019-12-18 22:32:09 +01:00
parent 3f9657b96a
commit 2cf9a4a626
19 changed files with 5 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
source/CMakeLists.txt
View File

@ -476,7 +476,6 @@ endif()
# Start defining source files for Demolition # Start defining source files for Demolition
set( PLAT_WIN32_SOURCES set( PLAT_WIN32_SOURCES
audiolib/src/driver_directsound.cpp
glad/src/glad_wgl.c glad/src/glad_wgl.c
platform/win32/winbits.cpp platform/win32/winbits.cpp
platform/win32/i_specialpaths.cpp platform/win32/i_specialpaths.cpp
@ -489,8 +488,6 @@ set( PLAT_WIN32_SOURCES
) )
set( PLAT_POSIX_SOURCES set( PLAT_POSIX_SOURCES
#audiolib/src/driver_sdl.cpp
#audiolib/src/sdlmusic.cpp
#platform/gtk/startgtk.game.cpp #platform/gtk/startgtk.game.cpp
) )
@ -605,8 +602,6 @@ add_definitions(-DOPNMIDI_DISABLE_GX_EMULATOR)
# Project files should be aware of the header files. We can GLOB these since # Project files should be aware of the header files. We can GLOB these since
# there's generally a new cpp for every header so this file will get changed # there's generally a new cpp for every header so this file will get changed
file( GLOB HEADER_FILES file( GLOB HEADER_FILES
audiolib/include/*.h
audiolib/src/*.h
build/include/*.h build/include/*.h
glad/include/glad/*.h glad/include/glad/*.h
glad/include/Khr/*.h glad/include/Khr/*.h
@ -666,22 +661,6 @@ set( FASTMATH_SOURCES
set (PCH_SOURCES set (PCH_SOURCES
audiolib/src/drivers.cpp
audiolib/src/driver_adlib.cpp
audiolib/src/driver_sdl.cpp
audiolib/src/driver_winmm.cpp
audiolib/src/formats.cpp
audiolib/src/fx_man.cpp
audiolib/src/gmtimbre.cpp
audiolib/src/midi.cpp
audiolib/src/mix.cpp
audiolib/src/mixst.cpp
audiolib/src/multivoc.cpp
audiolib/src/music.cpp
audiolib/src/opl3.cpp
audiolib/src/pitch.cpp
audiolib/src/vorbis.cpp
glbackend/gl_hwtexture.cpp glbackend/gl_hwtexture.cpp
glbackend/gl_samplers.cpp glbackend/gl_samplers.cpp
glbackend/gl_shader.cpp glbackend/gl_shader.cpp
@ -887,7 +866,6 @@ target_link_libraries( demolition ${DEMOLITION_LIBS} gdtoa lzma duke3d blood rr
include_directories( include_directories(
${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
build/include build/include
audiolib/include
glad/include glad/include
libxmp-lite/include libxmp-lite/include
libxmp-lite/include/libxmp-lite libxmp-lite/include/libxmp-lite
@ -1019,9 +997,6 @@ source_group("Code\\Sound" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/comm
source_group("Code\\Sound\\Backend" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/sound/backend/.+") source_group("Code\\Sound\\Backend" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/sound/backend/.+")
source_group("Code\\DObject" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/dobject/.+") source_group("Code\\DObject" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/dobject/.+")
source_group("Code\\Menu" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/menu/.+") source_group("Code\\Menu" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/menu/.+")
source_group("Utility\\Audiolib" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/audiolib/.+")
source_group("Utility\\Audiolib Headers" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/audiolib/include/.+")
source_group("Utility\\Audiolib Sources" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/audiolib/src/.+")
source_group("Utility\\Glad" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/glad/.+") source_group("Utility\\Glad" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/glad/.+")
source_group("Utility\\Glad Headers" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/glad/include/glad/.+") source_group("Utility\\Glad Headers" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/glad/include/glad/.+")
source_group("Utility\\Glad Khr Headers" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/glad/include/Khr/.+") source_group("Utility\\Glad Khr Headers" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/glad/include/Khr/.+")

4
source/blood/src/blood.cpp
View File

@ -49,7 +49,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "loadsave.h" #include "loadsave.h"
#include "gamemenu.h" #include "gamemenu.h"
#include "mirrors.h" #include "mirrors.h"
#include "music.h"
#include "network.h" #include "network.h"
#include "osdcmds.h" #include "osdcmds.h"
#include "replace.h" #include "replace.h"
@ -402,8 +401,6 @@ void PreloadCache(void)
if (r_precache) PrecacheHardwareTextures(i); if (r_precache) PrecacheHardwareTextures(i);
#endif #endif
MUSIC_Update();
if ((++cnt & 7) == 0) if ((++cnt & 7) == 0)
gameHandleEvents(); gameHandleEvents();
@ -1249,7 +1246,6 @@ RESTART:
{ {
handleevents(); handleevents();
netUpdate(); netUpdate();
MUSIC_Update();
inputState.SetBindsEnabled(gInputMode == kInputGame); inputState.SetBindsEnabled(gInputMode == kInputGame);
switch (gInputMode) switch (gInputMode)
{ {

2
source/blood/src/demo.cpp
View File

@ -39,7 +39,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "levels.h" #include "levels.h"
#include "messages.h" #include "messages.h"
#include "misc.h" #include "misc.h"
#include "music.h"
#include "network.h" #include "network.h"
#include "player.h" #include "player.h"
#include "screen.h" #include "screen.h"
@ -310,7 +309,6 @@ _DEMOPLAYBACK:
while (at1 && !gQuitGame) while (at1 && !gQuitGame)
{ {
handleevents(); handleevents();
MUSIC_Update();
while (totalclock >= gNetFifoClock && !gQuitGame) while (totalclock >= gNetFifoClock && !gQuitGame)
{ {
if (!v4) if (!v4)

1
source/blood/src/sound.cpp
View File

@ -24,7 +24,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "build.h" #include "build.h"
#include "compat.h" #include "compat.h"
#include "music.h"
#include "common_game.h" #include "common_game.h"
#include "config.h" #include "config.h"
#include "levels.h" #include "levels.h"

1
source/duke3d/src/duke3d.h
View File

@ -118,7 +118,6 @@ EDUKE32_STATIC_ASSERT(7 <= MAXTILES-MAXUSERTILES);
#include "global.h" #include "global.h"
#include "inv.h" #include "inv.h"
#include "macros.h" #include "macros.h"
#include "music.h"
#include "namesdyn.h" #include "namesdyn.h"
#include "network.h" #include "network.h"
#include "player.h" #include "player.h"

2
source/duke3d/src/premap.cpp
View File

@ -468,8 +468,6 @@ void G_CacheMapData(void)
if (r_precache) PrecacheHardwareTextures(i); if (r_precache) PrecacheHardwareTextures(i);
#endif #endif
MUSIC_Update();
if ((++cnt & 7) == 0) if ((++cnt & 7) == 0)
gameHandleEvents(); gameHandleEvents();
} }

2
source/duke3d/src/screens.cpp
View File

@ -2055,7 +2055,6 @@ void G_BonusScreen(int32_t bonusonly)
while (totalclock < TICRATE*10) while (totalclock < TICRATE*10)
{ {
gameHandleEvents(); gameHandleEvents();
MUSIC_Update();
if (G_FPSLimit()) if (G_FPSLimit())
{ {
@ -2099,7 +2098,6 @@ void G_BonusScreen(int32_t bonusonly)
int32_t yy = 0, zz; int32_t yy = 0, zz;
gameHandleEvents(); gameHandleEvents();
MUSIC_Update();
if (G_FPSLimit()) if (G_FPSLimit())
{ {

1
source/rr/src/duke3d.h
View File

@ -122,7 +122,6 @@ END_RR_NS
#include "global.h" #include "global.h"
#include "inv.h" #include "inv.h"
#include "macros.h" #include "macros.h"
#include "music.h"
#include "namesdyn.h" #include "namesdyn.h"
#include "net.h" #include "net.h"
#include "player.h" #include "player.h"

1
source/rr/src/game.cpp
View File

@ -7568,7 +7568,6 @@ MAIN_LOOP_RESTART:
else else
#endif #endif
{ {
MUSIC_Update();
G_HandleLocalKeys(); G_HandleLocalKeys();
} }

2
source/rr/src/premap.cpp
View File

@ -629,8 +629,6 @@ void G_CacheMapData(void)
} }
else continue; else continue;
MUSIC_Update();
if ((j&7) == 0) if ((j&7) == 0)
G_HandleAsync(); G_HandleAsync();

8
source/rr/src/screens.cpp
View File

@ -2074,7 +2074,6 @@ void G_BonusScreen(int32_t bonusonly)
while (totalclock < TICRATE*10) while (totalclock < TICRATE*10)
{ {
G_HandleAsync(); G_HandleAsync();
MUSIC_Update();
if (G_FPSLimit()) if (G_FPSLimit())
{ {
@ -2139,7 +2138,6 @@ void G_BonusScreen(int32_t bonusonly)
int32_t yy = 0, zz; int32_t yy = 0, zz;
G_HandleAsync(); G_HandleAsync();
MUSIC_Update();
if (G_FPSLimit()) if (G_FPSLimit())
{ {
@ -2619,7 +2617,7 @@ void G_BonusScreenRRRA(int32_t bonusonly)
if ((ud.eog == 0 || ud.volume_number != 1) && ud.volume_number <= 1) if ((ud.eog == 0 || ud.volume_number != 1) && ud.volume_number <= 1)
{ {
showMap = 1; showMap = 1;
MUSIC_StopSong(); Mus_Stop();
inputState.keyFlushChars(); inputState.keyFlushChars();
P_SetGamePalette(g_player[myconnectindex].ps, BASEPAL, 8+2+1); P_SetGamePalette(g_player[myconnectindex].ps, BASEPAL, 8+2+1);
@ -2658,7 +2656,6 @@ void G_BonusScreenRRRA(int32_t bonusonly)
while (totalclock < TICRATE*10) while (totalclock < TICRATE*10)
{ {
G_HandleAsync(); G_HandleAsync();
MUSIC_Update();
if (G_FPSLimit()) if (G_FPSLimit())
{ {
@ -2709,7 +2706,6 @@ void G_BonusScreenRRRA(int32_t bonusonly)
int32_t yy = 0, zz; int32_t yy = 0, zz;
G_HandleAsync(); G_HandleAsync();
MUSIC_Update();
if (G_FPSLimit()) if (G_FPSLimit())
{ {
@ -2726,7 +2722,7 @@ void G_BonusScreenRRRA(int32_t bonusonly)
if (bonuscnt == 7) if (bonuscnt == 7)
{ {
bonuscnt++; bonuscnt++;
MUSIC_StopSong(); Mus_Stop();
G_PlayMapAnim(); G_PlayMapAnim();
break; break;
} }

1
source/sw/src/anim.cpp
View File

@ -30,7 +30,6 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
#include "keys.h" #include "keys.h"
#include "mytypes.h" #include "mytypes.h"
#include "music.h"
#include "gamedefs.h" #include "gamedefs.h"
#include "config.h" #include "config.h"

1
source/sw/src/d_menu.cpp
View File

@ -43,7 +43,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "gamedefs.h" #include "gamedefs.h"
#include "config.h" #include "config.h"
#include "network.h" #include "network.h"
#include "music.h"
#include "text.h" #include "text.h"
#include "version.h" #include "version.h"
#include "network.h" #include "network.h"

1
source/sw/src/game.cpp
View File

@ -84,7 +84,6 @@ Things required to make savegames work:
#include "track.h" #include "track.h"
#include "jsector.h" #include "jsector.h"
#include "text.h" #include "text.h"
#include "music.h"
#include "common.h" #include "common.h"
#include "common_game.h" #include "common_game.h"

1
source/sw/src/menus.cpp
View File

@ -49,7 +49,6 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
#include "gamedefs.h" #include "gamedefs.h"
#include "config.h" #include "config.h"
#include "network.h" #include "network.h"
#include "music.h"
#include "text.h" #include "text.h"
#include "version.h" #include "version.h"
#include "network.h" #include "network.h"

6
source/sw/src/player.cpp
View File

@ -59,12 +59,12 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
#include "sector.h" #include "sector.h"
#include "actor.h" #include "actor.h"
#include "colormap.h" #include "colormap.h"
#include "music.h"
#include "vis.h" #include "vis.h"
#include "track.h" #include "track.h"
#include "interp.h" #include "interp.h"
#include "menu/menu.h" #include "menu/menu.h"
#include "gstrings.h" #include "gstrings.h"
#include "z_music.h"
BEGIN_SW_NS BEGIN_SW_NS
@ -7856,14 +7856,14 @@ void PauseMultiPlay(void)
SavePrediction = PredictionOn; SavePrediction = PredictionOn;
PredictionOn = FALSE; PredictionOn = FALSE;
MUSIC_Pause(); Mus_SetPaused(true);
} }
else else
{ {
PredictionOn = SavePrediction; PredictionOn = SavePrediction;
MUSIC_Continue();
TRAVERSE_CONNECT(p) TRAVERSE_CONNECT(p)
pClearTextLine(Player + p, 100); pClearTextLine(Player + p, 100);
Mus_SetPaused(false);
} }
} }
} }

2
source/sw/src/save.cpp
View File

@ -48,8 +48,6 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
//#define FILE_TYPE 1 //#define FILE_TYPE 1
#include "mfile.h" #include "mfile.h"
#include "music.h"
#include "weapon.h" #include "weapon.h"
#include "cache.h" #include "cache.h"
#include "colormap.h" #include "colormap.h"

1
source/sw/src/setup.cpp
View File

@ -30,7 +30,6 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
#include "game.h" #include "game.h"
#include "mytypes.h" #include "mytypes.h"
#include "music.h"
#include "gamedefs.h" #include "gamedefs.h"
#include "config.h" #include "config.h"

2
source/sw/src/sounds.cpp
View File

@ -32,8 +32,6 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
#include "names2.h" #include "names2.h"
#include "mytypes.h" #include "mytypes.h"
#include "music.h"
#include "al_midi.h"
#include "gamedefs.h" #include "gamedefs.h"
#include "config.h" #include "config.h"