[Scummvm-cvs-logs] CVS: scummvm/saga music.cpp,1.36,1.37
Max Horn
fingolfin at users.sourceforge.net
Sat Nov 27 09:07:43 CET 2004
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/sword2/driver d_sound.cpp,1.126,1.127 d_sound.h,1.53,1.54
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm debugger.cpp,1.133,1.134 imuse.cpp,2.120,2.121 imuse.h,1.53,1.54 imuse_internal.h,2.34,2.35 scumm.cpp,1.277,1.278
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/saga
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3780/saga
Modified Files:
music.cpp
Log Message:
AudioStream::read() has been removed quite some time ago, now making sure that change is reflected everywhere
Index: music.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/music.cpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- music.cpp 26 Nov 2004 10:04:36 -0000 1.36
+++ music.cpp 27 Nov 2004 13:54:08 -0000 1.37
@@ -74,7 +74,6 @@
int readBuffer(int16 *buffer, const int numSamples);
- int16 read();
bool endOfData() const { return eosIntern(); }
bool isStereo() const { return true; }
int getRate() const { return 11025; }
@@ -99,16 +98,6 @@
_file->decRef();
}
-inline int16 RAWInputStream::read() {
- assert(!eosIntern());
-
- int16 sample = *_pos++;
- if (_pos >= _bufferEnd) {
- refill();
- }
- return sample;
-}
-
inline bool RAWInputStream::eosIntern() const {
return _pos >= _bufferEnd;
}
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/sword2/driver d_sound.cpp,1.126,1.127 d_sound.h,1.53,1.54
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm debugger.cpp,1.133,1.134 imuse.cpp,2.120,2.121 imuse.h,1.53,1.54 imuse_internal.h,2.34,2.35 scumm.cpp,1.277,1.278
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list