diff options
author | Evgeny Grechnikov | 2018-10-18 00:38:01 +0300 |
---|---|---|
committer | Evgeny Grechnikov | 2018-10-18 00:38:01 +0300 |
commit | 54562554f9b274ce527a54e7fe87b8ff354fe0f4 (patch) | |
tree | e4389bd4af6e5fcef525bec17c92f35d12fdf443 /engines/lastexpress/sound/queue.h | |
parent | b7b5fbbad2808a0c5112bebbb59a5a1c43042e29 (diff) | |
download | scummvm-rg350-54562554f9b274ce527a54e7fe87b8ff354fe0f4.tar.gz scummvm-rg350-54562554f9b274ce527a54e7fe87b8ff354fe0f4.tar.bz2 scummvm-rg350-54562554f9b274ce527a54e7fe87b8ff354fe0f4.zip |
LASTEXPRESS: better names in sound code
Refactoring, no changes in behaviour.
Diffstat (limited to 'engines/lastexpress/sound/queue.h')
-rw-r--r-- | engines/lastexpress/sound/queue.h | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/engines/lastexpress/sound/queue.h b/engines/lastexpress/sound/queue.h index 1c73f57906..df8c945ee9 100644 --- a/engines/lastexpress/sound/queue.h +++ b/engines/lastexpress/sound/queue.h @@ -42,26 +42,26 @@ public: // Queue void addToQueue(SoundEntry *entry); - void removeFromQueue(Common::String filename); - void removeFromQueue(EntityIndex entity); + void stop(Common::String filename); + void stop(EntityIndex entity); void updateQueue(); - void resetQueue(); - void resetQueue(SoundType type1, SoundType type2 = kSoundTypeNone); - void clearQueue(); + void stopAmbient(); + void stopAllExcept(SoundTag type1, SoundTag type2 = kSoundTagNone); + void destroyAllSound(); // State - void clearStatus(); - int getSoundState() { return _state; } - void resetState() { resetState(kSoundState1); } - void resetState(SoundState state) { _state |= state; } + void stopAll(); + int getAmbientState() { return _ambientState; } + void startAmbient() { _ambientState |= kAmbientSoundEnabled; } + void setAmbientToSteam() { _ambientState |= kAmbientSoundSteam; } // Entries - void setupEntry(SoundType type, EntityIndex index); - void processEntry(EntityIndex entity); - void processEntry(SoundType type); - void processEntry(Common::String filename); - void processEntries(); - SoundEntry *getEntry(SoundType type); + void assignNISLink(EntityIndex index); + void fade(EntityIndex entity); + void fade(SoundTag type); + void fade(Common::String filename); + void endAmbient(); + SoundEntry *getEntry(SoundTag type); SoundEntry *getEntry(EntityIndex index); SoundEntry *getEntry(Common::String name); uint32 getEntryTime(EntityIndex index); @@ -83,8 +83,8 @@ public: uint32 getFlag() { return _flag; } int getSubtitleFlag() { return _subtitlesFlag; } void setSubtitleFlag(int flag) { _subtitlesFlag = flag; } - SoundType getCurrentType() { return _currentType; } - void setCurrentType(SoundType type) { _currentType = type; } + + int32 generateNextTag() { return _currentTag++; } protected: // Debug @@ -94,8 +94,8 @@ private: LastExpressEngine *_engine; // State & shared data - int _state; - SoundType _currentType; + int _ambientState; + int32 _currentTag; // TODO: this seems to be a synchronization flag for the sound timer uint32 _flag; |