[Scummvm-cvs-logs] scummvm master -> 763c052c67137079ee81f70288375cbb238f8d68

[fuzzie]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
763c052c67 AUDIO: Remove unused members of MidiParser_XMIDI.


Commit: 763c052c67137079ee81f70288375cbb238f8d68
    https://github.com/scummvm/scummvm/commit/763c052c67137079ee81f70288375cbb238f8d68
Author: Alyssa Milburn (fuzzie at fuzzie.org)
Date: 2012-09-07T13:22:43-07:00

Commit Message:
AUDIO: Remove unused members of MidiParser_XMIDI.

Changed paths:
    audio/midiparser_xmidi.cpp



diff --git a/audio/midiparser_xmidi.cpp b/audio/midiparser_xmidi.cpp
index 85491fa..f0b2d0c 100644
--- a/audio/midiparser_xmidi.cpp
+++ b/audio/midiparser_xmidi.cpp
@@ -32,9 +32,6 @@
  */
 class MidiParser_XMIDI : public MidiParser {
 protected:
-	NoteTimer _notes_cache[32];
-	uint32 _inserted_delta; // Track simulated deltas for note-off events
-
 	struct Loop {
 		byte *pos;
 		byte repeat;
@@ -48,11 +45,10 @@ protected:
 
 protected:
 	uint32 readVLQ2(byte * &data);
-	void resetTracking();
 	void parseNextEvent(EventInfo &info);
 
 public:
-	MidiParser_XMIDI(XMidiCallbackProc proc, void *data) : _inserted_delta(0), _callbackProc(proc), _callbackData(data) {}
+	MidiParser_XMIDI(XMidiCallbackProc proc, void *data) : _callbackProc(proc), _callbackData(data) {}
 	~MidiParser_XMIDI() { }
 
 	bool loadMusic(byte *data, uint32 size);
@@ -70,10 +66,9 @@ uint32 MidiParser_XMIDI::readVLQ2(byte * &pos) {
 
 void MidiParser_XMIDI::parseNextEvent(EventInfo &info) {
 	info.start = _position._play_pos;
-	info.delta = readVLQ2(_position._play_pos) - _inserted_delta;
+	info.delta = readVLQ2(_position._play_pos);
 
 	// Process the next event.
-	_inserted_delta = 0;
 	info.event = *(_position._play_pos++);
 	switch (info.event >> 4) {
 	case 0x9: // Note On
@@ -349,7 +344,6 @@ bool MidiParser_XMIDI::loadMusic(byte *data, uint32 size) {
 		_ppqn = 60;
 		resetTracking();
 		setTempo(500000);
-		_inserted_delta = 0;
 		setTrack(0);
 		return true;
 	}
@@ -357,11 +351,6 @@ bool MidiParser_XMIDI::loadMusic(byte *data, uint32 size) {
 	return false;
 }
 
-void MidiParser_XMIDI::resetTracking() {
-	MidiParser::resetTracking();
-	_inserted_delta = 0;
-}
-
 void MidiParser::defaultXMidiCallback(byte eventData, void *data) {
 	warning("MidiParser: defaultXMidiCallback(%d)", eventData);
 }