diff options
author | Johannes Schickel | 2010-06-18 02:25:11 +0000 |
---|---|---|
committer | Johannes Schickel | 2010-06-18 02:25:11 +0000 |
commit | a451ffe2687dc894d8026de14b4235b4e9b2953d (patch) | |
tree | e90e854f2e02f6f40c653ad9ac7ce00d572b942a | |
parent | 773f3bf1453b7e4cc55753e8ca882f5346ef5f83 (diff) | |
download | scummvm-rg350-a451ffe2687dc894d8026de14b4235b4e9b2953d.tar.gz scummvm-rg350-a451ffe2687dc894d8026de14b4235b4e9b2953d.tar.bz2 scummvm-rg350-a451ffe2687dc894d8026de14b4235b4e9b2953d.zip |
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.
svn-id: r49996
-rw-r--r-- | sound/midiparser.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sound/midiparser.h b/sound/midiparser.h index 35a14954a7..3ef99fcd6e 100644 --- a/sound/midiparser.h +++ b/sound/midiparser.h @@ -302,6 +302,11 @@ protected: 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 @@ public: 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(); |