diff src/shnplug/shn.c @ 1978:fa9f85cebade

s/vfs_/aud_vfs_/g
author William Pitcock <nenolod@atheme.org>
date Sun, 07 Oct 2007 00:25:33 -0500
parents aee4ebea943a
children b8da6a0b0da2
line wrap: on
line diff
--- a/src/shnplug/shn.c	Sun Oct 07 00:23:19 2007 -0500
+++ b/src/shnplug/shn.c	Sun Oct 07 00:25:33 2007 -0500
@@ -223,7 +223,7 @@
       version = MAX_VERSION + 1;
       while(version > MAX_VERSION)
       {
-        int byte = vfs_getc(this_shn->vars.fd);
+        int byte = aud_vfs_getc(this_shn->vars.fd);
         this_shn->vars.bytes_read++;
         if(byte == EOF)
           return 0;
@@ -553,7 +553,7 @@
 	{
 		if (this_shn->vars.fd)
 		{
-			vfs_fclose(this_shn->vars.fd);
+			aud_vfs_fclose(this_shn->vars.fd);
 			this_shn->vars.fd = NULL;
 		}
 
@@ -671,13 +671,13 @@
 
 	if (tmp_file->wave_header.file_has_id3v2_tag)
 	{
-		vfs_fseek(tmp_file->vars.fd,tmp_file->wave_header.id3v2_tag_size,SEEK_SET);
+		aud_vfs_fseek(tmp_file->vars.fd,tmp_file->wave_header.id3v2_tag_size,SEEK_SET);
 		tmp_file->vars.bytes_read += tmp_file->wave_header.id3v2_tag_size;
 		tmp_file->vars.seek_offset = tmp_file->wave_header.id3v2_tag_size;
 	}
     else
 	{
-		vfs_fseek(tmp_file->vars.fd,0,SEEK_SET);
+		aud_vfs_fseek(tmp_file->vars.fd,0,SEEK_SET);
 	}
 
 	if (0 == shn_verify_header(tmp_file))
@@ -747,7 +747,7 @@
 {
 	char data[4];
 
-	if (vfs_fread((void *)data,1,4,fd) != 4)
+	if (aud_vfs_fread((void *)data,1,4,fd) != 4)
 		return FALSE;
 
 	if (memcmp(data,MAGIC,4))
@@ -865,7 +865,7 @@
       version = MAX_VERSION + 1;
       while(version > MAX_VERSION)
       {
-  	int byte = vfs_getc(this_shn->vars.fd);
+  	int byte = aud_vfs_getc(this_shn->vars.fd);
  	if(byte == EOF) {
 	  shn_error_fatal(this_shn,"No magic number");
           goto exit_thread;
@@ -1142,8 +1142,8 @@
 
                 seekto_offset = shn_uchar_to_ulong_le(seek_info->data+8) + this_shn->vars.seek_offset;
 
-                vfs_fseek(this_shn->vars.fd,(slong)seekto_offset,SEEK_SET);
-                vfs_fread((uchar*) this_shn->decode_state->getbuf, 1, BUFSIZ, this_shn->vars.fd);
+                aud_vfs_fseek(this_shn->vars.fd,(slong)seekto_offset,SEEK_SET);
+                aud_vfs_fread((uchar*) this_shn->decode_state->getbuf, 1, BUFSIZ, this_shn->vars.fd);
 
                 this_shn->decode_state->getbufp = this_shn->decode_state->getbuf + shn_uchar_to_ushort_le(seek_info->data+14);
                 this_shn->decode_state->nbitget = shn_uchar_to_ushort_le(seek_info->data+16);
@@ -1183,7 +1183,7 @@
                 if(maxnlpc > 0 && qlpc)
                   free((void *) qlpc);
 
-                vfs_fseek(this_shn->vars.fd,0,SEEK_SET);
+                aud_vfs_fseek(this_shn->vars.fd,0,SEEK_SET);
                 goto restart;
               }
               else
@@ -1261,7 +1261,7 @@
 		return;
 	}
 
-	vfs_fseek(shnfile->vars.fd,0,SEEK_SET);
+	aud_vfs_fseek(shnfile->vars.fd,0,SEEK_SET);
 
 	playback->playing = TRUE;