From d79898e15be661118a8d232a8bc1a9755fdf3945 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Thu, 4 Dec 2003 21:10:48 +0000 Subject: [PATCH] simplify --- stepmania/src/RageSoundReader_Vorbisfile.cpp | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/stepmania/src/RageSoundReader_Vorbisfile.cpp b/stepmania/src/RageSoundReader_Vorbisfile.cpp index 64dd9bc962..1fdf895fb7 100644 --- a/stepmania/src/RageSoundReader_Vorbisfile.cpp +++ b/stepmania/src/RageSoundReader_Vorbisfile.cpp @@ -36,22 +36,13 @@ static size_t OggRageFile_read_func( void *ptr, size_t size, size_t nmemb, void *datasource ) { RageFile *f = (RageFile *) datasource; - ASSERT( size == 1 ); - return f->Read( ptr, nmemb ); -/* XXX */ + return f->Read( ptr, size, nmemb ); } static int OggRageFile_seek_func( void *datasource, ogg_int64_t offset, int whence ) { RageFile *f = (RageFile *) datasource; - switch( whence ) - { - case SEEK_CUR: - return f->SeekCur( (int) offset ); - case SEEK_END: - offset += f->GetFileSize(); - } - return f->Seek( (int) offset ); + return f->Seek( (int) offset, whence ); } static int OggRageFile_close_func( void *datasource )