aboutsummaryrefslogtreecommitdiff
path: root/engines/sherlock/music.h
diff options
context:
space:
mode:
authorMartin Kiewitz2015-06-02 18:17:25 +0200
committerMartin Kiewitz2015-06-02 18:17:25 +0200
commit4cf16a905bc85214c236e391f6b6f60e14bd3352 (patch)
tree4b86cca29b009c08f459555c6517f251ad885bd2 /engines/sherlock/music.h
parent100dd52a8efcb8e2871924c8837dd0747a440eb0 (diff)
downloadscummvm-rg350-4cf16a905bc85214c236e391f6b6f60e14bd3352.tar.gz
scummvm-rg350-4cf16a905bc85214c236e391f6b6f60e14bd3352.tar.bz2
scummvm-rg350-4cf16a905bc85214c236e391f6b6f60e14bd3352.zip
SHERLOCK: hopefully fix crash on exit/Music class
Diffstat (limited to 'engines/sherlock/music.h')
-rw-r--r--engines/sherlock/music.h14
1 files changed, 10 insertions, 4 deletions
diff --git a/engines/sherlock/music.h b/engines/sherlock/music.h
index e651dd7043..b11a7691bd 100644
--- a/engines/sherlock/music.h
+++ b/engines/sherlock/music.h
@@ -33,6 +33,10 @@ namespace Sherlock {
class SherlockEngine;
class MidiParser_SH : public MidiParser {
+public:
+ MidiParser_SH();
+ ~MidiParser_SH();
+
protected:
virtual void parseNextEvent(EventInfo &info);
@@ -40,16 +44,20 @@ protected:
uint8 _lastEvent;
byte *_data;
byte *_trackEnd;
+
public:
- MidiParser_SH();
virtual bool loadMusic(byte *data, uint32 size);
};
class Music {
+public:
+ Music(SherlockEngine *vm, Audio::Mixer *mixer);
+ ~Music();
+
private:
SherlockEngine *_vm;
Audio::Mixer *_mixer;
- MidiParser_SH _midiParser;
+ MidiParser_SH *_midiParser;
MidiDriver *_driver;
public:
@@ -60,8 +68,6 @@ private:
MusicType _musicType;
public:
- Music(SherlockEngine *vm, Audio::Mixer *mixer);
-
/**
* Saves sound-related settings
*/