diff options
Diffstat (limited to 'engines/supernova2/resman.h')
| -rw-r--r-- | engines/supernova2/resman.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/engines/supernova2/resman.h b/engines/supernova2/resman.h index 72b7d78bfd..16e237eadb 100644 --- a/engines/supernova2/resman.h +++ b/engines/supernova2/resman.h @@ -27,7 +27,7 @@ #include "common/ptr.h" #include "supernova2/graphics.h" -//#include "supernova/sound.h" +#include "supernova2/sound.h" namespace Common { @@ -49,8 +49,8 @@ public: public: ResourceManager(); - //Audio::SeekableAudioStream *getSoundStream(AudioId index); - //Audio::AudioStream *getSoundStream(MusicId index); + Audio::SeekableAudioStream *getSoundStream(AudioId index); + Audio::AudioStream *getSoundStream(MusicId index); const MS2Image *getImage(int filenumber) const; const byte *getImage(CursorId id) const; @@ -61,11 +61,11 @@ private: void initImages(); private: - //Common::ScopedPtr<Audio::SeekableAudioStream> _soundSamples[kAudioNumSamples]; - //Common::ScopedPtr<Common::MemoryReadStream> _musicIntroBuffer; - //Common::ScopedPtr<Common::MemoryReadStream> _musicOutroBuffer; - //Common::ScopedPtr<Audio::AudioStream> _musicIntro; - //Common::ScopedPtr<Audio::AudioStream> _musicOutro; + Common::ScopedPtr<Audio::SeekableAudioStream> _soundSamples[kAudioNumSamples]; + Common::ScopedPtr<Common::MemoryReadStream> _musicIntroBuffer; + Common::ScopedPtr<Common::MemoryReadStream> _musicOutroBuffer; + Common::ScopedPtr<Audio::AudioStream> _musicIntro; + Common::ScopedPtr<Audio::AudioStream> _musicOutro; int _audioRate; MS2Image _images[kNumImageFiles]; byte _cursorNormal[256]; |