aboutsummaryrefslogtreecommitdiff
path: root/engines/sword1/animation.h
diff options
context:
space:
mode:
authorMax Horn2006-04-29 22:33:31 +0000
committerMax Horn2006-04-29 22:33:31 +0000
commit27307acd7c6f9f9083bdcad38ba54f18d4f080b7 (patch)
treefd7360382a19b07dcca9b711080b3f6c8f64fd38 /engines/sword1/animation.h
parentac0ae13bee890b78442788abe6b87e514c9928a0 (diff)
downloadscummvm-rg350-27307acd7c6f9f9083bdcad38ba54f18d4f080b7.tar.gz
scummvm-rg350-27307acd7c6f9f9083bdcad38ba54f18d4f080b7.tar.bz2
scummvm-rg350-27307acd7c6f9f9083bdcad38ba54f18d4f080b7.zip
Moved the AudioCDManager as well as class AudioStream and its (standard) subclasses to namespace Audio
svn-id: r22231
Diffstat (limited to 'engines/sword1/animation.h')
-rw-r--r--engines/sword1/animation.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/sword1/animation.h b/engines/sword1/animation.h
index 2200212384..378116fe6a 100644
--- a/engines/sword1/animation.h
+++ b/engines/sword1/animation.h
@@ -76,7 +76,7 @@ private:
#endif
protected:
- virtual AudioStream *createAudioStream(const char *name, void *arg);
+ virtual Audio::AudioStream *createAudioStream(const char *name, void *arg);
};
class MoviePlayer {
@@ -98,15 +98,15 @@ private:
};
struct FileQueue {
- AudioStream *stream;
+ Audio::AudioStream *stream;
FileQueue *next;
};
-class SplittedAudioStream : public AudioStream {
+class SplittedAudioStream : public Audio::AudioStream {
public:
SplittedAudioStream(void);
~SplittedAudioStream(void);
- void appendStream(AudioStream *stream);
+ void appendStream(Audio::AudioStream *stream);
virtual int readBuffer(int16 *buffer, const int numSamples);
virtual bool isStereo(void) const;
virtual bool endOfData(void) const;