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

MADLIB_rewind never fails.

Browse Source 
Always rewind after a seek error.
This commit is contained in:
Glenn Maynard
2003-10-06 05:16:01 +00:00
parent 2a0c57ac40
commit e2659ad6b1
1 changed files with 28 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/RageSoundReader_MP3.cpp
+26 -15
View File
@@ -821,11 +821,8 @@ int RageSoundReader_MP3::Read( char *buf, unsigned len )
bool RageSoundReader_MP3::MADLIB_rewind() bool RageSoundReader_MP3::MADLIB_rewind()
{ {
if( fseek(this->rw, 0, SEEK_SET) == -1 ) int ret = fseek(this->rw, 0, SEEK_SET);
{ ASSERT( ret == 0 );
SetError( strerror(errno) );
return 0;
}
mad_frame_mute(&mad->Frame); mad_frame_mute(&mad->Frame);
mad_synth_mute(&mad->Synth); mad_synth_mute(&mad->Synth);
@@ -862,8 +859,7 @@ bool RageSoundReader_MP3::MADLIB_rewind()
* "precise" mode. * "precise" mode.
*/ */
/* Returns 1 on success, 0 on error, -1 if we couldn't it (don't have /* Returns actual position on success, 0 if past EOF, -1 on error. */
* a Xing tag or a length). */
int RageSoundReader_MP3::SetPosition_toc( int ms, bool Xing ) int RageSoundReader_MP3::SetPosition_toc( int ms, bool Xing )
{ {
int percent; int percent;
@@ -1028,11 +1024,19 @@ int RageSoundReader_MP3::SetPosition_estimate( int ms )
int RageSoundReader_MP3::SetPosition_Accurate( int ms ) int RageSoundReader_MP3::SetPosition_Accurate( int ms )
{ {
/* Seek using our own internal (accurate) TOC. */ /* Seek using our own internal (accurate) TOC. */
if( SetPosition_toc( ms, false ) == -1 ) int ret = SetPosition_toc( ms, false );
return -1; /* error */ if( ret <= 0 )
{
MADLIB_rewind();
return ret; /* it set the error */
}
/* Align exactly. */ /* Align exactly. */
return SetPosition_hard( ms ); ret = SetPosition_hard( ms );
if( ret <= 0 )
MADLIB_rewind();
return ret;
} }
int RageSoundReader_MP3::SetPosition_Fast( int ms ) int RageSoundReader_MP3::SetPosition_Fast( int ms )
@@ -1040,18 +1044,25 @@ int RageSoundReader_MP3::SetPosition_Fast( int ms )
/* Rewinding is always fast and accurate, and SetPosition_estimate is bad at 0. */ /* Rewinding is always fast and accurate, and SetPosition_estimate is bad at 0. */
if( !ms ) if( !ms )
{ {
if( !MADLIB_rewind() ) MADLIB_rewind();
return -1; /* error */ return 0; /* ok */
return 0; /* error */
} }
/* We can do a fast jump in VBR with Xing with more accuracy than without Xing. */ /* We can do a fast jump in VBR with Xing with more accuracy than without Xing. */
if( mad->has_xing ) if( mad->has_xing )
return SetPosition_toc( ms, true ); {
int ret = SetPosition_toc( ms, true );
if( ret <= 0 )
MADLIB_rewind();
return ret;
}
/* Guess. This is only remotely accurate when we're not VBR, but also /* Guess. This is only remotely accurate when we're not VBR, but also
* do it if we have no Xing tag. */ * do it if we have no Xing tag. */
return SetPosition_estimate( ms ); int ret = SetPosition_estimate( ms );
if( ret <= 0 )
MADLIB_rewind();
return ret;
} }
int RageSoundReader_MP3::GetLengthInternal( bool fast ) int RageSoundReader_MP3::GetLengthInternal( bool fast )