diff options
| author | Max Horn | 2003-12-19 00:32:47 +0000 |
|---|---|---|
| committer | Max Horn | 2003-12-19 00:32:47 +0000 |
| commit | d21fc5845dc77dd977df22fd9ddc3206bf23a920 (patch) | |
| tree | eed9abe12e4a103c469f875cb6dfebab746c74a4 /sound/vorbis.h | |
| parent | 97ee61963c896e48a0acc5b4169ce96163e76b06 (diff) | |
| download | scummvm-rg350-d21fc5845dc77dd977df22fd9ddc3206bf23a920.tar.gz scummvm-rg350-d21fc5845dc77dd977df22fd9ddc3206bf23a920.tar.bz2 scummvm-rg350-d21fc5845dc77dd977df22fd9ddc3206bf23a920.zip | |
o Moved MP3 and Vorbis input streams to mp3.* resp. vorbis.*
o Added SoundMixer::playInputStream and made some of the other play* methods use it
o Added ProcInputStream stub (not working yet) which one day may allow us to replace the premix code, and allow other fancy stuff
o Remove AudioInputStream::readBuffer default implementation (subclasses should always provide it for max. performance)
o Some minor cleanup
svn-id: r11754
Diffstat (limited to 'sound/vorbis.h')
| -rw-r--r-- | sound/vorbis.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/sound/vorbis.h b/sound/vorbis.h index fcffc1c50d..21d17f3667 100644 --- a/sound/vorbis.h +++ b/sound/vorbis.h @@ -22,12 +22,17 @@ #ifndef SOUND_VORBIS_H #define SOUND_VORBIS_H +#include "stdafx.h" +#include "common/scummsys.h" + +#ifdef USE_VORBIS + #include "sound/audiocd.h" +#include <vorbis/vorbisfile.h> +class AudioInputStream; class File; -#ifdef USE_VORBIS - class VorbisTrackInfo : public DigitalTrackInfo { private: File *_file; @@ -44,6 +49,8 @@ public: void playSfxSound_Vorbis(SoundMixer *mixer, File *file, uint32 size, PlayingSoundHandle *handle); +AudioInputStream *makeVorbisStream(OggVorbis_File *file, int duration); + #endif #endif |