eliminated references to channel_t and sfx_t in OGG_FetchSound and

WAV_FetchSound, reworked ogg fetcher_data struct a bit for this

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@7548 d7cf8633-e32d-0410-b094-e92efae38249

diff --git a/snd_main.h b/snd_main.h
index 2b061053cbb15b721bc76e0f69be59605247e567..51d2820dea73e8bb95a0d1c41833010d7b3bde49 100644 (file)
--- a/snd_main.h
+++ b/snd_main.h
@@ -96,7 +96,7 @@ typedef struct channel_s
 
 // Sound fetching functions
 // "start" is both an input and output parameter: it returns the actual start time of the sound buffer
 
 // Sound fetching functions
 // "start" is both an input and output parameter: it returns the actual start time of the sound buffer

-typedef const snd_buffer_t* (*snd_fetcher_getsb_t) (channel_t* ch, unsigned int *start, unsigned int nbsampleframes);
+typedef const snd_buffer_t* (*snd_fetcher_getsb_t) (void *sfxfetcher, void **chfetcherpointer, unsigned int *start, unsigned int nbsampleframes);

 typedef void (*snd_fetcher_endsb_t) (channel_t* ch);
 typedef void (*snd_fetcher_free_t) (sfx_t* sfx);
 typedef const snd_format_t* (*snd_fetcher_getfmt_t) (sfx_t* sfx);
 typedef void (*snd_fetcher_endsb_t) (channel_t* ch);
 typedef void (*snd_fetcher_free_t) (sfx_t* sfx);
 typedef const snd_format_t* (*snd_fetcher_getfmt_t) (sfx_t* sfx);

diff --git a/snd_mix.c b/snd_mix.c
index 43bca9d9dfdd8de6cf1165219ea8905ddea66f81..c6b68d889a3da3611ac70ab0b7b75c766fcc6cda 100644 (file)
--- a/snd_mix.c
+++ b/snd_mix.c
@@ -250,7 +250,7 @@ static qboolean SND_PaintChannel (channel_t *ch, unsigned int count)
                return false;
 
        sb_offset = ch->pos;
                return false;
 
        sb_offset = ch->pos;

-       sb = ch->sfx->fetcher->getsb (ch, &sb_offset, count);
+       sb = ch->sfx->fetcher->getsb (ch->sfx->fetcher_data, &ch->fetcher_data, &sb_offset, count);

        if (sb == NULL)
        {
                Con_DPrintf("SND_PaintChannel: ERROR: can't get sound buffer from sfx \"%s\"\n",
        if (sb == NULL)
        {
                Con_DPrintf("SND_PaintChannel: ERROR: can't get sound buffer from sfx \"%s\"\n",

diff --git a/snd_ogg.c b/snd_ogg.c
index 7c856ce666c43ee511383c3aca730102bd3f53f2..ccedb504c5e7260d69c3b6e5bc5d7246871425d1 100644 (file)
--- a/snd_ogg.c
+++ b/snd_ogg.c
@@ -402,6 +402,8 @@ typedef struct
        unsigned char   *file;
        size_t                  filesize;
        snd_format_t    format;
        unsigned char   *file;
        size_t                  filesize;
        snd_format_t    format;

+       unsigned int    total_length;
+       char                    name[128];

 } ogg_stream_persfx_t;
 
 // Per-channel data structure
 } ogg_stream_persfx_t;
 
 // Per-channel data structure


@@ -422,20 +424,15 @@ static const ov_callbacks callbacks = {ovcb_read, ovcb_seek, ovcb_close, ovcb_te
 OGG_FetchSound
 ====================
 */
 OGG_FetchSound
 ====================
 */

-static const snd_buffer_t* OGG_FetchSound (channel_t* ch, unsigned int* start, unsigned int nbsampleframes)
+static const snd_buffer_t* OGG_FetchSound (void *sfxfetcher, void **chfetcherpointer, unsigned int *start, unsigned int nbsampleframes)

 {
 {

-       ogg_stream_perchannel_t* per_ch;
-       sfx_t* sfx;
-       ogg_stream_persfx_t* per_sfx;
+       ogg_stream_perchannel_t* per_ch = (ogg_stream_perchannel_t *)*chfetcherpointer;
+       ogg_stream_persfx_t* per_sfx = (ogg_stream_persfx_t *)sfxfetcher;

        snd_buffer_t* sb;
        int newlength, done, ret, bigendian;
        unsigned int real_start;
        unsigned int factor;
 
        snd_buffer_t* sb;
        int newlength, done, ret, bigendian;
        unsigned int real_start;
        unsigned int factor;
 

-       per_ch = (ogg_stream_perchannel_t *)ch->fetcher_data;
-       sfx = ch->sfx;
-       per_sfx = (ogg_stream_persfx_t *)sfx->fetcher_data;
-

        // If there's no fetcher structure attached to the channel yet
        if (per_ch == NULL)
        {
        // If there's no fetcher structure attached to the channel yet
        if (per_ch == NULL)
        {


@@ -449,7 +446,6 @@ static const snd_buffer_t* OGG_FetchSound (channel_t* ch, unsigned int* start, u
                buff_len = STREAM_BUFFER_SIZE(&sb_format);
                memsize = sizeof (*per_ch) - sizeof (per_ch->sb.samples) + buff_len;
                per_ch = (ogg_stream_perchannel_t *)Mem_Alloc (snd_mempool, memsize);
                buff_len = STREAM_BUFFER_SIZE(&sb_format);
                memsize = sizeof (*per_ch) - sizeof (per_ch->sb.samples) + buff_len;
                per_ch = (ogg_stream_perchannel_t *)Mem_Alloc (snd_mempool, memsize);

-               sfx->memsize += memsize;

 
                // Open it with the VorbisFile API
                per_ch->ov_decode.buffer = per_sfx->file;
 
                // Open it with the VorbisFile API
                per_ch->ov_decode.buffer = per_sfx->file;


@@ -457,7 +453,7 @@ static const snd_buffer_t* OGG_FetchSound (channel_t* ch, unsigned int* start, u
                per_ch->ov_decode.buffsize = per_sfx->filesize;
                if (qov_open_callbacks (&per_ch->ov_decode, &per_ch->vf, NULL, 0, callbacks) < 0)
                {
                per_ch->ov_decode.buffsize = per_sfx->filesize;
                if (qov_open_callbacks (&per_ch->ov_decode, &per_ch->vf, NULL, 0, callbacks) < 0)
                {

-                       Con_Printf("error while reading Ogg Vorbis stream \"%s\"\n", sfx->name);
+                       Con_Printf("error while reading Ogg Vorbis stream \"%s\"\n", per_sfx->name);

                        Mem_Free (per_ch);
                        return NULL;
                }
                        Mem_Free (per_ch);
                        return NULL;
                }


@@ -468,7 +464,7 @@ static const snd_buffer_t* OGG_FetchSound (channel_t* ch, unsigned int* start, u
                per_ch->sb.nbframes = 0;
                per_ch->sb.maxframes = buff_len / (per_ch->sb.format.channels * per_ch->sb.format.width);
 
                per_ch->sb.nbframes = 0;
                per_ch->sb.maxframes = buff_len / (per_ch->sb.format.channels * per_ch->sb.format.width);
 

-               ch->fetcher_data = per_ch;
+               *chfetcherpointer = per_ch;

        }
 
        real_start = *start;
        }
 
        real_start = *start;


@@ -499,10 +495,10 @@ static const snd_buffer_t* OGG_FetchSound (channel_t* ch, unsigned int* start, u
                ogg_int64_t ogg_start;
                int err;
 
                ogg_int64_t ogg_start;
                int err;
 

-               if (real_start > (unsigned int)sfx->total_length)
+               if (real_start > (unsigned int)per_sfx->total_length)

                {
                        Con_Printf ("OGG_FetchSound: asked for a start position after the end of the sfx! (%u > %u)\n",
                {
                        Con_Printf ("OGG_FetchSound: asked for a start position after the end of the sfx! (%u > %u)\n",

-                                               real_start, sfx->total_length);
+                                               real_start, per_sfx->total_length);

                        return NULL;
                }
 
                        return NULL;
                }
 


@@ -692,6 +688,7 @@ qboolean OGG_LoadVorbisFile (const char *filename, sfx_t *sfx)
 
                Con_DPrintf ("\"%s\" will be streamed\n", filename);
                per_sfx = (ogg_stream_persfx_t *)Mem_Alloc (snd_mempool, sizeof (*per_sfx));
 
                Con_DPrintf ("\"%s\" will be streamed\n", filename);
                per_sfx = (ogg_stream_persfx_t *)Mem_Alloc (snd_mempool, sizeof (*per_sfx));

+               strlcpy(per_sfx->name, sfx->name, sizeof(per_sfx->name));

                sfx->memsize += sizeof (*per_sfx);
                per_sfx->file = data;
                per_sfx->filesize = filesize;
                sfx->memsize += sizeof (*per_sfx);
                per_sfx->file = data;
                per_sfx->filesize = filesize;


@@ -704,7 +701,7 @@ qboolean OGG_LoadVorbisFile (const char *filename, sfx_t *sfx)
                sfx->fetcher_data = per_sfx;
                sfx->fetcher = &ogg_fetcher;
                sfx->flags |= SFXFLAG_STREAMED;
                sfx->fetcher_data = per_sfx;
                sfx->fetcher = &ogg_fetcher;
                sfx->flags |= SFXFLAG_STREAMED;

-               sfx->total_length = (int)((size_t)len / (per_sfx->format.channels * 2) * ((double)snd_renderbuffer->format.speed / per_sfx->format.speed));
+               per_sfx->total_length = sfx->total_length = (int)((size_t)len / (per_sfx->format.channels * 2) * ((double)snd_renderbuffer->format.speed / per_sfx->format.speed));

                sfx->loopstart = sfx->total_length;
                vc = qov_comment(&vf, -1);
                if(vc)
                sfx->loopstart = sfx->total_length;
                vc = qov_comment(&vf, -1);
                if(vc)

diff --git a/snd_wav.c b/snd_wav.c
index c40986e2dcc87b4b0c45e5adc1e3a1e3c1ec31a6..8495518e3cdce82898e20535168a360b6193b044 100644 (file)
--- a/snd_wav.c
+++ b/snd_wav.c
@@ -223,10 +223,10 @@ static wavinfo_t GetWavinfo (char *name, unsigned char *wav, int wavlength)
 WAV_FetchSound
 ====================
 */
 WAV_FetchSound
 ====================
 */

-static const snd_buffer_t* WAV_FetchSound (channel_t* ch, unsigned int *start, unsigned int nbsampleframes)
+static const snd_buffer_t* WAV_FetchSound (void *sfxfetcher, void **chfetcherpointer, unsigned int *start, unsigned int nbsampleframes)

 {
        *start = 0;
 {
        *start = 0;

-       return (snd_buffer_t *)ch->sfx->fetcher_data;
+       return (snd_buffer_t *)sfxfetcher;

 }
 
 /*
 }
 
 /*