[Scummvm-cvs-logs] CVS: scummvm/sound midiparser.h,1.2,1.3 midiparser_smf.cpp,1.2,1.3 midiparser_xmidi.cpp,1.3,1.4

[Jamieson Christian]

Update of /cvsroot/scummvm/scummvm/sound
In directory sc8-pr-cvs1:/tmp/cvs-serv21422

Modified Files:
	midiparser.h midiparser_smf.cpp midiparser_xmidi.cpp 
Log Message:
Fixed gcc warnings, virtual destructor problem

Index: midiparser.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/midiparser.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- midiparser.h	18 May 2003 23:55:30 -0000	1.2
+++ midiparser.h	19 May 2003 00:12:15 -0000	1.3
@@ -34,6 +34,8 @@
 	uint32 _timer_rate;
 
 public:
+	virtual ~MidiParser() { }
+
 	virtual bool loadMusic (byte *data, uint32 size) = 0;
 	virtual void unloadMusic() = 0;
 

Index: midiparser_smf.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/midiparser_smf.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- midiparser_smf.cpp	18 May 2003 23:55:53 -0000	1.2
+++ midiparser_smf.cpp	19 May 2003 00:12:16 -0000	1.3
@@ -68,6 +68,8 @@
 	void allNotesOff();
 
 public:
+	~MidiParser_SMF();
+
 	bool loadMusic (byte *data, uint32 size);
 	void unloadMusic();
 
@@ -90,6 +92,11 @@
 //
 //////////////////////////////////////////////////
 
+MidiParser_SMF::~MidiParser_SMF() {
+	if (_buffer)
+		free (_buffer);
+}
+
 // This is the conventional (i.e. SMF) variable length quantity
 uint32 MidiParser_SMF::readVLQ (byte * &data) {
 	byte str;
@@ -481,7 +488,7 @@
 	_play_time = 0;
 	_last_event_time = 0;
 	if (tick > 0) {
-		printf ("jumpToTick (%ld) not completely implemented!\n", tick);
+		printf ("jumpToTick (%ld) not completely implemented!\n", (long) tick);
 		playToTime (tick * _psec_per_tick - 1, false);
 	}
 	allNotesOff();

Index: midiparser_xmidi.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/midiparser_xmidi.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- midiparser_xmidi.cpp	18 May 2003 23:55:53 -0000	1.3
+++ midiparser_xmidi.cpp	19 May 2003 00:12:16 -0000	1.4
@@ -70,6 +70,8 @@
 	void playToTime (uint32 psec, bool transmit);
 
 public:
+	~MidiParser_XMIDI() { }
+
 	bool loadMusic (byte *data, uint32 size);
 	void unloadMusic();
 
@@ -458,7 +460,7 @@
 	_play_time = 0;
 	_last_event_time = 0;
 	if (tick > 0) {
-		printf ("jumpToTick (%ld) not completely implemented!\n", tick);
+		printf ("jumpToTick (%ld) not completely implemented!\n", (long) tick);
 		playToTime (tick * MICROSECONDS_PER_TICK - 1, false);
 	}
 }