aboutsummaryrefslogtreecommitdiff
path: root/sound/midiparser_xmidi.cpp
diff options
context:
space:
mode:
authorJamieson Christian2003-05-25 15:47:06 +0000
committerJamieson Christian2003-05-25 15:47:06 +0000
commit11e59488ef4dcdd5931e926e45fcaaec4624793f (patch)
tree9248cf86799ae0bee595ccf87229c4ae625549b9 /sound/midiparser_xmidi.cpp
parent48f277e65d42c725163aa7516aae529fd94255f0 (diff)
downloadscummvm-rg350-11e59488ef4dcdd5931e926e45fcaaec4624793f.tar.gz
scummvm-rg350-11e59488ef4dcdd5931e926e45fcaaec4624793f.tar.bz2
scummvm-rg350-11e59488ef4dcdd5931e926e45fcaaec4624793f.zip
Fixed occassional music crashes when loading games.
Thanks to eriktorbjorn for finding this issue. svn-id: r7959
Diffstat (limited to 'sound/midiparser_xmidi.cpp')
-rw-r--r--sound/midiparser_xmidi.cpp14
1 files changed, 1 insertions, 13 deletions
diff --git a/sound/midiparser_xmidi.cpp b/sound/midiparser_xmidi.cpp
index edef6c7be4..0779137959 100644
--- a/sound/midiparser_xmidi.cpp
+++ b/sound/midiparser_xmidi.cpp
@@ -34,7 +34,6 @@
class MidiParser_XMIDI : public MidiParser {
protected:
- byte *_data;
NoteTimer _notes_cache[32];
uint32 _inserted_delta; // Track simulated deltas for note-off events
@@ -44,11 +43,10 @@ protected:
void parseNextEvent (EventInfo &info);
public:
- MidiParser_XMIDI() : _data(0), _inserted_delta(0) {}
+ MidiParser_XMIDI() : _inserted_delta(0) {}
~MidiParser_XMIDI() { }
bool loadMusic (byte *data, uint32 size);
- void unloadMusic();
};
@@ -274,7 +272,6 @@ bool MidiParser_XMIDI::loadMusic (byte *data, uint32 size) {
// Note that we assume the original data passed in
// will persist beyond this call, i.e. we do NOT
// copy the data to our own buffer. Take warning....
- _data = data;
_ppqn = 60;
resetTracking();
setTempo (500000);
@@ -286,15 +283,6 @@ bool MidiParser_XMIDI::loadMusic (byte *data, uint32 size) {
return false;
}
-void MidiParser_XMIDI::unloadMusic() {
- resetTracking();
- allNotesOff();
- _inserted_delta = 0;
- _data = 0;
- _num_tracks = 0;
- _active_track = 255;
-}
-
void MidiParser_XMIDI::resetTracking() {
MidiParser::resetTracking();
_inserted_delta = 0;