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

spacing (only)

Browse Source
This commit is contained in:
Glenn Maynard
2006-02-14 11:30:53 +00:00
parent 62a0ac1370
commit 2b9f484548
11 changed files with 282 additions and 280 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/RageSoundReader_MP3.cpp
+4 -2
View File
@@ -194,7 +194,8 @@ struct madlib_t
/* Whether Timer is trusted; this is false after doing a quick seek. */ /* Whether Timer is trusted; this is false after doing a quick seek. */
int timer_accurate; int timer_accurate;
/* Frame index of each percentage of the file. This is like the /*
* Frame index of each percentage of the file. This is like the
* Xing TOC, except it's actual byte indices, not percentages, so * Xing TOC, except it's actual byte indices, not percentages, so
* it's accurate enough for "precise" seeking. -1 indicates we don't * it's accurate enough for "precise" seeking. -1 indicates we don't
* yet know; we always fill this in from beginning to end, so if n * yet know; we always fill this in from beginning to end, so if n
@@ -205,7 +206,8 @@ struct madlib_t
* the file was. We don't want to change length after we've set it * the file was. We don't want to change length after we've set it
* (that would change all of the toc entries), so allow the TOC to * (that would change all of the toc entries), so allow the TOC to
* go up to 200%. (Beyond that, we'll always hard seek; perhaps this * go up to 200%. (Beyond that, we'll always hard seek; perhaps this
* should be larger?) */ * should be larger?)
*/
int toc[200]; int toc[200];
/* Position in the file of inbuf: */ /* Position in the file of inbuf: */
stepmania/src/RageSoundReader_Vorbisfile.cpp
+4 -4
View File
@@ -47,9 +47,9 @@ static long OggRageFile_tell_func( void *datasource )
static RString ov_ssprintf( int err, const char *fmt, ...) static RString ov_ssprintf( int err, const char *fmt, ...)
{ {
va_list va; va_list va;
va_start(va, fmt); va_start( va, fmt );
RString s = vssprintf( fmt, va ); RString s = vssprintf( fmt, va );
va_end(va); va_end( va );
RString errstr; RString errstr;
switch( err ) switch( err )
@@ -100,7 +100,7 @@ SoundReader_FileReader::OpenResult RageSoundReader_Vorbisfile::Open( RageFileBas
callbacks.tell_func = OggRageFile_tell_func; callbacks.tell_func = OggRageFile_tell_func;
int ret = ov_open_callbacks( f, vf, NULL, 0, callbacks ); int ret = ov_open_callbacks( f, vf, NULL, 0, callbacks );
if(ret < 0) if( ret < 0 )
{ {
SetError( ov_ssprintf(ret, "ov_open failed") ); SetError( ov_ssprintf(ret, "ov_open failed") );
delete f; delete f;
@@ -132,7 +132,7 @@ int RageSoundReader_Vorbisfile::GetLength() const
#else #else
int len = int(ov_time_total(vf, -1) * 1000); int len = int(ov_time_total(vf, -1) * 1000);
#endif #endif
if(len == OV_EINVAL) if( len == OV_EINVAL )
RageException::Throw("RageSoundReader_Vorbisfile::GetLength: ov_time_total returned OV_EINVAL"); RageException::Throw("RageSoundReader_Vorbisfile::GetLength: ov_time_total returned OV_EINVAL");
return len; return len;