diff options
| author | Max Horn | 2003-12-17 02:19:24 +0000 |
|---|---|---|
| committer | Max Horn | 2003-12-17 02:19:24 +0000 |
| commit | e7bf167428968ac894a8be035a38985c08c0d7c3 (patch) | |
| tree | 999c73865c2f1a7b279df46637748995a96b55fe /sword2 | |
| parent | 4da0b08b90b08baa988ad11adfb5f7952384f04d (diff) | |
| download | scummvm-rg350-e7bf167428968ac894a8be035a38985c08c0d7c3.tar.gz scummvm-rg350-e7bf167428968ac894a8be035a38985c08c0d7c3.tar.bz2 scummvm-rg350-e7bf167428968ac894a8be035a38985c08c0d7c3.zip | |
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
svn-id: r11699
Diffstat (limited to 'sword2')
| -rw-r--r-- | sword2/driver/d_sound.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sword2/driver/d_sound.h b/sword2/driver/d_sound.h index 842c44d9ff..3a273b8744 100644 --- a/sword2/driver/d_sound.h +++ b/sword2/driver/d_sound.h @@ -43,7 +43,7 @@ typedef struct { PlayingSoundHandle _handle; } FxHandle; -class MusicHandle : public MusicStream { +class MusicHandle : public AudioInputStream { public: uint32 _id; bool _firstTime; @@ -62,7 +62,7 @@ public: 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) {} |