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

fix Tremor

Browse Source
This commit is contained in:
Glenn Maynard
2004-06-12 05:43:58 +00:00
parent 2e2426f0d6
commit aef80ea1a0
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/RageSoundReader_Vorbisfile.cpp
+3 -3
View File
@@ -6,7 +6,7 @@
#include "RageSoundReader_Vorbisfile.h" #include "RageSoundReader_Vorbisfile.h"
#include "RageLog.h" #include "RageLog.h"
#if defined(INTEGER_OGG) #if defined(INTEGER_VORBIS)
#include <tremor/ivorbisfile.h> #include <tremor/ivorbisfile.h>
#else #else
#include <vorbis/vorbisfile.h> #include <vorbis/vorbisfile.h>
@@ -139,7 +139,7 @@ SoundReader_FileReader::OpenResult RageSoundReader_Vorbisfile::Open(CString file
int RageSoundReader_Vorbisfile::GetLength() const int RageSoundReader_Vorbisfile::GetLength() const
{ {
#if defined(INTEGER_OGG) #if defined(INTEGER_VORBIS)
int len = ov_time_total(vf, -1); int len = ov_time_total(vf, -1);
#else #else
int len = int(ov_time_total(vf, -1) * 1000); int len = int(ov_time_total(vf, -1) * 1000);
@@ -220,7 +220,7 @@ bool RageSoundReader_Vorbisfile::FillBuf()
if( ret == 0 ) if( ret == 0 )
{ {
int bstream; int bstream;
#if defined(INTEGER_OGG) #if defined(INTEGER_VORBIS)
ret = ov_read( vf, tmpbuf, sizeof(tmpbuf), &bstream ); ret = ov_read( vf, tmpbuf, sizeof(tmpbuf), &bstream );
#else // float vorbis decoder #else // float vorbis decoder
ret = ov_read( vf, tmpbuf, sizeof(tmpbuf), (SDL_BYTEORDER == SDL_BIG_ENDIAN)?1:0, 2, 1, &bstream ); ret = ov_read( vf, tmpbuf, sizeof(tmpbuf), (SDL_BYTEORDER == SDL_BIG_ENDIAN)?1:0, 2, 1, &bstream );