Clean up sound code

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 911

1 files changed, 8 insertions, 23 deletions

diff --git a/src/s_sound.h b/src/s_sound.h
index 015a18fa..c5460aed 100644
--- a/src/s_sound.h
+++ b/src/s_sound.h
@@ -51,10 +51,8 @@ extern int snd_musicdevice;
 // Sets channels, SFX and music volume,
 //  allocates channel buffer, sets S_sfx lookup.
 //
-void
-S_Init
-( int		sfxVolume,
-  int		musicVolume );
+
+void S_Init(int sfxVolume, int musicVolume);
 
 
 // Shut down sound 
@@ -68,29 +66,18 @@ void S_Shutdown(void);
 // Kills playing sounds at start of level,
 //  determines music if any, changes music.
 //
+
 void S_Start(void);
 
 //
 // Start sound for thing at <origin>
 //  using <sound_id> from sounds.h
 //
-void
-S_StartSound
-( void*		origin,
-  int		sound_id );
-
-
-
-// Will start a sound at a given volume.
-void
-S_StartSoundAtVolume
-( void*		origin,
-  int		sound_id,
-  int		volume );
 
+void S_StartSound(void *origin, int sound_id);
 
 // Stop sound for thing at <origin>
-void S_StopSound(void* origin);
+void S_StopSound(mobj_t *origin);
 
 
 // Start music using <music_id> from sounds.h
@@ -98,10 +85,7 @@ void S_StartMusic(int music_id);
 
 // Start music using <music_id> from sounds.h,
 //  and set whether looping
-void
-S_ChangeMusic
-( int		music_id,
-  int		looping );
+void S_ChangeMusic(int music_id, int looping);
 
 // query if music is playing
 boolean S_MusicPlaying(void);
@@ -117,10 +101,11 @@ void S_ResumeSound(void);
 //
 // Updates music & sounds
 //
-void S_UpdateSounds(void* listener);
+void S_UpdateSounds(mobj_t *listener);
 
 void S_SetMusicVolume(int volume);
 void S_SetSfxVolume(int volume);
 
 
 #endif
+