actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

better fix

Browse Source
This commit is contained in:
Glenn Maynard
2003-09-13 20:47:41 +00:00
parent 58b575b511
commit fc0a1b5380
1 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/RageSoundReader_Vorbisfile.cpp
+2 -9
View File
@@ -140,7 +140,7 @@ int RageSoundReader_Vorbisfile::Read(char *buf, unsigned len)
#if defined(INTEGER_OGG) #if defined(INTEGER_OGG)
int ret = ov_read(vf, tmpbuf, sizeof(tmpbuf), &bstream); int ret = ov_read(vf, tmpbuf, sizeof(tmpbuf), &bstream);
#else // float vorbis decoder #else // float vorbis decoder
int ret = ov_read(vf, tmpbuf, sizeof(tmpbuf), 0, 2, 1, &bstream); int ret = ov_read(vf, tmpbuf, sizeof(tmpbuf), (SDL_BYTEORDER == SDL_BIG_ENDIAN)?1:0, 2, 1, &bstream);
#endif #endif
//int ret = 4096; //int ret = 4096;
@@ -154,7 +154,7 @@ int RageSoundReader_Vorbisfile::Read(char *buf, unsigned len)
} }
if(ret == 0) if(ret == 0)
return bytes_read; /* EOF */ return bytes_read;
/* If we have a different number of channels, we need to convert. */ /* If we have a different number of channels, we need to convert. */
ASSERT(vi->channels == 1 || vi->channels == 2); ASSERT(vi->channels == 1 || vi->channels == 2);
@@ -184,13 +184,6 @@ int RageSoundReader_Vorbisfile::Read(char *buf, unsigned len)
bytes_read += size; bytes_read += size;
} }
#if SDL_BYTEORDER == SDL_BIG_ENDIAN
/* I can't imagine why, but Vorbisfile returns data in little endian, not system-endian. */
Sint16 *sbuf = (Sint16 *) buf;
for( int i = 0; i < bytes_read/2; ++i )
sbuf[i] = SDL_Swap16(sbuf[i]);
#endif
return bytes_read; return bytes_read;
} }