From b61f11a72763c41448f8be69e84887a98f894b49 Mon Sep 17 00:00:00 2001 From: Chris Double Date: Fri, 25 Sep 2009 15:53:32 +1200 Subject: [PATCH] Tidy up struct names for ogg vocabs --- extra/ogg/ogg.factor | 138 ++++++++++++++++----------------- extra/ogg/vorbis/vorbis.factor | 126 +++++++++++++++--------------- 2 files changed, 132 insertions(+), 132 deletions(-) diff --git a/extra/ogg/ogg.factor b/extra/ogg/ogg.factor index 62c3d1d6e9..6cd6964721 100644 --- a/extra/ogg/ogg.factor +++ b/extra/ogg/ogg.factor @@ -23,20 +23,20 @@ IN: ogg LIBRARY: ogg -STRUCT: oggpack_buffer +STRUCT: oggpack-buffer { endbyte long } { endbit int } { buffer uchar* } { ptr uchar* } { storage long } ; -STRUCT: ogg_page +STRUCT: ogg-page { header uchar* } { header_len long } { body uchar* } { body_len long } ; -STRUCT: ogg_stream_state +STRUCT: ogg-stream-state { body_data uchar* } { body_storage long } { body_fill long } @@ -56,7 +56,7 @@ STRUCT: ogg_stream_state { packetno longlong } { granulepos longlong } ; -STRUCT: ogg_packet +STRUCT: ogg-packet { packet uchar* } { bytes long } { b_o_s long } @@ -64,7 +64,7 @@ STRUCT: ogg_packet { granulepos longlong } { packetno longlong } ; -STRUCT: ogg_sync_state +STRUCT: ogg-sync-state { data uchar* } { storage int } { fill int } @@ -73,69 +73,69 @@ STRUCT: ogg_sync_state { headerbytes int } { bodybytes int } ; -FUNCTION: void oggpack_writeinit ( oggpack_buffer* b ) ; -FUNCTION: void oggpack_writetrunc ( oggpack_buffer* b, long bits ) ; -FUNCTION: void oggpack_writealign ( oggpack_buffer* b) ; -FUNCTION: void oggpack_writecopy ( oggpack_buffer* b, void* source, long bits ) ; -FUNCTION: void oggpack_reset ( oggpack_buffer* b ) ; -FUNCTION: void oggpack_writeclear ( oggpack_buffer* b ) ; -FUNCTION: void oggpack_readinit ( oggpack_buffer* b, uchar* buf, int bytes ) ; -FUNCTION: void oggpack_write ( oggpack_buffer* b, ulong value, int bits ) ; -FUNCTION: long oggpack_look ( oggpack_buffer* b, int bits ) ; -FUNCTION: long oggpack_look1 ( oggpack_buffer* b ) ; -FUNCTION: void oggpack_adv ( oggpack_buffer* b, int bits ) ; -FUNCTION: void oggpack_adv1 ( oggpack_buffer* b ) ; -FUNCTION: long oggpack_read ( oggpack_buffer* b, int bits ) ; -FUNCTION: long oggpack_read1 ( oggpack_buffer* b ) ; -FUNCTION: long oggpack_bytes ( oggpack_buffer* b ) ; -FUNCTION: long oggpack_bits ( oggpack_buffer* b ) ; -FUNCTION: uchar* oggpack_get_buffer ( oggpack_buffer* b ) ; -FUNCTION: void oggpackB_writeinit ( oggpack_buffer* b ) ; -FUNCTION: void oggpackB_writetrunc ( oggpack_buffer* b, long bits ) ; -FUNCTION: void oggpackB_writealign ( oggpack_buffer* b ) ; -FUNCTION: void oggpackB_writecopy ( oggpack_buffer* b, void* source, long bits ) ; -FUNCTION: void oggpackB_reset ( oggpack_buffer* b ) ; -FUNCTION: void oggpackB_writeclear ( oggpack_buffer* b ) ; -FUNCTION: void oggpackB_readinit ( oggpack_buffer* b, uchar* buf, int bytes ) ; -FUNCTION: void oggpackB_write ( oggpack_buffer* b, ulong value, int bits ) ; -FUNCTION: long oggpackB_look ( oggpack_buffer* b, int bits ) ; -FUNCTION: long oggpackB_look1 ( oggpack_buffer* b ) ; -FUNCTION: void oggpackB_adv ( oggpack_buffer* b, int bits ) ; -FUNCTION: void oggpackB_adv1 ( oggpack_buffer* b ) ; -FUNCTION: long oggpackB_read ( oggpack_buffer* b, int bits ) ; -FUNCTION: long oggpackB_read1 ( oggpack_buffer* b ) ; -FUNCTION: long oggpackB_bytes ( oggpack_buffer* b ) ; -FUNCTION: long oggpackB_bits ( oggpack_buffer* b ) ; -FUNCTION: uchar* oggpackB_get_buffer ( oggpack_buffer* b ) ; -FUNCTION: int ogg_stream_packetin ( ogg_stream_state* os, ogg_packet* op ) ; -FUNCTION: int ogg_stream_pageout ( ogg_stream_state* os, ogg_page* og ) ; -FUNCTION: int ogg_stream_flush ( ogg_stream_state* os, ogg_page* og ) ; -FUNCTION: int ogg_sync_init ( ogg_sync_state* oy ) ; -FUNCTION: int ogg_sync_clear ( ogg_sync_state* oy ) ; -FUNCTION: int ogg_sync_reset ( ogg_sync_state* oy ) ; -FUNCTION: int ogg_sync_destroy ( ogg_sync_state* oy ) ; +FUNCTION: void oggpack_writeinit ( oggpack-buffer* b ) ; +FUNCTION: void oggpack_writetrunc ( oggpack-buffer* b, long bits ) ; +FUNCTION: void oggpack_writealign ( oggpack-buffer* b) ; +FUNCTION: void oggpack_writecopy ( oggpack-buffer* b, void* source, long bits ) ; +FUNCTION: void oggpack_reset ( oggpack-buffer* b ) ; +FUNCTION: void oggpack_writeclear ( oggpack-buffer* b ) ; +FUNCTION: void oggpack_readinit ( oggpack-buffer* b, uchar* buf, int bytes ) ; +FUNCTION: void oggpack_write ( oggpack-buffer* b, ulong value, int bits ) ; +FUNCTION: long oggpack_look ( oggpack-buffer* b, int bits ) ; +FUNCTION: long oggpack_look1 ( oggpack-buffer* b ) ; +FUNCTION: void oggpack_adv ( oggpack-buffer* b, int bits ) ; +FUNCTION: void oggpack_adv1 ( oggpack-buffer* b ) ; +FUNCTION: long oggpack_read ( oggpack-buffer* b, int bits ) ; +FUNCTION: long oggpack_read1 ( oggpack-buffer* b ) ; +FUNCTION: long oggpack_bytes ( oggpack-buffer* b ) ; +FUNCTION: long oggpack_bits ( oggpack-buffer* b ) ; +FUNCTION: uchar* oggpack_get_buffer ( oggpack-buffer* b ) ; +FUNCTION: void oggpackB_writeinit ( oggpack-buffer* b ) ; +FUNCTION: void oggpackB_writetrunc ( oggpack-buffer* b, long bits ) ; +FUNCTION: void oggpackB_writealign ( oggpack-buffer* b ) ; +FUNCTION: void oggpackB_writecopy ( oggpack-buffer* b, void* source, long bits ) ; +FUNCTION: void oggpackB_reset ( oggpack-buffer* b ) ; +FUNCTION: void oggpackB_writeclear ( oggpack-buffer* b ) ; +FUNCTION: void oggpackB_readinit ( oggpack-buffer* b, uchar* buf, int bytes ) ; +FUNCTION: void oggpackB_write ( oggpack-buffer* b, ulong value, int bits ) ; +FUNCTION: long oggpackB_look ( oggpack-buffer* b, int bits ) ; +FUNCTION: long oggpackB_look1 ( oggpack-buffer* b ) ; +FUNCTION: void oggpackB_adv ( oggpack-buffer* b, int bits ) ; +FUNCTION: void oggpackB_adv1 ( oggpack-buffer* b ) ; +FUNCTION: long oggpackB_read ( oggpack-buffer* b, int bits ) ; +FUNCTION: long oggpackB_read1 ( oggpack-buffer* b ) ; +FUNCTION: long oggpackB_bytes ( oggpack-buffer* b ) ; +FUNCTION: long oggpackB_bits ( oggpack-buffer* b ) ; +FUNCTION: uchar* oggpackB_get_buffer ( oggpack-buffer* b ) ; +FUNCTION: int ogg_stream_packetin ( ogg-stream-state* os, ogg-packet* op ) ; +FUNCTION: int ogg_stream_pageout ( ogg-stream-state* os, ogg-page* og ) ; +FUNCTION: int ogg_stream_flush ( ogg-stream-state* os, ogg-page* og ) ; +FUNCTION: int ogg_sync_init ( ogg-sync-state* oy ) ; +FUNCTION: int ogg_sync_clear ( ogg-sync-state* oy ) ; +FUNCTION: int ogg_sync_reset ( ogg-sync-state* oy ) ; +FUNCTION: int ogg_sync_destroy ( ogg-sync-state* oy ) ; -FUNCTION: void* ogg_sync_buffer ( ogg_sync_state* oy, long size ) ; -FUNCTION: int ogg_sync_wrote ( ogg_sync_state* oy, long bytes ) ; -FUNCTION: long ogg_sync_pageseek ( ogg_sync_state* oy, ogg_page* og ) ; -FUNCTION: int ogg_sync_pageout ( ogg_sync_state* oy, ogg_page* og ) ; -FUNCTION: int ogg_stream_pagein ( ogg_stream_state* os, ogg_page* og ) ; -FUNCTION: int ogg_stream_packetout ( ogg_stream_state* os, ogg_packet* op ) ; -FUNCTION: int ogg_stream_packetpeek ( ogg_stream_state* os, ogg_packet* op ) ; -FUNCTION: int ogg_stream_init (ogg_stream_state* os, int serialno ) ; -FUNCTION: int ogg_stream_clear ( ogg_stream_state* os ) ; -FUNCTION: int ogg_stream_reset ( ogg_stream_state* os ) ; -FUNCTION: int ogg_stream_reset_serialno ( ogg_stream_state* os, int serialno ) ; -FUNCTION: int ogg_stream_destroy ( ogg_stream_state* os ) ; -FUNCTION: int ogg_stream_eos ( ogg_stream_state* os ) ; -FUNCTION: void ogg_page_checksum_set ( ogg_page* og ) ; -FUNCTION: int ogg_page_version ( ogg_page* og ) ; -FUNCTION: int ogg_page_continued ( ogg_page* og ) ; -FUNCTION: int ogg_page_bos ( ogg_page* og ) ; -FUNCTION: int ogg_page_eos ( ogg_page* og ) ; -FUNCTION: longlong ogg_page_granulepos ( ogg_page* og ) ; -FUNCTION: int ogg_page_serialno ( ogg_page* og ) ; -FUNCTION: long ogg_page_pageno ( ogg_page* og ) ; -FUNCTION: int ogg_page_packets ( ogg_page* og ) ; -FUNCTION: void ogg_packet_clear ( ogg_packet* op ) ; +FUNCTION: void* ogg_sync_buffer ( ogg-sync-state* oy, long size ) ; +FUNCTION: int ogg_sync_wrote ( ogg-sync-state* oy, long bytes ) ; +FUNCTION: long ogg_sync_pageseek ( ogg-sync-state* oy, ogg-page* og ) ; +FUNCTION: int ogg_sync_pageout ( ogg-sync-state* oy, ogg-page* og ) ; +FUNCTION: int ogg_stream_pagein ( ogg-stream-state* os, ogg-page* og ) ; +FUNCTION: int ogg_stream_packetout ( ogg-stream-state* os, ogg-packet* op ) ; +FUNCTION: int ogg_stream_packetpeek ( ogg-stream-state* os, ogg-packet* op ) ; +FUNCTION: int ogg_stream_init (ogg-stream-state* os, int serialno ) ; +FUNCTION: int ogg_stream_clear ( ogg-stream-state* os ) ; +FUNCTION: int ogg_stream_reset ( ogg-stream-state* os ) ; +FUNCTION: int ogg_stream_reset_serialno ( ogg-stream-state* os, int serialno ) ; +FUNCTION: int ogg_stream_destroy ( ogg-stream-state* os ) ; +FUNCTION: int ogg_stream_eos ( ogg-stream-state* os ) ; +FUNCTION: void ogg_page_checksum_set ( ogg-page* og ) ; +FUNCTION: int ogg_page_version ( ogg-page* og ) ; +FUNCTION: int ogg_page_continued ( ogg-page* og ) ; +FUNCTION: int ogg_page_bos ( ogg-page* og ) ; +FUNCTION: int ogg_page_eos ( ogg-page* og ) ; +FUNCTION: longlong ogg_page_granulepos ( ogg-page* og ) ; +FUNCTION: int ogg_page_serialno ( ogg-page* og ) ; +FUNCTION: long ogg_page_pageno ( ogg-page* og ) ; +FUNCTION: int ogg_page_packets ( ogg-page* og ) ; +FUNCTION: void ogg_packet_clear ( ogg-packet* op ) ; diff --git a/extra/ogg/vorbis/vorbis.factor b/extra/ogg/vorbis/vorbis.factor index e11f309c91..8cf79fecaf 100644 --- a/extra/ogg/vorbis/vorbis.factor +++ b/extra/ogg/vorbis/vorbis.factor @@ -24,7 +24,7 @@ IN: ogg.vorbis LIBRARY: vorbis -STRUCT: vorbis_info +STRUCT: vorbis-info { version int } { channels int } { rate long } @@ -35,9 +35,9 @@ STRUCT: vorbis_info { codec_setup void* } ; -STRUCT: vorbis_dsp_state +STRUCT: vorbis-dsp-state { analysisp int } - { vi vorbis_info* } + { vi vorbis-info* } { pcm float** } { pcmret float** } { pcm_storage int } @@ -58,14 +58,14 @@ STRUCT: vorbis_dsp_state { backend_state void* } ; -STRUCT: alloc_chain +STRUCT: alloc-chain { ptr void* } { next void* } ; -STRUCT: vorbis_block +STRUCT: vorbis-block { pcm float** } - { opb oggpack_buffer } + { opb oggpack-buffer } { lW long } { W long } { nW long } @@ -74,12 +74,12 @@ STRUCT: vorbis_block { eofflag int } { granulepos longlong } { sequence longlong } - { vd vorbis_dsp_state* } + { vd vorbis-dsp-state* } { localstore void* } { localtop long } { localalloc long } { totaluse long } - { reap alloc_chain* } + { reap alloc-chain* } { glue_bits long } { time_bits long } { floor_bits long } @@ -87,65 +87,65 @@ STRUCT: vorbis_block { internal void* } ; -STRUCT: vorbis_comment +STRUCT: vorbis-comment { usercomments char** } { comment_lengths int* } { comments int } { vendor char* } ; -FUNCTION: void vorbis_info_init ( vorbis_info* vi ) ; -FUNCTION: void vorbis_info_clear ( vorbis_info* vi ) ; -FUNCTION: int vorbis_info_blocksize ( vorbis_info* vi, int zo ) ; -FUNCTION: void vorbis_comment_init ( vorbis_comment* vc ) ; -FUNCTION: void vorbis_comment_add ( vorbis_comment* vc, char* comment ) ; -FUNCTION: void vorbis_comment_add_tag ( vorbis_comment* vc, char* tag, char* contents ) ; -FUNCTION: char* vorbis_comment_query ( vorbis_comment* vc, char* tag, int count ) ; -FUNCTION: int vorbis_comment_query_count ( vorbis_comment* vc, char* tag ) ; -FUNCTION: void vorbis_comment_clear ( vorbis_comment* vc ) ; -FUNCTION: int vorbis_block_init ( vorbis_dsp_state* v, vorbis_block* vb ) ; -FUNCTION: int vorbis_block_clear ( vorbis_block* vb ) ; -FUNCTION: void vorbis_dsp_clear ( vorbis_dsp_state* v ) ; -FUNCTION: double vorbis_granule_time ( vorbis_dsp_state* v, longlong granulepos ) ; -FUNCTION: int vorbis_analysis_init ( vorbis_dsp_state* v, vorbis_info* vi ) ; -FUNCTION: int vorbis_commentheader_out ( vorbis_comment* vc, ogg_packet* op ) ; -FUNCTION: int vorbis_analysis_headerout ( vorbis_dsp_state* v, - vorbis_comment* vc, - ogg_packet* op, - ogg_packet* op_comm, - ogg_packet* op_code ) ; -FUNCTION: float** vorbis_analysis_buffer ( vorbis_dsp_state* v, int vals ) ; -FUNCTION: int vorbis_analysis_wrote ( vorbis_dsp_state* v, int vals ) ; -FUNCTION: int vorbis_analysis_blockout ( vorbis_dsp_state* v, vorbis_block* vb ) ; -FUNCTION: int vorbis_analysis ( vorbis_block* vb, ogg_packet* op ) ; -FUNCTION: int vorbis_bitrate_addblock ( vorbis_block* vb ) ; -FUNCTION: int vorbis_bitrate_flushpacket ( vorbis_dsp_state* vd, - ogg_packet* op ) ; -FUNCTION: int vorbis_synthesis_headerin ( vorbis_info* vi, vorbis_comment* vc, - ogg_packet* op ) ; -FUNCTION: int vorbis_synthesis_init ( vorbis_dsp_state* v, vorbis_info* vi ) ; -FUNCTION: int vorbis_synthesis_restart ( vorbis_dsp_state* v ) ; -FUNCTION: int vorbis_synthesis ( vorbis_block* vb, ogg_packet* op ) ; -FUNCTION: int vorbis_synthesis_trackonly ( vorbis_block* vb, ogg_packet* op ) ; -FUNCTION: int vorbis_synthesis_blockin ( vorbis_dsp_state* v, vorbis_block* vb ) ; -FUNCTION: int vorbis_synthesis_pcmout ( vorbis_dsp_state* v, float*** pcm ) ; -FUNCTION: int vorbis_synthesis_lapout ( vorbis_dsp_state* v, float*** pcm ) ; -FUNCTION: int vorbis_synthesis_read ( vorbis_dsp_state* v, int samples ) ; -FUNCTION: long vorbis_packet_blocksize ( vorbis_info* vi, ogg_packet* op ) ; -FUNCTION: int vorbis_synthesis_halfrate ( vorbis_info* v, int flag ) ; -FUNCTION: int vorbis_synthesis_halfrate_p ( vorbis_info* v ) ; +FUNCTION: void vorbis_info_init ( vorbis-info* vi ) ; +FUNCTION: void vorbis_info_clear ( vorbis-info* vi ) ; +FUNCTION: int vorbis_info_blocksize ( vorbis-info* vi, int zo ) ; +FUNCTION: void vorbis_comment_init ( vorbis-comment* vc ) ; +FUNCTION: void vorbis_comment_add ( vorbis-comment* vc, char* comment ) ; +FUNCTION: void vorbis_comment_add_tag ( vorbis-comment* vc, char* tag, char* contents ) ; +FUNCTION: char* vorbis_comment_query ( vorbis-comment* vc, char* tag, int count ) ; +FUNCTION: int vorbis_comment_query_count ( vorbis-comment* vc, char* tag ) ; +FUNCTION: void vorbis_comment_clear ( vorbis-comment* vc ) ; +FUNCTION: int vorbis_block_init ( vorbis-dsp-state* v, vorbis-block* vb ) ; +FUNCTION: int vorbis_block_clear ( vorbis-block* vb ) ; +FUNCTION: void vorbis_dsp_clear ( vorbis-dsp-state* v ) ; +FUNCTION: double vorbis_granule_time ( vorbis-dsp-state* v, longlong granulepos ) ; +FUNCTION: int vorbis_analysis_init ( vorbis-dsp-state* v, vorbis-info* vi ) ; +FUNCTION: int vorbis_commentheader_out ( vorbis-comment* vc, ogg-packet* op ) ; +FUNCTION: int vorbis_analysis_headerout ( vorbis-dsp-state* v, + vorbis-comment* vc, + ogg-packet* op, + ogg-packet* op_comm, + ogg-packet* op_code ) ; +FUNCTION: float** vorbis_analysis_buffer ( vorbis-dsp-state* v, int vals ) ; +FUNCTION: int vorbis_analysis_wrote ( vorbis-dsp-state* v, int vals ) ; +FUNCTION: int vorbis_analysis_blockout ( vorbis-dsp-state* v, vorbis-block* vb ) ; +FUNCTION: int vorbis_analysis ( vorbis-block* vb, ogg-packet* op ) ; +FUNCTION: int vorbis_bitrate_addblock ( vorbis-block* vb ) ; +FUNCTION: int vorbis_bitrate_flushpacket ( vorbis-dsp-state* vd, + ogg-packet* op ) ; +FUNCTION: int vorbis_synthesis_headerin ( vorbis-info* vi, vorbis-comment* vc, + ogg-packet* op ) ; +FUNCTION: int vorbis_synthesis_init ( vorbis-dsp-state* v, vorbis-info* vi ) ; +FUNCTION: int vorbis_synthesis_restart ( vorbis-dsp-state* v ) ; +FUNCTION: int vorbis_synthesis ( vorbis-block* vb, ogg-packet* op ) ; +FUNCTION: int vorbis_synthesis_trackonly ( vorbis-block* vb, ogg-packet* op ) ; +FUNCTION: int vorbis_synthesis_blockin ( vorbis-dsp-state* v, vorbis-block* vb ) ; +FUNCTION: int vorbis_synthesis_pcmout ( vorbis-dsp-state* v, float*** pcm ) ; +FUNCTION: int vorbis_synthesis_lapout ( vorbis-dsp-state* v, float*** pcm ) ; +FUNCTION: int vorbis_synthesis_read ( vorbis-dsp-state* v, int samples ) ; +FUNCTION: long vorbis_packet_blocksize ( vorbis-info* vi, ogg-packet* op ) ; +FUNCTION: int vorbis_synthesis_halfrate ( vorbis-info* v, int flag ) ; +FUNCTION: int vorbis_synthesis_halfrate_p ( vorbis-info* v ) ; -: OV_FALSE ( -- number ) -1 ; inline -: OV_EOF ( -- number ) -2 ; inline -: OV_HOLE ( -- number ) -3 ; inline -: OV_EREAD ( -- number ) -128 ; inline -: OV_EFAULT ( -- number ) -129 ; inline -: OV_EIMPL ( -- number ) -130 ; inline -: OV_EINVAL ( -- number ) -131 ; inline -: OV_ENOTVORBIS ( -- number ) -132 ; inline -: OV_EBADHEADER ( -- number ) -133 ; inline -: OV_EVERSION ( -- number ) -134 ; inline -: OV_ENOTAUDIO ( -- number ) -135 ; inline -: OV_EBADPACKET ( -- number ) -136 ; inline -: OV_EBADLINK ( -- number ) -137 ; inline -: OV_ENOSEEK ( -- number ) -138 ; inline +CONSTANT: OV_FALSE -1 +CONSTANT: OV_EOF -2 +CONSTANT: OV_HOLE -3 +CONSTANT: OV_EREAD -128 +CONSTANT: OV_EFAULT -129 +CONSTANT: OV_EIMPL -130 +CONSTANT: OV_EINVAL -131 +CONSTANT: OV_ENOTVORBIS -132 +CONSTANT: OV_EBADHEADER -133 +CONSTANT: OV_EVERSION -134 +CONSTANT: OV_ENOTAUDIO -135 +CONSTANT: OV_EBADPACKET -136 +CONSTANT: OV_EBADLINK -137 +CONSTANT: OV_ENOSEEK -138