diff options
| author | Paweł Kołodziejski | 2002-09-02 07:53:43 +0000 |
|---|---|---|
| committer | Paweł Kołodziejski | 2002-09-02 07:53:43 +0000 |
| commit | ca03c9b5fc58b6beb5dbc6c1307464ef9e2c9f45 (patch) | |
| tree | 539f84d8edc7002ccb01278aa06a174ab53bda3d /sound/mixer.h | |
| parent | 97ef7c2a34c4077d6d046f0aabce7e1dde04e092 (diff) | |
| download | scummvm-rg350-ca03c9b5fc58b6beb5dbc6c1307464ef9e2c9f45.tar.gz scummvm-rg350-ca03c9b5fc58b6beb5dbc6c1307464ef9e2c9f45.tar.bz2 scummvm-rg350-ca03c9b5fc58b6beb5dbc6c1307464ef9e2c9f45.zip | |
changed file io in sounds to class File
svn-id: r4896
Diffstat (limited to 'sound/mixer.h')
| -rw-r--r-- | sound/mixer.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sound/mixer.h b/sound/mixer.h index 19c0414fcd..64ab0c7070 100644 --- a/sound/mixer.h +++ b/sound/mixer.h @@ -31,6 +31,8 @@ typedef uint32 PlayingSoundHandle; +class File; + class SoundMixer { private: class Channel { @@ -112,11 +114,11 @@ private: uint32 _size; uint32 _bufferSize; mad_timer_t _duration; - FILE * _file; + File * _file; bool _initialized; public: - ChannelMP3CDMusic(SoundMixer * mixer, FILE * file, mad_timer_t duration); + ChannelMP3CDMusic(SoundMixer * mixer, File * file, mad_timer_t duration); void mix(int16 * data, uint len); void realDestroy(); bool soundFinished(); @@ -170,7 +172,7 @@ public: byte flags); #ifdef COMPRESSED_SOUND_FILE int playMP3(PlayingSoundHandle * handle, void * sound, uint32 size, byte flags); - int playMP3CDTrack(PlayingSoundHandle * handle, FILE * file, mad_timer_t duration); + int playMP3CDTrack(PlayingSoundHandle * handle, File * file, mad_timer_t duration); #endif /* Premix procedure, useful when using fmopl adlib */ |