diff src/console/Audacious_Driver.cxx @ 1978:fa9f85cebade

s/vfs_/aud_vfs_/g

--- a/src/console/Audacious_Driver.cxx	Sun Oct 07 00:23:19 2007 -0500
+++ b/src/console/Audacious_Driver.cxx	Sun Oct 07 00:25:33 2007 -0500
@@ -84,7 +84,7 @@
 	~File_Handler();
 private:
 	char header [4];
-	Vfs_File_Reader vfs_in;
+	Vfs_File_Reader aud_vfs_in;
 	Gzip_Reader in;
 };
 
@@ -117,12 +117,12 @@
 	
 	// open vfs
 	if ( fd )
-		vfs_in.reset( fd );
-	else if ( log_err( vfs_in.open( path ) ) )
+		aud_vfs_in.reset( fd );
+	else if ( log_err( aud_vfs_in.open( path ) ) )
 		return;
 	
 	// now open gzip_reader on top of vfs
-	if ( log_err( in.open( &vfs_in ) ) )
+	if ( log_err( in.open( &aud_vfs_in ) ) )
 		return;
 	
 	// read and identify header
@@ -165,7 +165,7 @@
 	
 	// files can be closed now
 	in.close();
-	vfs_in.close();
+	aud_vfs_in.close();
 	
 	log_warning( emu );
 	
@@ -485,7 +485,7 @@
 	if (!is_our_file_from_vfs(filename, fd))
 		return NULL;
 
-	vfs_rewind(fd);
+	aud_vfs_rewind(fd);
 
 	return get_song_tuple(filename);
 }