|
12 | 12 | #endif |
13 | 13 |
|
14 | 14 | typedef void (*vFp_t)(void*); |
15 | | -typedef void (*vFpp_t)(void*, void*); |
16 | | -typedef void (*vFppp_t)(void*, void*, void*); |
17 | 15 | typedef int32_t (*iFp_t)(void*); |
| 16 | +typedef void (*vFpp_t)(void*, void*); |
18 | 17 | typedef int32_t (*iFpi_t)(void*, int32_t); |
19 | 18 | typedef int32_t (*iFpp_t)(void*, void*); |
20 | | -typedef int32_t (*iFppp_t)(void*, void*, void*); |
21 | | -typedef int32_t (*iFppppp_t)(void*, void*, void*, void*, void*); |
22 | | -typedef void* (*pFv_t)(void); |
23 | 19 | typedef void* (*pFpi_t)(void*, int32_t); |
| 20 | +typedef void (*vFppp_t)(void*, void*, void*); |
| 21 | +typedef int32_t (*iFppp_t)(void*, void*, void*); |
24 | 22 | typedef void* (*pFppi_t)(void*, void*, int32_t); |
| 23 | +typedef int32_t (*iFppppp_t)(void*, void*, void*, void*, void*); |
25 | 24 |
|
26 | 25 | #define SUPER() ADDED_FUNCTIONS() \ |
| 26 | + GO(vorbis_comment_clear, vFp_t) \ |
| 27 | + GO(vorbis_comment_init, vFp_t) \ |
| 28 | + GO(vorbis_dsp_clear, vFp_t) \ |
| 29 | + GO(vorbis_info_clear, vFp_t) \ |
| 30 | + GO(vorbis_info_init, vFp_t) \ |
| 31 | + GO(vorbis_bitrate_addblock, iFp_t) \ |
| 32 | + GO(vorbis_block_clear, iFp_t) \ |
| 33 | + GO(vorbis_synthesis_halfrate_p, iFp_t) \ |
| 34 | + GO(vorbis_synthesis_idheader, iFp_t) \ |
| 35 | + GO(vorbis_synthesis_restart, iFp_t) \ |
| 36 | + GO(vorbis_comment_add, vFpp_t) \ |
| 37 | + GO(vorbis_analysis_wrote, iFpi_t) \ |
| 38 | + GO(vorbis_info_blocksize, iFpi_t) \ |
| 39 | + GO(vorbis_synthesis_halfrate, iFpi_t) \ |
| 40 | + GO(vorbis_synthesis_read, iFpi_t) \ |
27 | 41 | GO(vorbis_analysis, iFpp_t) \ |
28 | 42 | GO(vorbis_analysis_blockout, iFpp_t) \ |
29 | | - GO(vorbis_analysis_buffer, pFpi_t) \ |
30 | | - GO(vorbis_analysis_headerout, iFppppp_t) \ |
31 | 43 | GO(vorbis_analysis_init, iFpp_t) \ |
32 | | - GO(vorbis_analysis_wrote, iFpi_t) \ |
33 | | - GO(vorbis_bitrate_addblock, iFp_t) \ |
34 | 44 | GO(vorbis_bitrate_flushpacket, iFpp_t) \ |
35 | | - GO(vorbis_block_clear, iFp_t) \ |
36 | 45 | GO(vorbis_block_init, iFpp_t) \ |
37 | | - GO(vorbis_comment_add, vFpp_t) \ |
38 | | - GO(vorbis_comment_add_tag, vFppp_t) \ |
39 | | - GO(vorbis_comment_clear, vFp_t) \ |
40 | | - GO(vorbis_commentheader_out, iFpp_t) \ |
41 | | - GO(vorbis_comment_init, vFp_t) \ |
42 | | - GO(vorbis_comment_query, pFppi_t) \ |
43 | 46 | GO(vorbis_comment_query_count, iFpp_t) \ |
44 | | - GO(vorbis_dsp_clear, vFp_t) \ |
45 | | - GO(vorbis_info_blocksize, iFpi_t) \ |
46 | | - GO(vorbis_info_clear, vFp_t) \ |
47 | | - GO(vorbis_info_init, vFp_t) \ |
| 47 | + GO(vorbis_commentheader_out, iFpp_t) \ |
48 | 48 | GO(vorbis_packet_blocksize, iFpp_t) \ |
49 | 49 | GO(vorbis_synthesis, iFpp_t) \ |
50 | 50 | GO(vorbis_synthesis_blockin, iFpp_t) \ |
51 | | - GO(vorbis_synthesis_halfrate, iFpi_t) \ |
52 | | - GO(vorbis_synthesis_halfrate_p, iFp_t) \ |
53 | | - GO(vorbis_synthesis_headerin, iFppp_t) \ |
54 | | - GO(vorbis_synthesis_idheader, iFp_t) \ |
55 | 51 | GO(vorbis_synthesis_init, iFpp_t) \ |
56 | 52 | GO(vorbis_synthesis_lapout, iFpp_t) \ |
57 | 53 | GO(vorbis_synthesis_pcmout, iFpp_t) \ |
58 | | - GO(vorbis_synthesis_read, iFpi_t) \ |
59 | | - GO(vorbis_synthesis_restart, iFp_t) \ |
60 | 54 | GO(vorbis_synthesis_trackonly, iFpp_t) \ |
61 | | - GO(vorbis_window, pFpi_t) |
| 55 | + GO(vorbis_analysis_buffer, pFpi_t) \ |
| 56 | + GO(vorbis_window, pFpi_t) \ |
| 57 | + GO(vorbis_comment_add_tag, vFppp_t) \ |
| 58 | + GO(vorbis_synthesis_headerin, iFppp_t) \ |
| 59 | + GO(vorbis_comment_query, pFppi_t) \ |
| 60 | + GO(vorbis_analysis_headerout, iFppppp_t) |
62 | 61 |
|
63 | 62 | #endif // __wrappedlibvorbisTYPES32_H_ |
0 commit comments