aboutsummaryrefslogtreecommitdiff
path: root/simon/midi.h
diff options
context:
space:
mode:
authorPaweł Kołodziejski2002-09-16 08:22:30 +0000
committerPaweł Kołodziejski2002-09-16 08:22:30 +0000
commit29811c5fad6425519d24d8f2873482538410de7a (patch)
treead3be009f94ea9dcf68fa40f30913c1438712438 /simon/midi.h
parent02f9056b4a4f124e59c8172f1c70773d9482e1c6 (diff)
downloadscummvm-rg350-29811c5fad6425519d24d8f2873482538410de7a.tar.gz
scummvm-rg350-29811c5fad6425519d24d8f2873482538410de7a.tar.bz2
scummvm-rg350-29811c5fad6425519d24d8f2873482538410de7a.zip
simon also use class File
svn-id: r4948
Diffstat (limited to 'simon/midi.h')
-rw-r--r--simon/midi.h10
1 files changed, 4 insertions, 6 deletions
diff --git a/simon/midi.h b/simon/midi.h
index 6ef61a866c..f169541f1b 100644
--- a/simon/midi.h
+++ b/simon/midi.h
@@ -23,12 +23,13 @@
#define SIMON_MIDI_H
class MidiDriver;
+class File;
struct MidiEvent;
class MidiPlayer {
public:
- void read_all_songs(FILE *in);
- void read_all_songs_old(FILE *in);
+ void read_all_songs(File *in);
+ void read_all_songs_old(File *in);
void initialize();
void shutdown();
void play();
@@ -63,7 +64,7 @@ private:
MidiDriver *_md;
- FILE *_input;
+ File *_input;
uint _midi_var10, _midi_5;
bool _midi_var9;
@@ -91,9 +92,6 @@ private:
void read_from_file(void *dst, uint size);
void read_one_song(Song *s);
- byte read_byte_from_file();
- uint32 read_uint32_from_file();
- uint16 read_uint16_from_file();
static uint32 track_read_gamma(Track *t);
static byte track_read_byte(Track *t);