stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-15 09:11:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'kill-cd-support' into 'next'

Browse source 
Kill CD support

See merge request STJr/SRB2!1102
This commit is contained in:
James R 2020-08-09 20:48:25 -04:00
commit a808294c0c
11 changed files with 5 additions and 124 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/Makefile
View file

@ -488,7 +488,6 @@ OBJS:=$(i_main_o) \
$(OBJDIR)/lzf.o \
$(OBJDIR)/vid_copy.o \
$(OBJDIR)/b_bot.o \
$(i_cdmus_o) \
$(i_net_o) \
$(i_system_o) \
$(i_sound_o) \

1
src/Makefile.cfg
View file

@ -355,7 +355,6 @@ endif
endif
#determine the interface directory (where you put all i_*.c)
i_cdmus_o=$(OBJDIR)/i_cdmus.o
i_net_o=$(OBJDIR)/i_net.o
i_system_o=$(OBJDIR)/i_system.o
i_sound_o=$(OBJDIR)/i_sound.o

7
src/d_main.c
View file

@ -844,9 +844,6 @@ void D_SRB2Loop(void)
S_UpdateSounds(); // move positional sounds
S_UpdateClosedCaptions();
// check for media change, loop music..
I_UpdateCD();
#ifdef HW3SOUND
HW3S_EndFrameUpdate();
#endif
@ -1427,10 +1424,6 @@ void D_SRB2Main(void)
}
}
// Initialize CD-Audio
if (M_CheckParm("-usecd") && !dedicated)
I_InitCD();
if (M_CheckParm("-noupload"))
COM_BufAddText("downloading 0\n");

4
src/d_netcmd.c
View file

@ -861,10 +861,6 @@ void D_RegisterClientCommands(void)
CV_RegisterVar(&cv_midimusicvolume);
CV_RegisterVar(&cv_numChannels);
// i_cdmus.c
CV_RegisterVar(&cd_volume);
CV_RegisterVar(&cdUpdate);
// screen.c
CV_RegisterVar(&cv_fullscreen);
CV_RegisterVar(&cv_renderview);

51
src/i_sound.h
View file

@ -9,7 +9,7 @@
// See the 'LICENSE' file for more details.
//-----------------------------------------------------------------------------
/// \file i_sound.h
/// \brief System interface, sound, music and CD
/// \brief System interface, sound, music
#ifndef __I_SOUND__
#define __I_SOUND__
@ -241,53 +241,4 @@ boolean I_FadeSong(UINT8 target_volume, UINT32 ms, void (*callback)(void));
boolean I_FadeOutStopSong(UINT32 ms);
boolean I_FadeInPlaySong(UINT32 ms, boolean looping);
/// ------------------------
// CD MUSIC I/O
/// ------------------------
/** \brief cd music interface
*/
extern UINT8 cdaudio_started;
/** \brief Startup the CD system
*/
void I_InitCD(void);
/** \brief Stop the CD playback
*/
void I_StopCD(void);
/** \brief Pause the CD playback
*/
void I_PauseCD(void);
/** \brief Resume the CD playback
*/
void I_ResumeCD(void);
/** \brief Shutdown the CD system
*/
void I_ShutdownCD(void);
/** \brief Update the CD info
*/
void I_UpdateCD(void);
/** \brief The I_PlayCD function
\param track CD track number
\param looping if true, loop the track
\return void
*/
void I_PlayCD(UINT8 track, UINT8 looping);
/** \brief The I_SetVolumeCD function
\param volume volume level to set at
\return return 0 on failure
*/
boolean I_SetVolumeCD(INT32 volume);
#endif

3
src/p_setup.c
View file

@ -4168,9 +4168,6 @@ boolean P_LoadLevel(boolean fromnetsave)
// clear special respawning que
iquehead = iquetail = 0;
// Fab : 19-07-98 : start cd music for this level (note: can be remapped)
I_PlayCD((UINT8)(gamemap), false);
P_MapEnd();
// Remove the loading shit from the screen

10
src/s_sound.c
View file

@ -2433,13 +2433,6 @@ void S_PauseAudio(void)
if (I_SongPlaying() && !I_SongPaused())
I_PauseSong();
// pause cd music
#if (defined (__unix__) && !defined (MSDOS)) || defined (UNIXCOMMON) || defined (HAVE_SDL)
I_PauseCD();
#else
I_StopCD();
#endif
S_SetStackAdjustmentStart();
}
@ -2451,9 +2444,6 @@ void S_ResumeAudio(void)
if (I_SongPlaying() && I_SongPaused())
I_ResumeSong();
// resume cd music
I_ResumeCD();
S_AdjustMusicStackTics();
}

2
src/s_sound.h
View file

@ -69,8 +69,6 @@ extern consvar_t musserver_cmd, musserver_arg;
#endif
extern CV_PossibleValue_t soundvolume_cons_t[];
//part of i_cdmus.c
extern consvar_t cd_volume, cdUpdate;
#if defined (macintosh) && !defined (HAVE_SDL)
typedef enum

1
src/sdl/CMakeLists.txt
View file

@ -36,7 +36,6 @@ set(SRB2_SDL2_SOURCES
dosstr.c
endtxt.c
hwsym_sdl.c
i_cdmus.c
i_main.c
i_net.c
i_system.c

37
src/sdl/i_cdmus.c
View file

@ -1,37 +0,0 @@
#include "../command.h"
#include "../s_sound.h"
#include "../i_sound.h"
//
// CD MUSIC I/O
//
UINT8 cdaudio_started = 0;
consvar_t cd_volume = {"cd_volume","31",CV_SAVE,soundvolume_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
consvar_t cdUpdate = {"cd_update","1",CV_SAVE, NULL, NULL, 0, NULL, NULL, 0, 0, NULL};
void I_InitCD(void){}
void I_StopCD(void){}
void I_PauseCD(void){}
void I_ResumeCD(void){}
void I_ShutdownCD(void){}
void I_UpdateCD(void){}
void I_PlayCD(UINT8 track, UINT8 looping)
{
(void)track;
(void)looping;
}
FUNCMATH boolean I_SetVolumeCD(int volume)
{
(void)volume;
return false;
}

12
src/sdl/i_system.c
View file

@ -2333,7 +2333,6 @@ void I_Quit(void)
M_FreePlayerSetupColors();
I_ShutdownMusic();
I_ShutdownSound();
I_ShutdownCD();
// use this for 1.28 19990220 by Kin
I_ShutdownGraphics();
I_ShutdownInput();
@ -2394,16 +2393,14 @@ void I_Error(const char *error, ...)
if (errorcount == 3)
I_ShutdownSound();
if (errorcount == 4)
I_ShutdownCD();
if (errorcount == 5)
I_ShutdownGraphics();
if (errorcount == 6)
if (errorcount == 5)
I_ShutdownInput();
if (errorcount == 7)
if (errorcount == 6)
I_ShutdownSystem();
if (errorcount == 8)
if (errorcount == 7)
SDL_Quit();
if (errorcount == 9)
if (errorcount == 8)
{
M_SaveConfig(NULL);
G_SaveGameData();
@ -2451,7 +2448,6 @@ void I_Error(const char *error, ...)
M_FreePlayerSetupColors();
I_ShutdownMusic();
I_ShutdownSound();
I_ShutdownCD();
// use this for 1.28 19990220 by Kin
I_ShutdownGraphics();
I_ShutdownInput();