[Scummvm-cvs-logs] SF.net SVN: scummvm: [23491] scummvm/trunk/sound/mp3.cpp
eriktorbjorn at users.sourceforge.net
eriktorbjorn at users.sourceforge.net
Thu Jul 20 22:47:26 CEST 2006
Revision: 23491
http://svn.sourceforge.net/scummvm/?rev=23491&view=rev
Author: eriktorbjorn
Date: 2006-07-13 07:01:48 -0700 (Thu, 13 Jul 2006)
Log Message:
-----------
Some whitespace changes to see if the CIA bot is still silent.
Modified Paths:
--------------
scummvm/trunk/sound/mp3.cpp
Modified: scummvm/trunk/sound/mp3.cpp
===================================================================
--- scummvm/trunk/sound/mp3.cpp 2006-07-11 20:58:12 UTC (rev 23490)
+++ scummvm/trunk/sound/mp3.cpp 2006-07-13 14:01:48 UTC (rev 23491)
@@ -183,18 +183,18 @@
// Check the header, determine if this is a stereo stream
int num;
- switch(_frame.header.mode) {
- case MAD_MODE_SINGLE_CHANNEL:
- case MAD_MODE_DUAL_CHANNEL:
- case MAD_MODE_JOINT_STEREO:
- case MAD_MODE_STEREO:
- num = MAD_NCHANNELS(&_frame.header);
- assert(num == 1 || num == 2);
- _isStereo = (num == 2);
- break;
- default:
- warning("MP3InputStream: Cannot determine number of channels");
- return false;
+ switch (_frame.header.mode) {
+ case MAD_MODE_SINGLE_CHANNEL:
+ case MAD_MODE_DUAL_CHANNEL:
+ case MAD_MODE_JOINT_STEREO:
+ case MAD_MODE_STEREO:
+ num = MAD_NCHANNELS(&_frame.header);
+ assert(num == 1 || num == 2);
+ _isStereo = (num == 2);
+ break;
+ default:
+ warning("MP3InputStream: Cannot determine number of channels");
+ return false;
}
return true;
@@ -208,7 +208,7 @@
#ifdef __SYMBIAN32__
// For symbian we must check that an alternative file pointer is created, see if its open
// If not re-open file and seek to the last read position
- if(_file && !_file->isOpen()) {
+ if (_file && !_file->isOpen()) {
_file->open(_file->name());
_file->seek(_lastReadPosition);
}
@@ -270,7 +270,7 @@
#ifdef __SYMBIAN32__
// For symbian we now store the last read position and then close the file
- if(_file) {
+ if (_file) {
_lastReadPosition = _file->pos();
_file->close();
}
@@ -446,7 +446,7 @@
offset = (startFrame * (_mad_header.bitrate / (8 * 25))) / 3;
#ifdef __SYMBIAN32__
// Reopen the file if it is not open yet
- if(!_file->isOpen())
+ if (!_file->isOpen())
_file->open(_file->name());
#endif
_file->seek(offset, SEEK_SET);
More information about the Scummvm-git-logs
mailing list