diff options
| author | Paul Gilbert | 2009-06-14 03:39:30 +0000 |
|---|---|---|
| committer | Paul Gilbert | 2009-06-14 03:39:30 +0000 |
| commit | 2f3e5f11cb0f384c81cf37c716c66c33976634d2 (patch) | |
| tree | 97a1425101c1a7d7d63ea5eddb20d8d6c7207de6 /engines/cruise/cruise.h | |
| parent | 95f02dd86f95bfb5764077da4c9c399c89c35b07 (diff) | |
| download | scummvm-rg350-2f3e5f11cb0f384c81cf37c716c66c33976634d2.tar.gz scummvm-rg350-2f3e5f11cb0f384c81cf37c716c66c33976634d2.tar.bz2 scummvm-rg350-2f3e5f11cb0f384c81cf37c716c66c33976634d2.zip | |
Beginnings of music support for Cruise, based on the cine engine sound code (note that the music played isn't yet correct, though)
svn-id: r41506
Diffstat (limited to 'engines/cruise/cruise.h')
| -rw-r--r-- | engines/cruise/cruise.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/engines/cruise/cruise.h b/engines/cruise/cruise.h index 2fc69acea0..3e17bb2a66 100644 --- a/engines/cruise/cruise.h +++ b/engines/cruise/cruise.h @@ -57,8 +57,7 @@ private: bool _preLoad; Debugger *_debugger; MidiDriver *_driver; - MusicPlayer *_music; - SoundPlayer *_sound; + PCSound *_sound; bool _mt32, _adlib; int _musicVolume; Common::StringList _langStrings; @@ -90,8 +89,7 @@ public: uint32 getFeatures() const; Common::Language getLanguage() const; Common::Platform getPlatform() const; - MusicPlayer &music() { return *_music; } - SoundPlayer &sound() { return *_sound; } + PCSound &sound() { return *_sound; } bool mt32() const { return _mt32; } bool adlib() const { return _adlib; } virtual GUI::Debugger *getDebugger() { return _debugger; } @@ -128,7 +126,8 @@ enum { }; enum { - kCruiseDebugScript = 1 << 0 + kCruiseDebugScript = 1 << 0, + kCruiseDebugSound = 1 << 1 }; enum { |