diff options
| author | Tim Terriberry <tterribe@xiph.org> | 2010-08-31 19:10:31 +0000 |
|---|---|---|
| committer | Tim Terriberry <tterribe@xiph.org> | 2010-08-31 19:10:31 +0000 |
| commit | 8886a2805fc107489912f8c500db3373e04a316d (patch) | |
| tree | 42854e1ade8a2b627c52f2482bf27793054c0523 /ivorbisfile.h | |
| parent | 7125eb6381e57436db1c5a2d7c4e52091c37e95c (diff) | |
| download | tremor-8886a2805fc107489912f8c500db3373e04a316d.tar.gz | |
Convert Tremor to use libogg instead of its own internal libogg2.
This makes it easier to use Tremor as a drop-in replacement for libvorbis and
reduces code size and overhead for those who don't want to use its built-in
Ogg demuxer.
This commit also backports all of the changes that have accumulated in
libvorbis's vorbisfile implementation, with the exception of halfrate decoding
and cross-lapped seeking.
Those should not be too hard to add if someone really wants them.
git-svn-id: https://svn.xiph.org/trunk/Tremor@17375 0101bb08-14d6-0310-b084-bc0e0c8e3800
Diffstat (limited to 'ivorbisfile.h')
| -rw-r--r-- | ivorbisfile.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ivorbisfile.h b/ivorbisfile.h index dd77378..fda6205 100644 --- a/ivorbisfile.h +++ b/ivorbisfile.h @@ -55,7 +55,7 @@ typedef struct OggVorbis_File { int seekable; ogg_int64_t offset; ogg_int64_t end; - ogg_sync_state *oy; + ogg_sync_state oy; /* If the FILE handle isn't seekable (eg, a pipe), only the current stream appears */ @@ -76,7 +76,7 @@ typedef struct OggVorbis_File { ogg_int64_t bittrack; ogg_int64_t samptrack; - ogg_stream_state *os; /* take physical pages, weld into a logical + 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_block vb; /* local working space for packet->PCM decode */ @@ -86,13 +86,13 @@ typedef struct OggVorbis_File { } OggVorbis_File; extern int ov_clear(OggVorbis_File *vf); -extern int ov_open(FILE *f,OggVorbis_File *vf,char *initial,long ibytes); +extern int ov_open(FILE *f,OggVorbis_File *vf,const char *initial,long ibytes); extern int ov_open_callbacks(void *datasource, OggVorbis_File *vf, - char *initial, long ibytes, ov_callbacks callbacks); + const char *initial, long ibytes, ov_callbacks callbacks); -extern int ov_test(FILE *f,OggVorbis_File *vf,char *initial,long ibytes); +extern int ov_test(FILE *f,OggVorbis_File *vf,const char *initial,long ibytes); extern int ov_test_callbacks(void *datasource, OggVorbis_File *vf, - char *initial, long ibytes, ov_callbacks callbacks); + const char *initial, long ibytes, ov_callbacks callbacks); extern int ov_test_open(OggVorbis_File *vf); extern long ov_bitrate(OggVorbis_File *vf,int i); |