[Scummvm-cvs-logs] CVS: scummvm/simon midi.cpp,1.23,1.24 midi.h,1.9,1.10 simon.cpp,1.178,1.179 vga.cpp,1.38,1.39
Jamieson Christian
jamieson630 at users.sourceforge.net
Sun May 18 16:56:10 CEST 2003
Update of /cvsroot/scummvm/scummvm/simon
In directory sc8-pr-cvs1:/tmp/cvs-serv6480/simon
Modified Files:
midi.cpp midi.h simon.cpp vga.cpp
Log Message:
Implemented new Simon MIDI module, switching from MidiStreamer to MidiParser. Restructuring enables XMIDI support and vc_72 implementation. Various cleanup on MidiParser's and MidiDriver's.
Index: midi.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/midi.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- midi.cpp 6 Mar 2003 21:46:49 -0000 1.23
+++ midi.cpp 18 May 2003 23:55:29 -0000 1.24
@@ -24,435 +24,298 @@
#include "scummsys.h"
#include "common/system.h"
#include "common/file.h"
-#include "sound/midistreamer.h"
#include "sound/mixer.h"
#include "simon/simon.h"
-MidiPlayer::MidiPlayer() {
+MidiPlayer::MidiPlayer (OSystem *system) {
// Since initialize() is called every time the music changes,
// this is where we'll initialize stuff that must persist
// between songs.
+ _system = system;
+ _mutex = system->create_mutex();
+ _data = 0;
_masterVolume = 255;
+ _num_songs = 0;
+ _currentTrack = 255;
}
-void MidiPlayer::read_all_songs(File *in, uint music) {
- uint i, num;
-
- _currentSong = _songs;
-
- num = in->readByte();
-
- for (i = 0; i != num; i++) {
- read_one_song(in, &_songs[i], music);
- }
-}
-
-void MidiPlayer::read_all_songs_old(File *in, uint music) {
- uint i, num;
-
- _currentSong = _songs;
-
- num = 1;
-
- for (i = 0; i != num; i++) {
- read_one_song(in, &_songs[i], music);
- }
+MidiPlayer::~MidiPlayer() {
+ _system->lock_mutex (_mutex);
+ close();
+ _system->unlock_mutex (_mutex);
+ _system->delete_mutex (_mutex);
}
-void MidiPlayer::read_all_songs_old(File *in, uint music, uint16 size) {
- _currentSong = _songs;
-
- _lastDelay = 0;
+int MidiPlayer::open() {
+ // Don't ever call open without first setting the output driver!
+ if (!_driver)
+ return 255;
- read_one_song(in, &_songs[0], music, size);
+ int ret = _driver->open();
+ if (ret)
+ return ret;
+ _driver->setTimerCallback (this, &onTimer);
+ return 0;
}
-void MidiPlayer::read_mthd(File *in, Song *s, bool old, uint music, uint16 size) {
- Track *t;
- uint i;
-
- if (!old) {
- if (in->readUint32BE() != 6)
- error("Invalid 'MThd' chunk size");
- s->midi_format = in->readUint16BE();
- s->num_tracks = in->readUint16BE();
- s->ppqn = in->readUint16BE();
- } else {
- s->midi_format = 0;
- s->num_tracks = 1;
- s->ppqn = 0xc0;
-
- in->readUint16BE();
- in->readByte();
- }
-
- s->tracks = t = (Track *)calloc(s->num_tracks, sizeof(Track));
- if (t == NULL)
- error("Out of memory when allocating MIDI tracks");
-
- for (i = 0; i != s->num_tracks; i++, t++) {
- if (!old) {
- if (in->readUint32BE() != 'MTrk')
- error("Midi track has no 'MTrk'");
-
- t->data_size = in->readUint32BE();
- } else {
- //FIXME We currently don't know how to find out music track size for GMF midi format
- // So we use music files sizes minues header for now to allow looping
- int music_data_size[] = {8900, 12166, 2848, 3442, 4034, 4508, 7064, 9730, 6014, 4742, 3138,
- 6570, 5384, 8909, 6457, 16321, 2742, 8968, 4804, 8442, 7717,
- 9444, 5800, 1381, 5660, 6684, 2456, 4744, 2455, 1177, 1232,
- 17256, 5103, 8794, 4884, 16};
- if (size)
- t->data_size = size - 8;
- else
- t->data_size = music_data_size[music] - 8;
- }
-
- t->data_ptr = (byte *)calloc(t->data_size, 1);
- if (t->data_ptr == NULL)
- error("Out of memory when allocating MIDI track data (%d)", t->data_size);
-
- in->read(t->data_ptr, t->data_size);
-
- t->data_cur_size = t->data_size;
- t->data_cur_ptr = t->data_ptr;
-
- t->a = 0;
- t->last_cmd = 0;
- t->delay = 0;
-
- if (t->data_cur_size == 0) {
- t->a |= 1;
- continue;
- }
-
- t->delay = track_read_gamma(t);
- }
+void MidiPlayer::close() {
+ _system->lock_mutex (_mutex);
+ stop();
+ if (_driver)
+ _driver->close();
+ _driver = NULL;
+ clearConstructs();
+ _system->unlock_mutex (_mutex);
}
-void MidiPlayer::read_one_song(File *in, Song *s, uint music, uint16 size) {
- _lastDelay = 0;
-
- s->ppqn = 0;
- s->midi_format = 0;
- s->num_tracks = 0;
- s->tracks = NULL;
-
- uint32 id = in->readUint32BE();
-
- switch (id) {
- case 'MThd':
- read_mthd(in, s, false, music, size);
- break;
-
- case 'GMF\x1':
- read_mthd(in, s, true, music, size);
- break;
+void MidiPlayer::send (uint32 b) {
+ byte volume;
- default:
- error("Midi song has no 'MThd'");
+ // Only thing we care about is volume control changes.
+ if ((b & 0xFFF0) == 0x07B0) {
+ volume = (byte) ((b >> 16) & 0xFF) * _masterVolume / 255;
+ _volumeTable [b & 0xF] = volume;
+ b = (b & 0xFF00FFFF) | (volume << 16);
}
+ _driver->send (b);
}
-uint32 MidiPlayer::track_read_gamma(Track *t) {
- uint32 sum;
- byte b;
-
- sum = 0;
- do {
- b = track_read_byte(t);
- sum = (sum << 7) | (b & 0x7F);
- } while (b & 0x80);
+void MidiPlayer::metaEvent (byte type, byte *data, uint16 length) {
+ // Only thing we care about is End of Track.
+ if (type != 0x2F)
+ return;
- return sum;
+ _parser->jumpToTick (0);
}
-byte MidiPlayer::track_read_byte(Track *t) {
- if (t->a & 1)
- error("Trying to read byte from MIDI stream when end reached");
-
- if (!--t->data_cur_size) {
- t->a |= 1;
+void MidiPlayer::onTimer (void *data) {
+ MidiPlayer *player = (MidiPlayer *) data;
+ if (player->_paused)
+ return;
+ if (player->_parser) {
+ player->_system->lock_mutex (player->_mutex);
+ player->_parser->onTimer();
+ player->_system->unlock_mutex (player->_mutex);
}
-
- return *t->data_cur_ptr++;
-}
-
-void MidiPlayer::initialize() {
- int res;
- int i;
-
- for (i = 0; i != 16; i++)
- _volumeTable[i] = 127;
-
- _midiDriver->property(MidiDriver::PROP_TIMEDIV, _songs[0].ppqn);
-
- res = _midiDriver->open();
- if (res != 0)
- error("MidiPlayer::initializer, got %s", MidiDriver::getErrorName(res));
-
- if (_paused)
- _midiDriver->pause (true);
}
-int MidiPlayer::fill(MidiEvent *me, int num_event) {
- uint32 best, j;
- Track *best_track, *t;
- bool did_reset;
- NoteRec midi_tmp_note_rec;
- int i = 0;
+void MidiPlayer::jump (uint16 track, uint16 tick) {
+ if (track == _currentTrack)
+ return;
- did_reset = false;
+ if (_num_songs > 0) {
+ if (track >= _num_songs)
+ return;
- for (i = 0; i != num_event;) {
- best_track = NULL;
- best = 0xFFFFFFFF;
+ _system->lock_mutex (_mutex);
- /* Locate which track that's next */
- t = _currentSong->tracks;
- for (j = _currentSong->num_tracks; j; j--, t++) {
- if (!(t->a & 1)) {
- if (t->delay < best) {
- best = t->delay;
- best_track = t;
- }
- }
+ if (_parser) {
+ delete _parser;
+ _parser = 0;
}
- if (best_track == NULL) {
- /* reset tracks if song ended? */
- if (did_reset) {
- /* exit if song ended completely */
- return i;
- }
- did_reset = true;
- reset_tracks();
- continue;
+ MidiParser *parser = MidiParser::createParser_SMF();
+ parser->setMidiDriver (this);
+ parser->setTimerRate (_driver->getBaseTempo());
+ if (!parser->loadMusic (_songs[track], _song_sizes[track])) {
+ printf ("Error reading track!\n");
+ delete parser;
+ parser = 0;
}
- read_next_note(best_track, &midi_tmp_note_rec);
- if (fill_helper(&midi_tmp_note_rec, me + i))
- i++;
+ _currentTrack = (byte) track;
+ for (int i = ARRAYSIZE (_volumeTable); i; --i)
+ _volumeTable[i-1] = 127;
+ _parser = parser; // That plugs the power cord into the wall
- if (midi_tmp_note_rec.sysex_data)
- free(midi_tmp_note_rec.sysex_data);
+ _system->unlock_mutex (_mutex);
+ } else if (_parser) {
+ _system->lock_mutex (_mutex);
+ _currentTrack = (byte) track;
+ _parser->setTrack ((byte) track);
+ _parser->jumpToTick (tick - 1);
+ _system->unlock_mutex (_mutex);
}
-
- return i;
}
-int MidiPlayer::on_fill(void *param, MidiEvent *ev, int num) {
- MidiPlayer *mp = (MidiPlayer *) param;
- return mp->fill(ev, num);
+void MidiPlayer::stop() {
+ _system->lock_mutex (_mutex);
+ if (_parser)
+ _parser->unloadMusic();
+ _currentTrack = 255;
+ _system->unlock_mutex (_mutex);
}
-bool MidiPlayer::fill_helper(NoteRec *nr, MidiEvent *me) {
- uint b;
+void MidiPlayer::pause (bool b) {
+ if (_paused == b)
+ return;
+ _paused = b;
- b = nr->delay - _lastDelay;
- _lastDelay = nr->delay;
+ _system->lock_mutex (_mutex);
+ for (int i = ARRAYSIZE (_volumeTable); i; --i)
+ _driver->send (((_paused ? 0 : (_volumeTable[i-1] * _masterVolume / 255)) << 16) | (7 << 8) | 0xB0 | i);
+ _system->unlock_mutex (_mutex);
+}
- if (nr->cmd < 0xF0) {
- me->delta = b;
- me->event = nr->cmd | (nr->param_1 << 8) | (nr->param_2 << 16);
+void MidiPlayer::set_volume (int volume) {
+ if (volume < 0)
+ volume = 0;
+ else if (volume > 255)
+ volume = 255;
- if ((nr->cmd & 0xF0) == 0xB0 && nr->param_1 == 7) {
- _volumeTable[nr->cmd & 0xF] = nr->param_2;
-// nr->param_1 = 0x76;
- me->event = nr->cmd | (nr->param_1 << 8) | ((nr->param_2 * _masterVolume / 255) << 16) /* | MEVT_F_CALLBACK */ ;
- }
- return true;
+ if (_masterVolume == volume)
+ return;
- }
+ _masterVolume = volume;
- if (nr->cmd == 0xF0 || nr->cmd == 0xF7 || nr->param_1 != 0x51) {
- return false;
+ // Now tell all the channels this.
+ _system->lock_mutex (_mutex);
+ if (_driver && !_paused) {
+ for (int i = ARRAYSIZE (_volumeTable); i; --i) {
+ _driver->send (((_volumeTable[i-1] * _masterVolume / 255) << 16) | (7 << 8) | 0xB0 | i);
+ }
}
-
- int tempo = nr->sysex_data[2] | (nr->sysex_data[1] << 8) | (nr->sysex_data[0] << 16);
-// _midi_var8 = (_currentSong->ppqn * 60000) / tempo;
-
- me->delta = b;
- me->event = (MidiStreamer::ME_TEMPO << 24) | tempo;
-
- return true;
+ _system->unlock_mutex (_mutex);
}
-void MidiPlayer::reset_tracks() {
- if (_midi_sfx_toggle)
+void MidiPlayer::set_driver(MidiDriver *md) {
+ // Don't try to set this more than once.
+ if (_driver)
return;
+ _driver = md;
+}
- Track *t;
- uint i;
+void MidiPlayer::clearConstructs() {
+ if (_num_songs > 0) {
+ byte i;
+ for (i = 0; i < _num_songs; ++i) {
+ free (_songs [i]);
+ }
+ _num_songs = 0;
+ }
- _lastDelay = 0;
+ if (_data) {
+ free (_data);
+ _data = 0;
+ }
- for (i = 0, t = _currentSong->tracks; i != _currentSong->num_tracks; i++, t++) {
- t->data_cur_size = t->data_size;
- t->data_cur_ptr = t->data_ptr;
- t->a = 0;
- t->last_cmd = 0;
- t->delay = 0;
- if (t->data_cur_size == 0) {
- t->a |= 1;
- } else {
- t->delay = track_read_gamma(t);
- }
+ if (_parser) {
+ delete _parser;
+ _parser = 0;
}
}
-void MidiPlayer::read_next_note(Track *t, NoteRec *nr) {
- byte cmd_byte;
- uint i;
-
- nr->delay = 0;
- nr->cmd = 0;
- nr->param_1 = 0;
- nr->param_2 = 0;
- nr->cmd_length = 0;
- nr->sysex_data = NULL;
+void MidiPlayer::playSMF (File *in) {
+ _system->lock_mutex (_mutex);
+ clearConstructs();
+ uint32 size = in->size() - in->pos();
+ if (size > 64000)
+ size = 64000;
+ _data = (byte *) calloc (size, 1);
+ in->read (_data, size);
- if (t->a & 1 || t->data_cur_size == 0)
- error("read next note when track ended");
+ MidiParser *parser = MidiParser::createParser_SMF();
+ parser->setMidiDriver (this);
+ parser->setTimerRate (_driver->getBaseTempo());
+ if (!parser->loadMusic (_data, size)) {
+ printf ("Error reading track!\n");
+ delete parser;
+ parser = 0;
+ }
- /* read next midi byte, but skip any pitch bends. */
- for (;;) {
- cmd_byte = track_read_byte(t);
- if ((cmd_byte & 0xF0) != 0xE0)
- break;
+ _currentTrack = 0;
+ for (int i = ARRAYSIZE (_volumeTable); i; --i)
+ _volumeTable[i-1] = 127;
+ _parser = parser; // That plugs the power cord into the wall
+ _system->unlock_mutex (_mutex);
+}
- track_read_byte(t);
-// track_read_byte(t);
+void MidiPlayer::playMultipleSMF (File *in) {
+ // This is a special case for Simon 2 Windows.
+ // Instead of having multiple sequences as
+ // separate tracks in a Type 2 file, simon2win
+ // has multiple songs, each of which is a Type 1
+ // file. Thus, preceding the songs is a single
+ // byte specifying how many songs are coming.
+ // We need to load ALL the songs and then
+ // treat them as separate tracks -- for the
+ // purpose of jumps, anyway.
+ _system->lock_mutex (_mutex);
+ clearConstructs();
+ _num_songs = in->readByte();
+ if (_num_songs > 16) {
+ printf ("playMultipleSMF: %d is too many songs to keep track of!\n", (int) _num_songs);
+ _system->unlock_mutex (_mutex);
+ return;
}
- if (!(cmd_byte & 0x80)) {
- /* running status? */
- if (t->last_cmd == 0)
- error("Last cmd = 0");
- nr->cmd = t->last_cmd;
- nr->param_1 = cmd_byte;
- cmd_byte = nr->cmd & 0xF0;
- nr->cmd_length = 2;
- if (cmd_byte != 0xC0 && cmd_byte != 0xD0) {
- nr->param_2 = track_read_byte(t);
- nr->cmd_length++;
- }
- } else if ((cmd_byte & 0xF0) != 0xF0) {
- nr->cmd = cmd_byte;
- t->last_cmd = cmd_byte;
- cmd_byte &= 0xF0;
- nr->cmd_length = (cmd_byte == 0xC0 || cmd_byte == 0xD0) ? 2 : 3;
+ byte i;
+ for (i = 0; i < _num_songs; ++i) {
+ byte buf[5];
+ uint32 pos = in->pos();
- if (t->data_cur_size < nr->cmd_length - 1) {
- error("read_next_note: end of stream");
+ // Make sure there's a MThd
+ in->read (buf, 4);
+ if (memcmp (buf, "MThd", 4)) {
+ printf ("Expected MThd but found '%c%c%c%c' instead!\n", buf[0], buf[1], buf[2], buf[3]);
+ _system->unlock_mutex (_mutex);
+ return;
}
+ in->seek (in->readUint32BE() + in->pos(), SEEK_SET);
- nr->param_1 = track_read_byte(t);
- if (nr->cmd_length == 3)
- nr->param_2 = track_read_byte(t);
-
- } else if (cmd_byte == 0xF0 || cmd_byte == 0xF7) {
- nr->cmd = cmd_byte;
- nr->cmd_length = track_read_gamma(t);
- if (t->data_cur_size < nr->cmd_length)
- error("read_next_note: end of stream 2");
- nr->sysex_data = (byte *)malloc(nr->cmd_length);
- if (nr->sysex_data == NULL)
- error("read_next_note: out of memory");
- for (i = 0; i != nr->cmd_length; i++)
- nr->sysex_data[i] = track_read_byte(t);
- } else if (cmd_byte == 0xFF) {
-
- nr->cmd = cmd_byte;
- nr->param_1 = track_read_byte(t);
- nr->cmd_length = track_read_gamma(t);
- if (nr->cmd_length) {
- if (t->data_cur_size < nr->cmd_length)
- error("read_next_note: end of stream 3");
- nr->sysex_data = (byte *)malloc(nr->cmd_length);
- if (nr->sysex_data == NULL)
- error("read_next_note: out of memory");
- for (i = 0; i != nr->cmd_length; i++)
- nr->sysex_data[i] = track_read_byte(t);
+ // Now skip all the MTrk blocks
+ while (true) {
+ in->read (buf, 4);
+ if (memcmp (buf, "MTrk", 4))
+ break;
+ in->seek (in->readUint32BE() + in->pos(), SEEK_SET);
}
- if (nr->param_1 == 0x2F)
- t->a |= 1;
- } else {
- error("Invalid sysex cmd");
- }
- nr->delay = t->delay;
- if (!(t->a & 1)) {
- t->delay += track_read_gamma(t);
+ uint32 pos2 = in->pos() - 4;
+ uint32 size = pos2 - pos;
+ _songs[i] = (byte *) calloc (size, 1);
+ in->seek (pos, SEEK_SET);
+ in->read (_songs[i], size);
+ _song_sizes[i] = size;
}
-}
-void MidiPlayer::shutdown() {
- _midiDriver->close();
- unload();
-}
-
-void MidiPlayer::unload() {
- uint i, j;
- Song *s;
- Track *t;
- for (i = 0, s = _songs; i != 8; i++, s++) {
- if (s->tracks) {
- for (j = 0, t = s->tracks; j != s->num_tracks; j++, t++) {
- if (t->data_ptr)
- free(t->data_ptr);
- }
- free(s->tracks);
- s->tracks = NULL;
- }
- }
+ _system->unlock_mutex (_mutex);
+ jump (0, 1);
}
-void MidiPlayer::play() {
- if (!_paused)
- _midiDriver->pause(false);
-}
+void MidiPlayer::playXMIDI (File *in) {
+ _system->lock_mutex (_mutex);
+ clearConstructs();
-void MidiPlayer::pause (bool b) {
- if (_paused == b)
+ char buf[4];
+ uint32 pos = in->pos();
+ uint32 size = 4;
+ in->read (buf, 4);
+ if (!memcmp (buf, "FORM", 4)) {
+ while (memcmp (buf, "CAT ", 4)) { size += 4; in->read (buf, 4); }
+ size += 4 + in->readUint32BE();
+ in->seek (pos, 0);
+ _data = (byte *) calloc (size, 1);
+ in->read (_data, size);
+ } else {
+ printf ("ERROR! Expected 'FORM' tag but found '%c%c%c%c' instead!\n", buf[0], buf[1], buf[2], buf[3]);
+ _system->unlock_mutex (_mutex);
return;
- _paused = b;
- _midiDriver->pause(b);
-
- for (int i = ARRAYSIZE (_volumeTable); i; --i) {
- _midiDriver->send (((_paused ? 0 : (_volumeTable[i-1] * _masterVolume / 255)) << 16) | (7 << 8) | 0xB0 | i);
}
-
-}
-int MidiPlayer::get_volume() {
- return _masterVolume;
-}
-
-void MidiPlayer::set_volume (int volume) {
- if (volume < 0)
- volume = 0;
- else if (volume > 255)
- volume = 255;
-
- if (_masterVolume == volume)
- return;
-
- _masterVolume = volume;
-
- // Now tell all the channels this.
- if (_midiDriver && !_paused) {
- for (int i = ARRAYSIZE (_volumeTable); i; --i) {
- _midiDriver->send (((_volumeTable[i-1] * _masterVolume / 255) << 16) | (7 << 8) | 0xB0 | i);
- }
+ MidiParser *parser = MidiParser::createParser_XMIDI();
+ parser->setMidiDriver (this);
+ parser->setTimerRate (_driver->getBaseTempo());
+ if (!parser->loadMusic (_data, size)) {
+ printf ("Error reading track!\n");
+ delete parser;
+ parser = 0;
}
-}
-void MidiPlayer::set_driver(MidiDriver *md) {
- // We must always use the MidiStreamer front-end
- // so we can support user-initiated MIDI events (like volume).
- _midiDriver = new MidiStreamer (md);
- _midiDriver->set_stream_callback(this, on_fill);
+ _currentTrack = 0;
+ for (int i = ARRAYSIZE (_volumeTable); i; --i)
+ _volumeTable[i-1] = 127;
+ _parser = parser; // That plugs the power cord into the wall
+ _system->unlock_mutex (_mutex);
}
Index: midi.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/midi.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- midi.h 6 Mar 2003 21:46:50 -0000 1.9
+++ midi.h 18 May 2003 23:55:29 -0000 1.10
@@ -22,79 +22,64 @@
#ifndef SIMON_MIDI_H
#define SIMON_MIDI_H
-class MidiDriver;
-class MidiStreamer;
-class File;
-struct MidiEvent;
-
-class MidiPlayer {
-public:
- MidiPlayer();
-
- bool _midi_sfx_toggle;
- void read_all_songs (File *in, uint music);
- void read_all_songs_old (File *in, uint music, uint16 size);
- void read_all_songs_old (File *in, uint music);
- void initialize();
- void shutdown();
- void play();
- void pause (bool b);
- int get_volume();
- void set_volume (int volume);
- void set_driver (MidiDriver *md);
-
-private:
- struct Track {
- uint32 a;
- uint32 data_size;
- uint32 data_cur_size;
- byte *data_ptr;
- byte *data_cur_ptr;
- uint32 delay;
- byte last_cmd;
- };
+#include "sound/mididrv.h"
+#include "sound/midiparser.h"
- struct Song {
- uint ppqn;
- uint midi_format;
- uint num_tracks;
- Track *tracks;
- };
+class File;
+class OSystem;
- struct NoteRec {
- uint32 delay;
- byte cmd;
- byte param_1;
- byte param_2;
- uint cmd_length;
- byte *sysex_data;
- };
+class MidiPlayer : public MidiDriver {
+protected:
+ OSystem *_system;
+ void *_mutex;
+ MidiDriver *_driver;
+ MidiParser *_parser;
- MidiStreamer *_midiDriver;
- uint _lastDelay;
- Song *_currentSong;
- Song _songs[8];
+ byte *_data;
byte _volumeTable[16]; // 0-127
byte _masterVolume; // 0-255
bool _paused;
+ byte _currentTrack;
- void read_mthd(File *in, Song *s, bool old, uint music, uint16 size);
+ byte _num_songs;
+ byte *_songs[16];
+ uint32 _song_sizes[16];
- void read_one_song(File *in, Song *s, uint music, uint16 size = 0);
+ static void onTimer (void *data);
+ void clearConstructs();
- static uint32 track_read_gamma(Track *t);
- static byte track_read_byte(Track *t);
+public:
+ bool _midi_sfx_toggle;
- int fill (MidiEvent *me, int num_event);
- bool fill_helper (NoteRec *nr, MidiEvent *me);
+ MidiPlayer (OSystem *system);
+ ~MidiPlayer();
- void reset_tracks();
- void read_next_note(Track *t, NoteRec *nr);
+ void playSMF (File *in);
+ void playMultipleSMF (File *in);
+ void playXMIDI (File *in);
+ void jump (uint16 track, uint16 tick);
+ void stop();
+ void pause (bool b);
- void unload();
+ int get_volume() { return _masterVolume; }
+ void set_volume (int volume);
+ void set_driver (MidiDriver *md);
- static int on_fill(void *param, MidiEvent *ev, int num);
+public:
+ // MidiDriver interface implementation
+ int open();
+ void close();
+ void send(uint32 b);
+
+ void metaEvent (byte type, byte *data, uint16 length);
+
+ // Timing functions - MidiDriver now operates timers
+ void setTimerCallback (void *timer_param, void (*timer_proc) (void *)) { }
+ uint32 getBaseTempo (void) { return _driver ? _driver->getBaseTempo() : 0x4A0000; }
+ // Channel allocation functions
+ MidiChannel *allocateChannel() { return 0; }
+ MidiChannel *getPercussionChannel() { return 0; }
};
#endif
Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.178
retrieving revision 1.179
diff -u -d -r1.178 -r1.179
--- simon.cpp 18 May 2003 14:13:21 -0000 1.178
+++ simon.cpp 18 May 2003 23:55:30 -0000 1.179
@@ -170,7 +170,7 @@
}
SimonState::SimonState(GameDetector *detector, OSystem *syst)
- : Engine(detector, syst) {
+ : Engine(detector, syst), midi (syst) {
MidiDriver *driver = detector->createMidi();
_dummy_item_1 = new Item();
@@ -183,6 +183,9 @@
if (!driver)
driver = MidiDriver_ADLIB_create();
midi.set_driver(driver);
+ int ret = midi.open();
+ if (ret)
+ warning ("MIDI Player init failed: \"%s\"", midi.getErrorName (ret));
_game = (byte)detector->_features;
@@ -857,11 +860,12 @@
if (_mus_file->read(_mus_offsets, size) != size)
error("Can't read offsets");
- midi.shutdown();
+ // midi.shutdown();
_mus_file->seek(_mus_offsets[a], SEEK_SET);
- midi.read_all_songs_old(_mus_file, a, _mus_offsets[a+1] - _mus_offsets[a]);
- midi.initialize();
- midi.play();
+ // midi.read_all_songs_old(_mus_file, a, _mus_offsets[a+1] - _mus_offsets[a]);
+ // midi.initialize();
+ // midi.play();
+ midi.playSMF (_mus_file);
}
Subroutine *SimonState::getSubroutineByID(uint subroutine_id) {
@@ -3113,7 +3117,7 @@
if (_game == GAME_SIMON1DOS) {
midi._midi_sfx_toggle ^= 1;
if (midi._midi_sfx_toggle)
- midi.shutdown();
+ midi.stop();
else
playMusic(0, _last_music_played);
} else
@@ -5043,14 +5047,13 @@
if (_game & GF_SIMON2) { // Simon 2 music
if (_game & GF_WIN) {
- midi.shutdown();
+ midi.stop();
_game_file->seek(_game_offsets_ptr[gss->MUSIC_INDEX_BASE + music - 1], SEEK_SET);
- midi.read_all_songs(_game_file, music);
+ midi.playMultipleSMF (_game_file);
} else {
- /* TODO Add XMI midi format support for simon2dos/talkie */
- //midi.shutdown();
- //_game_file->seek(_game_offsets_ptr[gss->MUSIC_INDEX_BASE + music - 1], SEEK_SET);
- //midi.read_xmi_songs(_game_file, music);
+ midi.stop();
+ _game_file->seek(_game_offsets_ptr[gss->MUSIC_INDEX_BASE + music - 1], SEEK_SET);
+ midi.playXMIDI (_game_file);
}
_midi_unk1 = music;
_vc72_var1 = music_unk;
@@ -5066,13 +5069,15 @@
} else if (_game & GF_DEMO) {
/* TODO Add music support for simon1demo */
} else {
- midi.shutdown();
+ midi.stop();
if (_game & GF_WIN) {
_game_file->seek(_game_offsets_ptr[gss->MUSIC_INDEX_BASE + music], SEEK_SET);
- midi.read_all_songs(_game_file, music);
+ // midi.read_all_songs(_game_file, music);
+ midi.playSMF (_game_file);
} else if (_game & GF_TALKIE) {
_game_file->seek(_game_offsets_ptr[gss->MUSIC_INDEX_BASE + music], SEEK_SET);
- midi.read_all_songs_old(_game_file, music);
+ // midi.read_all_songs_old(_game_file, music);
+ midi.playSMF (_game_file);
} else {
char buf[50];
File *f = new File();
@@ -5082,11 +5087,10 @@
warning("Can't load music from '%s'", buf);
return;
}
- midi.read_all_songs_old(f, music);
+ // midi.read_all_songs_old(f, music);
+ midi.playSMF (f);
delete f;
}
- midi.initialize();
- midi.play();
}
}
}
Index: vga.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/vga.cpp,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- vga.cpp 9 Mar 2003 04:42:27 -0000 1.38
+++ vga.cpp 18 May 2003 23:55:30 -0000 1.39
@@ -1814,8 +1814,9 @@
if (_vc72_var1 == 999) {
_vc70_var2 = b;
if (_game & GF_WIN) {
- midi.initialize();
- midi.play();
+ // FIXME: What do we expect to have happen here?
+ // midi.initialize();
+ // midi.play();
}
_vc72_var1 = b;
} else if (_vc72_var1 != 0xFFFF) {
@@ -1854,8 +1855,7 @@
_vc72_var3 = a;
}
- if (_debugMode)
- warning("vc_72(%d,%d): music stuff?", a, b);
+ midi.jump (a, b);
}
void SimonState::vc_73_set_op189_flag() {
More information about the Scummvm-git-logs
mailing list