eliminated qbyte type, now uses unsigned char throughout the engine for this purpose

[xonotic/darkplaces.git] / snd_main.h

diff --git a/snd_main.h b/snd_main.h
index 0eea61ada550ff99a6d3e04be5906f79965d2402..fbf2f3e46b018da6a80445327406c7471ed8c224 100644 (file)
--- a/snd_main.h
+++ b/snd_main.h
@@ -24,14 +24,14 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "sound.h"
 
 
-typedef struct
+typedef struct sfxbuffer_s
 {
        unsigned int    length;
        unsigned int    offset;
-       qbyte   data[4];        // variable sized
+       unsigned char   data[4];        // variable sized
 } sfxbuffer_t;
 
-typedef struct
+typedef struct snd_format_s
 {
        unsigned int    speed;
        unsigned int    width;
@@ -64,7 +64,7 @@ struct sfx_s
        void                            *fetcher_data;  // Per-sfx data for the sound fetching functions
 };
 
-typedef struct
+typedef struct dma_s
 {
        snd_format_t    format;
        int                             samples;                // mono samples in buffer
@@ -73,7 +73,7 @@ typedef struct
        int                             bufferlength;   // used only by certain drivers
 } dma_t;
 
-typedef struct
+typedef struct channel_s
 {
        sfx_t                   *sfx;                   // sfx number
        unsigned int    flags;                  // cf CHANNELFLAG_* defines
@@ -121,7 +121,7 @@ void S_UnlockSfx (sfx_t *sfx);
 void *S_LockBuffer(void);
 void S_UnlockBuffer(void);
 
-extern size_t ResampleSfx (const qbyte *in_data, size_t in_length, const snd_format_t* in_format, qbyte *out_data, const char* sfxname);
+extern size_t ResampleSfx (const unsigned char *in_data, size_t in_length, const snd_format_t* in_format, unsigned char *out_data, const char* sfxname);
 
 // ====================================================================