r1270 - trunk/code/client

[DONOTREPLY at icculus.org]

Author: tma
Date: 2008-03-02 10:28:39 -0500 (Sun, 02 Mar 2008)
New Revision: 1270

Modified:
   trunk/code/client/snd_codec_ogg.c
Log:
* Ogg codec fix regarding ogg files in pk3s (Tr3b)


Modified: trunk/code/client/snd_codec_ogg.c
===================================================================
--- trunk/code/client/snd_codec_ogg.c	2008-02-28 21:39:54 UTC (rev 1269)
+++ trunk/code/client/snd_codec_ogg.c	2008-03-02 15:28:39 UTC (rev 1270)
@@ -198,15 +198,19 @@
 // ftell() replacement
 long S_OGG_Callback_tell(void *datasource)
 {
+	snd_stream_t   *stream;
+
 	// check if input is valid
 	if(!datasource)
 	{
-		errno = EBADF; 
+		errno = EBADF;
 		return -1;
 	}
 
-	// we keep track of the file position in stream->pos
-	return (long) (((snd_stream_t *) datasource) -> pos);
+	// snd_stream_t in the generic pointer
+	stream = (snd_stream_t *) datasource;
+
+	return (long) FS_FTell(stream->file);
 }
 
 // the callback structure