The portable_samplepair_t structure has no need to be public

[xonotic/darkplaces.git] / sound.h

diff --git a/sound.h b/sound.h
index ffefe94036e3253a9c28c4bc5b4d16682cbfee5f..bf8b5191566883de40dd6c289a5cb2feaf991918 100644 (file)
--- a/sound.h
+++ b/sound.h
@@ -25,12 +25,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #define DEFAULT_SOUND_PACKET_VOLUME 255
 #define DEFAULT_SOUND_PACKET_ATTENUATION 1.0
 
-typedef struct
-{
-       int left;
-       int right;
-} portable_samplepair_t;
-
 typedef struct
 {
        size_t  length;
@@ -78,7 +72,8 @@ typedef struct
        int             leftvol;                // 0-255 volume
        int             rightvol;               // 0-255 volume
        int             end;                    // end time in global paintsamples
-       int     pos;                    // sample position in sfx
+       int             lastptime;              // last time this channel was painted
+       int             pos;                    // sample position in sfx
        int             looping;                // where to loop, -1 = no looping
        int             entnum;                 // to allow overriding a specific sound
        int             entchannel;
@@ -96,16 +91,6 @@ struct snd_fetcher_s
        snd_fetcher_end_t       end;
 };
 
-typedef struct
-{
-       int             rate;
-       int             width;
-       int             channels;
-       int             loopstart;
-       int             samples;
-       int             dataofs;                // chunk starts this many bytes from file start
-} wavinfo_t;
-
 void S_Init (void);
 void S_Startup (void);
 void S_Shutdown (void);
@@ -125,12 +110,6 @@ void S_PurgeUnused (void);
 void S_PaintChannels(int endtime);
 void S_InitPaintChannels (void);
 
-// picks a channel based on priorities, empty slots, number of channels
-channel_t *SND_PickChannel(int entnum, int entchannel);
-
-// spatializes a channel
-void SND_Spatialize(channel_t *ch, int isstatic);
-
 // initializes cycling through a DMA buffer and returns information on it
 qboolean SNDDMA_Init(void);