[Scummvm-cvs-logs] SF.net SVN: scummvm:[49996] scummvm/trunk/sound/midiparser.h

lordhoto at users.sourceforge.net lordhoto at users.sourceforge.net
Fri Jun 18 04:25:11 CEST 2010


Revision: 49996
          http://scummvm.svn.sourceforge.net/scummvm/?rev=49996&view=rev
Author:   lordhoto
Date:     2010-06-18 02:25:11 +0000 (Fri, 18 Jun 2010)

Log Message:
-----------
Make MidiParser::sendToDriver protected.

The client code should never try to pass commands to
the output via the MidiParser API.

SCI currently does that though...
Actually that shows that either our MidiParser API becomes
more and more an MidiPlayer than just a parser or that the
SCI design has its flaws here.

Modified Paths:
--------------
    scummvm/trunk/sound/midiparser.h

Modified: scummvm/trunk/sound/midiparser.h
===================================================================
--- scummvm/trunk/sound/midiparser.h	2010-06-18 02:23:30 UTC (rev 49995)
+++ scummvm/trunk/sound/midiparser.h	2010-06-18 02:25:11 UTC (rev 49996)
@@ -302,6 +302,11 @@
 	void hangingNote(byte channel, byte note, uint32 ticks_left, bool recycle = true);
 	void hangAllActiveNotes();
 
+	virtual void sendToDriver(uint32 b);
+	void sendToDriver(byte status, byte firstOp, byte secondOp) {
+		sendToDriver(status | ((uint32)firstOp << 8) | ((uint32)secondOp << 16));
+	}
+
 	/**
 	 * Platform independent BE uint32 read-and-advance.
 	 * This helper function reads Big Endian 32-bit numbers
@@ -374,11 +379,6 @@
 	void setTempo(uint32 tempo);
 	void onTimer();
 
-	virtual void sendToDriver(uint32 b);
-	void sendToDriver(byte status, byte firstOp, byte secondOp) {
-		sendToDriver(status | ((uint32)firstOp << 8) | ((uint32)secondOp << 16));
-	}
-
 	bool isPlaying() const { return (_position._play_pos != 0); }
 	void stopPlaying();
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list