From aff76afa8618e1133a458aa44154fd400f9a1087 Mon Sep 17 00:00:00 2001 From: shatty Date: Thu, 25 Dec 2003 10:54:48 +0000 Subject: [PATCH] remove mp3 cruft git-svn-id: file:///srv/svn/repos/haiku/trunk/current@5752 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- .../media/plugins/ogg/OggReaderPlugin.h | 34 ++----------------- 1 file changed, 3 insertions(+), 31 deletions(-) diff --git a/src/add-ons/media/plugins/ogg/OggReaderPlugin.h b/src/add-ons/media/plugins/ogg/OggReaderPlugin.h index 07eab603d9..fb57ff6eb8 100644 --- a/src/add-ons/media/plugins/ogg/OggReaderPlugin.h +++ b/src/add-ons/media/plugins/ogg/OggReaderPlugin.h @@ -2,6 +2,7 @@ #define _OGG_READER_PLUGIN_H #include "ReaderPlugin.h" +#include "ogg/ogg.h" namespace BPrivate { namespace media { @@ -33,39 +34,10 @@ public: BPositionIO *Source() { return fSeekableSource; } -private: - bool ParseFile(); - bool IsMp3File(); - - // checks if the buffer contains a valid ogg stream, length should be - bool IsValidStream(uint8 *buffer, int size); - - int GetFrameLength(void *header); - int GetXingVbrLength(uint8 *header); - int GetFraunhoferVbrLength(uint8 *header); - int GetLameVbrLength(uint8 *header); - int GetId3v2Length(uint8 *header); - int GetInfoCbrLength(uint8 *header); - - bool FindData(); - - void ParseXingVbrHeader(int64 pos); - void ParseFraunhoferVbrHeader(int64 pos); - - int64 XingSeekPoint(float percent); - private: BPositionIO * fSeekableSource; - int64 fFileSize; - - int64 fDataStart; - int64 fDataSize; - - struct xing_vbr_info; - struct fhg_vbr_info; - - xing_vbr_info * fXingVbrInfo; - fhg_vbr_info * fFhgVbrInfo; + ogg_stream_state fOggStreamState; + ogg_sync_state fOggSyncState; };