[Scummvm-cvs-logs] CVS: scummvm/sound mididrv.cpp,1.12,1.13 mididrv.h,1.3,1.4

[Max Horn]

Update of /cvsroot/scummvm/scummvm/sound
In directory usw-pr-cvs1:/tmp/cvs-serv9759

Modified Files:
	mididrv.cpp mididrv.h 
Log Message:
removed the unused destroy() methods; using 'delete this' issn't nice anyway <g>

Index: mididrv.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/mididrv.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** mididrv.cpp	26 Apr 2002 13:16:11 -0000	1.12
--- mididrv.cpp	26 Apr 2002 22:38:03 -0000	1.13
***************
*** 36,40 ****
  class MidiDriver_WIN : public MidiDriver {
  public:
- 	void destroy();
  	int open(int mode);
  	void close();
--- 36,39 ----
***************
*** 80,88 ****
  }
  
- void MidiDriver_WIN::destroy() {
- 	close();
- 	delete this;
- }
- 
  void CALLBACK MidiDriver_WIN::midi_callback(HMIDIOUT hmo, UINT wMsg,
  	DWORD dwInstance, DWORD dwParam1, DWORD dwParam2) {
--- 79,82 ----
***************
*** 278,282 ****
  class MidiDriver_AMIDI : public MidiDriver {
  public:
- 	void destroy();
  	int open(int mode);
  	void close();
--- 272,275 ----
***************
*** 296,304 ****
  }
  
- void MidiDriver_AMIDI::destroy() {
- 	close();
- 	delete this;
- }
- 
  int MidiDriver_AMIDI::open(int mode) {
  	_mode = mode;
--- 289,292 ----
***************
*** 342,346 ****
  public:
          MidiDriver_SEQ();
- 	void destroy();
  	int open(int mode);
  	void close();
--- 330,333 ----
***************
*** 449,457 ****
  }
  
- void MidiDriver_SEQ::destroy() {
- 	close();
- 	delete this;
- }
- 
  #endif
  
--- 436,439 ----
***************
*** 468,472 ****
  class MidiDriver_QT : public MidiDriver {
  public:
- 	void destroy();
  	int open(int mode);
  	void close();
--- 450,453 ----
***************
*** 490,499 ****
  }
  
- void MidiDriver_QT::destroy()
- {
- 	close();
- 	delete this;
- }
- 
  int MidiDriver_QT::open(int mode) {
  	ComponentResult qtErr = noErr;
--- 471,474 ----
***************
*** 664,668 ****
  class MidiDriver_CORE : public MidiDriver {
  public:
- 	void destroy();
  	int open(int mode);
  	void close();
--- 639,642 ----
***************
*** 684,692 ****
  }
  
- void MidiDriver_CORE::destroy() {
- 	close();
- 	delete this;
- }
- 
  int MidiDriver_CORE::open(int mode) {
  	_mode = mode;
--- 658,661 ----
***************
*** 753,757 ****
  class MidiDriver_NULL : public MidiDriver {
  public:
- 	void destroy();
  	int open(int mode);
  	void close();
--- 722,725 ----
***************
*** 767,771 ****
  }
  void MidiDriver_NULL::close() {}
- void MidiDriver_NULL::destroy() {}
  void MidiDriver_NULL::send(uint32 b) {}
  void MidiDriver_NULL::pause(bool pause) {}
--- 735,738 ----

Index: mididrv.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/mididrv.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** mididrv.h	26 Apr 2002 13:16:12 -0000	1.3
--- mididrv.h	26 Apr 2002 22:38:03 -0000	1.4
***************
*** 66,72 ****
  
  	
- 	/* destroy the midi object */
- //	virtual void destroy() = 0;
- 
  	/* open the midi driver.
  	 * returns 0 if successful.
--- 66,69 ----