more MAD MP3 / Ogg Vorbis cleanup: try not to expose anything about the libs used for MP3/Vorbis support -> this eases changing the implementations, and reduces header dependencies (and thus compile time) :-)

svn-id: r12097

1 files changed, 2 insertions, 17 deletions

diff --git a/sound/vorbis.h b/sound/vorbis.h
index 8b4fd0d11f..3241f884ae 100644
--- a/sound/vorbis.h
+++ b/sound/vorbis.h
@@ -27,27 +27,12 @@
 
 #ifdef USE_VORBIS
 
-#include "sound/audiocd.h"
-#include <vorbis/vorbisfile.h>
-
 class AudioInputStream;
+class DigitalTrackInfo;
 class File;
 
-class VorbisTrackInfo : public DigitalTrackInfo {
-private:
-	File *_file;
-	OggVorbis_File _ov_file;
-	bool _error_flag;
-
-public:
-	VorbisTrackInfo(File *file);
-	~VorbisTrackInfo();
-	bool error() { return _error_flag; }
-	void play(SoundMixer *mixer, PlayingSoundHandle *handle, int startFrame, int duration);
-};
-
+DigitalTrackInfo *makeVorbisTrackInfo(File *file);
 
-AudioInputStream *makeVorbisStream(OggVorbis_File *file, int duration);
 AudioInputStream *makeVorbisStream(File *file, uint32 size);
 
 #endif