diff --git a/src/s_sound.c b/src/s_sound.c index 072a69f6c..2eeecadd5 100644 --- a/src/s_sound.c +++ b/src/s_sound.c @@ -11,16 +11,6 @@ /// \file s_sound.c /// \brief System-independent sound and music routines -#ifdef MUSSERV -#include -struct musmsg -{ - long msg_type; - char msg_text[12]; -}; -extern INT32 msg_id; -#endif - #include "doomdef.h" #include "doomstat.h" #include "command.h" @@ -70,16 +60,6 @@ static lumpnum_t S_GetMusicLumpNum(const char *mname); static boolean S_CheckQueue(void); -// commands for music and sound servers -#ifdef MUSSERV -consvar_t musserver_cmd = {"musserver_cmd", "musserver", CV_SAVE, NULL, NULL, 0, NULL, NULL, 0, 0, NULL}; -consvar_t musserver_arg = {"musserver_arg", "-t 20 -f -u 0 -i music.dta", CV_SAVE, NULL, NULL, 0, NULL, NULL, 0, 0, NULL}; -#endif -#ifdef SNDSERV -consvar_t sndserver_cmd = {"sndserver_cmd", "llsndserv", CV_SAVE, NULL, 0, NULL, NULL, 0, 0, NULL}; -consvar_t sndserver_arg = {"sndserver_arg", "-quiet", CV_SAVE, NULL, 0, NULL, NULL, 0, 0, NULL}; -#endif - #if defined (_WINDOWS) && !defined (SURROUND) //&& defined (_X86_) #define SURROUND #endif @@ -292,14 +272,6 @@ void S_RegisterSoundStuff(void) CV_RegisterVar(&stereoreverse); CV_RegisterVar(&precachesound); -#ifdef SNDSERV - CV_RegisterVar(&sndserver_cmd); - CV_RegisterVar(&sndserver_arg); -#endif -#ifdef MUSSERV - CV_RegisterVar(&musserver_cmd); - CV_RegisterVar(&musserver_arg); -#endif CV_RegisterVar(&surround); CV_RegisterVar(&cv_samplerate); CV_RegisterVar(&cv_resetmusic); @@ -2230,17 +2202,6 @@ static boolean S_LoadMusic(const char *mname) // load & register it mdata = W_CacheLumpNum(mlumpnum, PU_MUSIC); -#ifdef MUSSERV - if (msg_id != -1) - { - struct musmsg msg_buffer; - - msg_buffer.msg_type = 6; - memset(msg_buffer.msg_text, 0, sizeof (msg_buffer.msg_text)); - sprintf(msg_buffer.msg_text, "d_%s", mname); - msgsnd(msg_id, (struct msgbuf*)&msg_buffer, sizeof (msg_buffer.msg_text), IPC_NOWAIT); - } -#endif if (I_LoadSong(mdata, W_LumpLength(mlumpnum))) { diff --git a/src/s_sound.h b/src/s_sound.h index 35d1c3dc5..744065754 100644 --- a/src/s_sound.h +++ b/src/s_sound.h @@ -61,13 +61,6 @@ extern consvar_t cv_midisoundfontpath; extern consvar_t cv_miditimiditypath; #endif -#ifdef SNDSERV -extern consvar_t sndserver_cmd, sndserver_arg; -#endif -#ifdef MUSSERV -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;