[Scummvm-cvs-logs] CVS: scummvm/sword2/driver d_sound.h,1.32,1.33

[Max Horn]

Update of /cvsroot/scummvm/scummvm/sword2/driver
In directory sc8-pr-cvs1:/tmp/cvs-serv30469/sword2/driver

Modified Files:
	d_sound.h 
Log Message:
Made sure that *all* AudioInputStream 'know' their sample rate; removed pointless MusicStream class; removed various specific Channel subclasses and instead generalized the base class some more

Index: d_sound.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/driver/d_sound.h,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- d_sound.h	16 Nov 2003 14:18:29 -0000	1.32
+++ d_sound.h	17 Dec 2003 02:19:24 -0000	1.33
@@ -43,7 +43,7 @@
 	PlayingSoundHandle _handle;
 } FxHandle;
 
-class MusicHandle : public MusicStream {
+class MusicHandle : public AudioInputStream {
 public:
 	uint32 _id;
 	bool _firstTime;
@@ -62,7 +62,7 @@
 	int16 read();
 	bool eos() const;
 
-	MusicHandle() : MusicStream(), _firstTime(false),
+	MusicHandle() : _firstTime(false),
 			_streaming(false), _paused(false), _looping(false),
 			_fading(0), _fileStart(0), _filePos(0), _fileEnd(0),
 			_lastSample(0) {}