diff --git a/code/client/new/snd_local_new.h b/code/client/new/snd_local_new.h index 1f336208..69ae7dcf 100644 --- a/code/client/new/snd_local_new.h +++ b/code/client/new/snd_local_new.h @@ -59,6 +59,9 @@ typedef struct { void S_ChannelFree_Callback(channel_t* v); void S_LoadData(soundsystemsavegame_t* pSave); void S_SaveData(soundsystemsavegame_t* pSave); +void S_ReLoad(soundsystemsavegame_t* pSave); + +extern qboolean s_bSoundPaused; #ifdef __cplusplus } diff --git a/code/client/new/snd_main_new.cpp b/code/client/new/snd_main_new.cpp index 0007453a..e2417250 100644 --- a/code/client/new/snd_main_new.cpp +++ b/code/client/new/snd_main_new.cpp @@ -25,6 +25,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #if !defined(USE_SOUND_NEW) || !USE_SOUND_NEW +qboolean s_bSoundPaused = qfalse; + void S_Init2() { S_Init(); @@ -492,24 +494,62 @@ void S_TriggeredMusic_PlayIntroMusic() { S_StartBackgroundTrack("sound/music/mus_MainTheme.mp3", ""); } +/* +============== +S_TriggeredMusic_SetupHandle +============== +*/ +void S_TriggeredMusic_SetupHandle(const char* pszName, int iLoopCount, int iOffset, qboolean autostart) { + // FIXME: unimplemented +} + +/* +============== +callbackServer +============== +*/ void callbackServer(int entnum, int channel_number, const char* name) { if (com_sv_running->integer) { SV_SoundCallback(entnum, channel_number, name); } } +/* +============== +S_ChannelFree_Callback +============== +*/ void S_ChannelFree_Callback(channel_t* v) { if (v->entnum & S_FLAG_DO_CALLBACK) { callbackServer(v->entnum & ~S_FLAG_DO_CALLBACK, v - s_channels, v->thesfx->soundName); } } +/* +============== +S_LoadData +============== +*/ void S_LoadData(soundsystemsavegame_t* pSave) { // FIXME: unimplemented } +/* +============== +S_SaveData +============== +*/ void S_SaveData(soundsystemsavegame_t* pSave) { // FIXME: unimplemented } +/* +============== +S_ReLoad +============== +*/ +void S_ReLoad(soundsystemsavegame_t* pSave) { + // FIXME: unimplemented +} + #endif diff --git a/code/client/new/snd_public_new.h b/code/client/new/snd_public_new.h index 1e7d32a2..30fe316f 100644 --- a/code/client/new/snd_public_new.h +++ b/code/client/new/snd_public_new.h @@ -78,6 +78,7 @@ qboolean S_IsSoundPlaying(int channelNumber, const char* name); void S_UpdateEntity(int entityNum, const vec3_t origin, const vec3_t velocity, qboolean use_listener); void S_FadeSound(float fTime); void S_TriggeredMusic_PlayIntroMusic(); +void S_TriggeredMusic_SetupHandle(const char* pszName, int iLoopCount, int iOffset, qboolean autostart); #ifdef __cplusplus }