diff options
| author | Jamieson Christian | 2003-09-28 00:03:24 +0000 |
|---|---|---|
| committer | Jamieson Christian | 2003-09-28 00:03:24 +0000 |
| commit | 044bcd5430a9ba1b19e10d4d4e3a193358166991 (patch) | |
| tree | 3af39ea65d71f9de3deedb3c116d782fa97b9b8d /scumm/imuse.h | |
| parent | 1d40ce68c2fd93abdef86989ae534b124f175068 (diff) | |
| download | scummvm-rg350-044bcd5430a9ba1b19e10d4d4e3a193358166991.tar.gz scummvm-rg350-044bcd5430a9ba1b19e10d4d4e3a193358166991.tar.bz2 scummvm-rg350-044bcd5430a9ba1b19e10d4d4e3a193358166991.zip | |
Added terminate() to the MusicEngine and publicized
the iMuse implementation. This allows the termination
sequence to be done BEFORE object destruction, so
that the destructor is not making calls that may not
be appropriate during object destruction. (Virtual
functions were the concern, although I'm not sure any
of that was happening anyway. Oh well, better to be
safe than sorry.)
I implemented an empty terminate() in the base class,
but the other MusicEngine derivatives may have stuff
in their destructors that should be moved to this
method. I didn't check.
svn-id: r10452
Diffstat (limited to 'scumm/imuse.h')
| -rw-r--r-- | scumm/imuse.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/scumm/imuse.h b/scumm/imuse.h index 3337f08b5e..62012de460 100644 --- a/scumm/imuse.h +++ b/scumm/imuse.h @@ -74,6 +74,7 @@ public: int clear_queue(); void setBase(byte **base); uint32 property(int prop, uint32 value); + void terminate(); // Factory methods static IMuse *create(OSystem *syst, SoundMixer *mixer, MidiDriver *midi); |