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

use HAVE_OSS_GETVERSION

Browse Source 
don't print "version 0.0.0" if ioctl(OSS_GETVERSION) fails
This commit is contained in:
Glenn Maynard
2004-05-06 09:30:03 +00:00
parent 46c51ad33a
commit d3c19e9a46
1 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/arch/Sound/RageSoundDriver_OSS.cpp
+19 -12
View File
@@ -103,12 +103,16 @@ int64_t RageSound_OSS::GetPosition(const RageSoundBase *snd) const
void RageSound_OSS::CheckOSSVersion( int fd ) void RageSound_OSS::CheckOSSVersion( int fd )
{ {
int version; int version = 0;
#if defined(HAVE_OSS_GETVERSION)
if( ioctl(fd, OSS_GETVERSION, &version) != 0 ) if( ioctl(fd, OSS_GETVERSION, &version) != 0 )
{ {
LOG->Warn( "OSS_GETVERSION failed: %s", strerror(errno) ); LOG->Warn( "OSS_GETVERSION failed: %s", strerror(errno) );
version = 0; version = 0;
} }
#endif
/* /*
* Find out if /dev/dsp is really ALSA emulating it. ALSA's OSS emulation has * Find out if /dev/dsp is really ALSA emulating it. ALSA's OSS emulation has
* been buggy. If we got here, we probably failed to init ALSA. The only case * been buggy. If we got here, we probably failed to init ALSA. The only case
@@ -131,19 +135,22 @@ void RageSound_OSS::CheckOSSVersion( int fd )
RageException::ThrowNonfatal( "RageSound_OSS: ALSA detected. ALSA OSS emulation is buggy; use ALSA natively."); RageException::ThrowNonfatal( "RageSound_OSS: ALSA detected. ALSA OSS emulation is buggy; use ALSA natively.");
} }
#endif #endif
int major, minor, rev; if( version )
if( version < 361 )
{ {
major = (version/100)%10; int major, minor, rev;
minor = (version/10) %10; if( version < 361 )
rev = (version/1) %10; {
} else { major = (version/100)%10;
major = (version/0x10000) % 0x100; minor = (version/10) %10;
minor = (version/0x00100) % 0x100; rev = (version/1) %10;
rev = (version/0x00001) % 0x100; } else {
} major = (version/0x10000) % 0x100;
minor = (version/0x00100) % 0x100;
rev = (version/0x00001) % 0x100;
}
LOG->Info("OSS: %i.%i.%i", major, minor, rev ); LOG->Info("OSS: %i.%i.%i", major, minor, rev );
}
} }
RageSound_OSS::RageSound_OSS() RageSound_OSS::RageSound_OSS()