[Scummvm-cvs-logs] CVS: scummvm/simon midi.cpp,1.16,1.17 midi.h,1.6,1.7
Max Horn
fingolfin at users.sourceforge.net
Wed Dec 11 08:11:03 CET 2002
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm imuse.cpp,1.95,1.96
- Next message: [Scummvm-cvs-logs] CVS: scummvm/backends/midi adlib.cpp,1.7,1.8 alsa.cpp,1.1,1.2 coreaudio.cpp,1.1,1.2 null.cpp,1.2,1.3 quicktime.cpp,1.1,1.2 windows.cpp,1.2,1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/simon
In directory sc8-pr-cvs1:/tmp/cvs-serv3198/simon
Modified Files:
midi.cpp midi.h
Log Message:
ripped out obsolete midi streaming code from backends (this may break Alsa/SEQ/Windows/Morphos compile, I tried my best, but you'll have to clean up after me)
Index: midi.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/midi.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- midi.cpp 24 Nov 2002 13:31:38 -0000 1.16
+++ midi.cpp 11 Dec 2002 16:09:55 -0000 1.17
@@ -185,9 +185,9 @@
_midiDriver->property(MidiDriver::PROP_TIMEDIV, _songs[0].ppqn);
- res = _midiDriver->open(MidiDriver::MO_STREAMING);
+ res = _midiDriver->open();
if (res != 0)
- error("MidiPlayer::initializer, got %s", MidiDriver::get_error_name(res));
+ error("MidiPlayer::initializer, got %s", MidiDriver::getErrorName(res));
if (_paused)
_midiDriver->pause (true);
Index: midi.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/midi.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- midi.h 18 Nov 2002 09:08:45 -0000 1.6
+++ midi.h 11 Dec 2002 16:09:56 -0000 1.7
@@ -23,6 +23,7 @@
#define SIMON_MIDI_H
class MidiDriver;
+class MidiStreamer;
class File;
struct MidiEvent;
@@ -67,7 +68,7 @@
byte *sysex_data;
};
- MidiDriver *_midiDriver;
+ MidiStreamer *_midiDriver;
uint _lastDelay;
Song *_currentSong;
Song _songs[8];
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm imuse.cpp,1.95,1.96
- Next message: [Scummvm-cvs-logs] CVS: scummvm/backends/midi adlib.cpp,1.7,1.8 alsa.cpp,1.1,1.2 coreaudio.cpp,1.1,1.2 null.cpp,1.2,1.3 quicktime.cpp,1.1,1.2 windows.cpp,1.2,1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list