diff options
| author | Paul Gilbert | 2016-09-02 23:40:25 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2016-09-02 23:40:25 -0400 |
| commit | d971dbea406925760e74e17ffe329d637ad962d6 (patch) | |
| tree | ed354cef81144a3824d0621f4d259c30f417b5ef /engines/titanic/sound/sound.h | |
| parent | 375fb60ff812b9d0dd9bd9f435613fab54907bc0 (diff) | |
| download | scummvm-rg350-d971dbea406925760e74e17ffe329d637ad962d6.tar.gz scummvm-rg350-d971dbea406925760e74e17ffe329d637ad962d6.tar.bz2 scummvm-rg350-d971dbea406925760e74e17ffe329d637ad962d6.zip | |
TITANIC: Fix and cleanup for sound freeing
Diffstat (limited to 'engines/titanic/sound/sound.h')
| -rw-r--r-- | engines/titanic/sound/sound.h | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/engines/titanic/sound/sound.h b/engines/titanic/sound/sound.h index de95f9edf1..21f2a93f24 100644 --- a/engines/titanic/sound/sound.h +++ b/engines/titanic/sound/sound.h @@ -41,15 +41,17 @@ public: CWaveFile *_waveFile; File *_dialogueFileHandle; int _speechId; - bool _freeFlag; + DisposeAfterUse::Flag _disposeAfterUse; bool _active; public: CSoundItem() : ListItem(), _waveFile(nullptr), _dialogueFileHandle(nullptr), - _speechId(0), _freeFlag(false), _active(false) {} + _speechId(0), _disposeAfterUse(DisposeAfterUse::NO), _active(false) {} CSoundItem(const CString &name) : ListItem(), _name(name), _waveFile(nullptr), - _dialogueFileHandle(nullptr), _speechId(0), _freeFlag(false), _active(false) {} + _dialogueFileHandle(nullptr), _disposeAfterUse(DisposeAfterUse::NO), + _speechId(0), _active(false) {} CSoundItem(File *dialogueFile, int speechId) : ListItem(), _waveFile(nullptr), - _dialogueFileHandle(dialogueFile), _speechId(speechId), _freeFlag(false), _active(false) {} + _dialogueFileHandle(dialogueFile), _speechId(speechId), _active(false), + _disposeAfterUse(DisposeAfterUse::NO) {} }; class CSoundItemList : public List<CSoundItem> { @@ -126,7 +128,8 @@ public: /** * Flags a sound about to be played as activated */ - void activateSound(CWaveFile *waveFile, bool freeFlag); + void activateSound(CWaveFile *waveFile, + DisposeAfterUse::Flag disposeAfterUse = DisposeAfterUse::NO); /** * Stops any sounds attached to a given channel |