thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix use of getRate in VorbisInputStream's constructor. (Thanks to cyx for spotting this)

Browse source 
svn-id: r47144
This commit is contained in:
Johannes Schickel 2010-01-07 23:50:18 +00:00
parent 2aca490e13
commit a5adbb851a
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
sound/vorbis.cpp
View file

@ -131,12 +131,6 @@ VorbisInputStream::VorbisInputStream(Common::SeekableReadStream *inStream, bool
return; return;
} }
#ifdef USE_TREMOR
_length = Timestamp(ov_time_total(&_ovFile, -1), getRate());
#else
_length = Timestamp(uint32(ov_time_total(&_ovFile, -1) * 1000.0), getRate());
#endif
// Read in initial data // Read in initial data
if (!refill()) if (!refill())
return; return;
@ -144,6 +138,12 @@ VorbisInputStream::VorbisInputStream(Common::SeekableReadStream *inStream, bool
// Setup some header information // Setup some header information
_isStereo = ov_info(&_ovFile, -1)->channels >= 2; _isStereo = ov_info(&_ovFile, -1)->channels >= 2;
_rate = ov_info(&_ovFile, -1)->rate; _rate = ov_info(&_ovFile, -1)->rate;
#ifdef USE_TREMOR
_length = Timestamp(ov_time_total(&_ovFile, -1), getRate());
#else
_length = Timestamp(uint32(ov_time_total(&_ovFile, -1) * 1000.0), getRate());
#endif
} }
VorbisInputStream::~VorbisInputStream() { VorbisInputStream::~VorbisInputStream() {