diff options
| author | Travis Howell | 2002-10-27 11:41:08 +0000 |
|---|---|---|
| committer | Travis Howell | 2002-10-27 11:41:08 +0000 |
| commit | a0734ef3f987d1716440e81b5e571c00d3ed891c (patch) | |
| tree | c7ec6dba77324497b485c5467a88c37ed4380c27 /sound/mixer.h | |
| parent | d5473c6f5a7752503bbfc2be46c1ce3fd73d03f3 (diff) | |
| download | scummvm-rg350-a0734ef3f987d1716440e81b5e571c00d3ed891c.tar.gz scummvm-rg350-a0734ef3f987d1716440e81b5e571c00d3ed891c.tar.bz2 scummvm-rg350-a0734ef3f987d1716440e81b5e571c00d3ed891c.zip | |
Add monster.sog support, patch #629362
Enable ogg support by default in mingw builds and link in ogg lib
svn-id: r5333
Diffstat (limited to 'sound/mixer.h')
| -rw-r--r-- | sound/mixer.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/mixer.h b/sound/mixer.h index 1fecef27a2..be763c2228 100644 --- a/sound/mixer.h +++ b/sound/mixer.h @@ -146,11 +146,11 @@ private: class ChannelVorbis : public Channel { SoundMixer * _mixer; OggVorbis_File * _ov_file; - double _end_pos; - bool _eof_flag; + int _end_pos; + bool _eof_flag, _is_cd_track; public: - ChannelVorbis(SoundMixer * mixer, OggVorbis_File * ov_file, double duration); + ChannelVorbis(SoundMixer * mixer, OggVorbis_File * ov_file, int duration, bool is_cd_track); void mix(int16 * data, uint len); void realDestroy(); @@ -212,7 +212,7 @@ public: int playMP3CDTrack(PlayingSoundHandle * handle, File * file, mad_timer_t duration); #endif #ifdef USE_VORBIS - int playVorbisCDTrack(PlayingSoundHandle * handle, OggVorbis_File * ov_file, double duration); + int playVorbis(PlayingSoundHandle * handle, OggVorbis_File * ov_file, int duration, bool is_cd_track); #endif /* Premix procedure, useful when using fmopl adlib */ |