[Scummvm-cvs-logs] CVS: scummvm/scumm player_mod.h,2.15,2.16 player_v2.h,2.29,2.30
Max Horn
fingolfin at users.sourceforge.net
Sat Nov 27 09:20:40 CET 2004
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31006
Modified Files:
player_mod.h player_v2.h
Log Message:
cleanup
Index: player_mod.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/player_mod.h,v
retrieving revision 2.15
retrieving revision 2.16
diff -u -d -r2.15 -r2.16
--- player_mod.h 27 Nov 2004 16:12:11 -0000 2.15
+++ player_mod.h 27 Nov 2004 16:18:50 -0000 2.16
@@ -51,14 +51,13 @@
virtual void setUpdateProc(ModUpdateProc *proc, void *param, int freq);
virtual void clearUpdateProc();
-
+ // AudioStream API
int readBuffer(int16 *buffer, const int numSamples) {
do_mix(buffer, numSamples / 2);
return numSamples;
}
bool isStereo() const { return true; }
bool endOfData() const { return false; }
-
int getRate() const { return _samplerate; }
private:
Index: player_v2.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/player_v2.h,v
retrieving revision 2.29
retrieving revision 2.30
diff -u -d -r2.29 -r2.30
--- player_v2.h 27 Nov 2004 16:12:11 -0000 2.29
+++ player_v2.h 27 Nov 2004 16:18:50 -0000 2.30
@@ -85,14 +85,13 @@
virtual int getMusicTimer() const;
virtual int getSoundStatus(int sound) const;
-
+ // AudioStream API
int readBuffer(int16 *buffer, const int numSamples) {
do_mix(buffer, numSamples / 2);
return numSamples;
}
bool isStereo() const { return true; }
bool endOfData() const { return false; }
-
int getRate() const { return _sample_rate; }
protected:
More information about the Scummvm-git-logs
mailing list