--- a/misc/libtremor/tremor/ivorbisfile.h Sun Oct 28 03:48:37 2012 +0100
+++ b/misc/libtremor/tremor/ivorbisfile.h Sun Oct 28 04:00:07 2012 +0100
@@ -6,7 +6,7 @@
* GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
* IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
* *
- * THE OggVorbis 'TREMOR' SOURCE CODE IS (C) COPYRIGHT 1994-2003 *
+ * THE OggVorbis 'TREMOR' SOURCE CODE IS (C) COPYRIGHT 1994-2002 *
* BY THE Xiph.Org FOUNDATION http://www.xiph.org/ *
* *
********************************************************************
@@ -26,6 +26,7 @@
#include <stdio.h>
#include "ivorbiscodec.h"
+#define CHUNKSIZE 1024
/* The function prototypes for the callbacks are basically the same as for
* the stdio functions fread, fseek, fclose, ftell.
* The one difference is that the FILE * arguments have been replaced with
@@ -43,6 +44,12 @@
long (*tell_func) (void *datasource);
} ov_callbacks;
+#define NOTOPEN 0
+#define PARTOPEN 1
+#define OPENED 2
+#define STREAMSET 3
+#define INITSET 4
+
typedef struct OggVorbis_File {
void *datasource; /* Pointer to a FILE *, etc. */
int seekable;
@@ -57,8 +64,8 @@
ogg_int64_t *dataoffsets;
ogg_uint32_t *serialnos;
ogg_int64_t *pcmlengths;
- vorbis_info vi;
- vorbis_comment vc;
+ vorbis_info *vi;
+ vorbis_comment *vc;
/* Decoding working state local storage */
ogg_int64_t pcm_offset;
@@ -71,7 +78,8 @@
ogg_stream_state *os; /* take physical pages, weld into a logical
stream of packets */
- vorbis_dsp_state *vd; /* central working state for the packet->PCM decoder */
+ vorbis_dsp_state vd; /* central working state for the packet->PCM decoder */
+ vorbis_block vb; /* local working space for packet->PCM decode */
ov_callbacks callbacks;
@@ -110,7 +118,7 @@
extern vorbis_info *ov_info(OggVorbis_File *vf,int link);
extern vorbis_comment *ov_comment(OggVorbis_File *vf,int link);
-extern long ov_read(OggVorbis_File *vf,void *buffer,int length,
+extern long ov_read(OggVorbis_File *vf,char *buffer,int length,
int *bitstream);
#ifdef __cplusplus