rip in pieces cd music
death
This commit is contained in:
1 parent
6f998f922b
commit
67c67ec1b0
11 files changed
+6
-126
No files matched your search
@@ -604,7 +604,6 @@ OBJS:=$(i_main_o) \
|
||||
$(OBJDIR)/lzf.o \
|
||||
$(OBJDIR)/b_bot.o \
|
||||
$(OBJDIR)/args.o \
|
||||
$(i_cdmus_o) \
|
||||
$(i_net_o) \
|
||||
$(i_system_o) \
|
||||
$(i_sound_o) \
|
||||
|
||||
@@ -375,7 +375,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
|
||||
|
||||
@@ -802,9 +802,6 @@ void D_SRB2Loop(void)
|
||||
// consoleplayer -> displayplayers (hear sounds from viewpoint)
|
||||
S_UpdateSounds(); // move positional sounds
|
||||
|
||||
// check for media change, loop music..
|
||||
I_UpdateCD();
|
||||
|
||||
#ifdef HW3SOUND
|
||||
HW3S_EndFrameUpdate();
|
||||
#endif
|
||||
@@ -1482,10 +1479,6 @@ void D_SRB2Main(void)
|
||||
}
|
||||
}
|
||||
|
||||
// Initialize CD-Audio
|
||||
if (M_CheckParm("-usecd") && !dedicated)
|
||||
I_InitCD();
|
||||
|
||||
if (M_CheckParm("-noupload"))
|
||||
COM_BufAddText("downloading 0\n");
|
||||
|
||||
|
||||
@@ -1105,10 +1105,6 @@ void D_RegisterClientCommands(void)
|
||||
#endif
|
||||
CV_RegisterVar(&cv_numChannels);
|
||||
|
||||
// i_cdmus.c
|
||||
CV_RegisterVar(&cd_volume);
|
||||
CV_RegisterVar(&cdUpdate);
|
||||
|
||||
// screen.c
|
||||
CV_RegisterVar(&cv_fullscreen);
|
||||
CV_RegisterVar(&cv_renderview);
|
||||
|
||||
+1
-51
@@ -9,8 +9,7 @@
|
||||
// See the 'LICENSE' file for more details.
|
||||
//-----------------------------------------------------------------------------
|
||||
/// \file i_sound.h
|
||||
/// \brief System interface, sound, music and CD
|
||||
|
||||
/// \brief System interface, sound and music
|
||||
#ifndef __I_SOUND__
|
||||
#define __I_SOUND__
|
||||
|
||||
@@ -243,53 +242,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
|
||||
+1
-4
@@ -22,7 +22,7 @@
|
||||
#include "p_saveg.h"
|
||||
|
||||
#include "i_time.h"
|
||||
#include "i_sound.h" // for I_PlayCD()..
|
||||
#include "i_sound.h"
|
||||
#include "i_video.h" // for I_FinishUpdate()..
|
||||
#include "r_sky.h"
|
||||
#include "i_system.h"
|
||||
@@ -3355,9 +3355,6 @@ boolean P_SetupLevel(boolean skipprecip)
|
||||
// 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);
|
||||
|
||||
// preload graphics
|
||||
#ifdef HWRENDER // not win32 only 19990829 by Kin
|
||||
if (rendermode != render_soft && rendermode != render_none)
|
||||
|
||||
@@ -1905,22 +1905,12 @@ 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
|
||||
}
|
||||
|
||||
void S_ResumeAudio(void)
|
||||
{
|
||||
if (I_SongPlaying() && I_SongPaused())
|
||||
I_ResumeSong();
|
||||
|
||||
// resume cd music
|
||||
I_ResumeCD();
|
||||
}
|
||||
|
||||
void S_DisableSound(void)
|
||||
|
||||
@@ -62,8 +62,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
|
||||
|
||||
@@ -30,7 +30,6 @@ set(SRB2_SDL2_SOURCES
|
||||
dosstr.c
|
||||
endtxt.c
|
||||
hwsym_sdl.c
|
||||
i_cdmus.c
|
||||
i_main.c
|
||||
i_net.c
|
||||
i_system.c
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
+4
-8
@@ -3268,7 +3268,6 @@ void I_Quit(void)
|
||||
D_QuitNetGame();
|
||||
I_ShutdownMusic();
|
||||
I_ShutdownSound();
|
||||
I_ShutdownCD();
|
||||
// use this for 1.28 19990220 by Kin
|
||||
I_ShutdownGraphics();
|
||||
I_ShutdownInput();
|
||||
@@ -3329,16 +3328,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(false);
|
||||
@@ -3386,7 +3383,6 @@ void I_Error(const char *error, ...)
|
||||
D_QuitNetGame();
|
||||
I_ShutdownMusic();
|
||||
I_ShutdownSound();
|
||||
I_ShutdownCD();
|
||||
// use this for 1.28 19990220 by Kin
|
||||
I_ShutdownGraphics();
|
||||
I_ShutdownInput();
|
||||
|
||||
Reference in new issue
Block a user